pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
PikalaxALT
2015-11-01 18:14:37 -05:00
parent 010b450834 25c126c69b
commit 6b2d0ae841
33 changed files with 717 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/events.asm
View File

@@ -1034,9 +1034,11 @@ DoRepelStep: ; 96bd7
ld a, [wRepelEffect]
and a
ret z
dec a
ld [wRepelEffect], a
ret nz
ld a, BANK(RepelWoreOffScript)
ld hl, RepelWoreOffScript
call CallScript