diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/map_setup.asm | 4 | ||||
| -rw-r--r-- | engine/specials.asm | 6 | ||||
| -rw-r--r-- | engine/timeofdaypals.asm | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engine/map_setup.asm b/engine/map_setup.asm index ef1ad715e..7444c7fbe 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -272,8 +272,8 @@ MapSetupCommands: ; 15440 dba LoadMapAttributes ; 1a dba LoadMapAttributes_SkipPeople ; 1b dba ClearBGPalettes ; 1c - dba RotatePalettesRightPalettes ; 1d - dba RotatePalettesLeftPalettes ; 1e + dba FadeOutPalettes ; 1d + dba FadeInPalettes ; 1e dba GetCoordOfUpperLeftCorner ; 1f dba RestoreFacingAfterWarp ; 20 dba SpawnInFacingDown ; 21 diff --git a/engine/specials.asm b/engine/specials.asm index e2b4e6195..09edbb263 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -66,11 +66,11 @@ SpecialsPointers:: ; c029 add_special Special_CardFlip add_special Special_DummyNonfunctionalGameCornerGame add_special Special_ClearBGPalettesBufferScreen - add_special RotatePalettesRightPalettes + add_special FadeOutPalettes add_special Special_BattleTowerFade add_special Special_FadeBlackQuickly - add_special RotatePalettesLeftPalettes - add_special Special_RotatePalettesLeftQuickly + add_special FadeInPalettes + add_special Special_FadeInQuickly add_special Special_ReloadSpritesNoPalettes add_special ClearBGPalettes add_special UpdateTimePals diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index b977772eb..368636758 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -116,7 +116,7 @@ _UpdateTimePals:: ; 8c070 ret ; 8c079 -RotatePalettesLeftPalettes:: ; 8c079 +FadeInPalettes:: ; 8c079 ld c, $12 call GetTimePalFade ld b, $4 @@ -124,7 +124,7 @@ RotatePalettesLeftPalettes:: ; 8c079 ret ; 8c084 -RotatePalettesRightPalettes:: ; 8c084 +FadeOutPalettes:: ; 8c084 call Function8c0c1 ld c, $9 call GetTimePalFade @@ -150,7 +150,7 @@ endr ret ; 8c0ab -Special_RotatePalettesLeftQuickly: ; 8c0ab +Special_FadeInQuickly: ; 8c0ab ld c, $0 call GetTimePalFade ld b, $4 |