aboutsummaryrefslogtreecommitdiffstats
path: root/home.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-05-23 15:52:20 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-05-23 15:52:20 -0400
commit5b53dbe15d0f24c0ebcb537d7e11c106abd99867 (patch)
treea5323e702ca9e0e3a2a97d49bdf57b561f9fe0e3 /home.asm
parentMerge pull request #8 from PikalaxALT/master (diff)
downloadpokeyellow-5b53dbe15d0f24c0ebcb537d7e11c106abd99867.tar.gz
pokeyellow-5b53dbe15d0f24c0ebcb537d7e11c106abd99867.tar.xz
pokeyellow-5b53dbe15d0f24c0ebcb537d7e11c106abd99867.zip
Bank7 misc functions
Also delete gfx/intro_nido pngs (aren't used in the build)
Diffstat (limited to 'home.asm')
-rw-r--r--home.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/home.asm b/home.asm
index c8f227ef..3d8db84f 100644
--- a/home.asm
+++ b/home.asm
@@ -1445,7 +1445,7 @@ DisplayPlayerBlackedOutText:: ; 2988 (0:2988)
ld [wSafariSteps+1],a
ld [wd790],a
ld [wcf0d],a
- ld [W_SAFARIZONEENTRANCECURSCRIPT],a
+ ld [wSafariZoneEntranceCurScript],a
.didnotblackoutinsafari
jp HoldTextDisplayOpen
@@ -4913,7 +4913,7 @@ PrepareRTCDataAndDisableSRAM:: ; 3ea9 (0:3ea9)
INCLUDE "home/predef.asm"
UpdateCinnabarGymGateTileBlocks:: ; 3ef0 (0:3ef0)
- callba CinnabarGymQuiz_1e4bf
+ callba UpdateCinnabarGymGateTileBlocks_
ret ; again?
;jp Bankswitch