diff options
Diffstat (limited to 'home/map.asm')
| -rw-r--r-- | home/map.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/home/map.asm b/home/map.asm index a66391896..9c81d8034 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1983,8 +1983,8 @@ CheckCurrentMapCoordEvents:: ; 2ad4 FadeToMenu:: ; 2b29 xor a ld [hBGMapMode], a - call LoadStandardMenuDataHeader - farcall Special_FadeOutPalettes + call LoadStandardMenuHeader + farcall FadeOutPalettes call ClearSprites call DisableSpriteUpdates ret @@ -2010,7 +2010,7 @@ FinishExitMenu:: ; 2b5c call GetSGBLayout farcall LoadOW_BGPal7 call WaitBGMap2 - farcall Special_FadeInPalettes + farcall FadeInPalettes call EnableSpriteUpdates ret ; 2b74 @@ -2043,7 +2043,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74 ReloadTilesetAndPalettes:: ; 2bae call DisableLCD call ClearSprites - farcall Special_RefreshSprites + farcall RefreshSprites call LoadStandardFont call LoadFontsExtra ld a, [hROMBank] @@ -2306,7 +2306,7 @@ GetMapMusic:: ; 2cbd .radiotower ld a, [wStatusFlags2] - bit 0, a + bit STATUSFLAGS2_ROCKETS_IN_RADIO_TOWER_F, a jr z, .clearedradiotower ld de, MUSIC_ROCKET_OVERTURE jr .done @@ -2321,7 +2321,7 @@ GetMapMusic:: ; 2cbd .mahoganymart ld a, [wStatusFlags2] - bit 7, a + bit STATUSFLAGS2_ROCKETS_IN_MAHOGANY_F, a jr z, .clearedmahogany ld de, MUSIC_ROCKET_HIDEOUT jr .done |