diff options
Diffstat (limited to 'engine/map_setup.asm')
| -rw-r--r-- | engine/map_setup.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/map_setup.asm b/engine/map_setup.asm index dc013ffdd..01f3d05d7 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -308,8 +308,8 @@ SuspendMapAnims: ; 154d3 LoadObjectsRunCallback_02: ; 154d7 ld a, MAPCALLBACK_OBJECTS call RunMapCallback - callba LoadObjectMasks - callba InitializeVisibleSprites + farcall LoadObjectMasks + farcall InitializeVisibleSprites ret ; 154ea (5:54ea) @@ -356,16 +356,16 @@ CheckReplaceKrisSprite: ; 154f7 ld a, [PlayerState] cp PLAYER_NORMAL jr z, .nope - cp PLAYER_SLIP + cp PLAYER_SKATE jr z, .nope cp PLAYER_SURF jr z, .surfing cp PLAYER_SURF_PIKA jr z, .surfing - call GetMapPermission + call GetMapEnvironment cp INDOOR jr z, .checkbiking - cp PERM_5 + cp ENVIRONMENT_5 jr z, .checkbiking cp DUNGEON jr z, .checkbiking @@ -409,14 +409,14 @@ FadeOldMapMusic: ; 15567 ; 1556d RetainOldPalettes: ; 1556d - callba _UpdateTimePals + farcall _UpdateTimePals ret RotatePalettesRightMapAndMusic: ; 15574 ld e, 0 - ld a, [MusicFadeIDLo] + ld a, [MusicFadeID] ld d, 0 - ld a, [MusicFadeIDHi] + ld a, [MusicFadeID + 1] ld a, $4 ld [MusicFade], a call RotateThreePalettesRight |