aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/4_2.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2014-09-13 00:50:56 -0700
committerYamaArashi <shadow962@live.com>2014-09-13 00:50:56 -0700
commit0c916aea3353ed1bf2750be403b0da9ea0b922d4 (patch)
tree4e50d805a37f06fabac6086a7ad6ed1d4f4526c4 /engine/battle/4_2.asm
parentLabelled and commented mostly sprite-related things (diff)
downloadpokeyellow-0c916aea3353ed1bf2750be403b0da9ea0b922d4.tar.gz
pokeyellow-0c916aea3353ed1bf2750be403b0da9ea0b922d4.tar.xz
pokeyellow-0c916aea3353ed1bf2750be403b0da9ea0b922d4.zip
Commented more sprite and map code
Diffstat (limited to 'engine/battle/4_2.asm')
-rwxr-xr-xengine/battle/4_2.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/4_2.asm b/engine/battle/4_2.asm
index 79594bdd..133acdcc 100755
--- a/engine/battle/4_2.asm
+++ b/engine/battle/4_2.asm
@@ -71,7 +71,7 @@ EndOfBattle: ; 137aa (4:77aa)
call WaitForSoundToFinish
call GBPalWhiteOut
ld a, $ff
- ld [wd42f], a
+ ld [wDestinationWarpID], a
ret
YouWinText: ; 13853 (4:7853)
@@ -94,7 +94,7 @@ Func_13870: ; 13870 (4:7870)
ld a, [wd736]
and a
ret nz
- callab Func_c49d
+ callab IsPlayerStandingOnDoorTileOrWarpTile
jr nc, .asm_13888
.asm_13884
ld a, $1