diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-23 15:57:48 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-23 15:57:48 -0400 |
| commit | 9da88a19beed6b713317bb446d21cbd493ab8009 (patch) | |
| tree | d8d6cc4df3c3dcb00541b5bda9cae842584a7009 /home.asm | |
| parent | e63bfa7741d503fa2710792898ac4a2b5b859acf (diff) | |
| parent | 5b53dbe15d0f24c0ebcb537d7e11c106abd99867 (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |