aboutsummaryrefslogtreecommitdiffstats
path: root/home
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-08 16:04:39 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-08 16:04:39 -0400
commit5b3c788c46759023f1bd4470ffef306b8c0e5a39 (patch)
treee2979ffc8baae7ea771e05279e27e3a6f81b6082 /home
parentPikapic animation function labels (diff)
downloadpokeyellow-5b3c788c46759023f1bd4470ffef306b8c0e5a39.tar.gz
pokeyellow-5b3c788c46759023f1bd4470ffef306b8c0e5a39.tar.xz
pokeyellow-5b3c788c46759023f1bd4470ffef306b8c0e5a39.zip
More on Pikachu emotions
Diffstat (limited to 'home')
-rw-r--r--home/overworld.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/home/overworld.asm b/home/overworld.asm
index 03058505..d8f91e79 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1848,7 +1848,7 @@ LoadMapHeader:: ; 0dab (0:0dab)
jr asm_0dbd
Func_0db5:: ; XXX
- callba Func_f0a55 ; 3c:4a55
+ callba LoadUnusedBluesHouseMissableObjectData ; 3c:4a55
asm_0dbd
ld a, [wCurMapTileset]
ld [wUnusedD119], a
@@ -2067,7 +2067,7 @@ ReloadMapAfterPrinter:: ; 0f3d (0:0f3d)
pop af
call BankswitchCommon
asm_0f4d: ; 0f4d (0:0f4d)
- jpab Func_f02da
+ jpab SetMapSpecificScriptFlagsOnMapReload
ret ; useless?
ResetMapVariables:: ; 0f56 (0:0f56)