diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-20 11:47:52 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-20 11:47:52 -0500 |
| commit | 812976cee6ba39d50583921273ad85195e77be37 (patch) | |
| tree | 783dd9fbc8019d2d9fd393fab6d74f59cc25a573 /engine/map_setup.asm | |
| parent | b02305625920d42649587d6ba6504777dcac25a0 (diff) | |
bgcoord
Diffstat (limited to 'engine/map_setup.asm')
| -rw-r--r-- | engine/map_setup.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 7e0bfd3c1..ef1ad715e 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -249,10 +249,10 @@ MapSetupCommands: ; 15440 dba PlayMapMusic ; 03 dba RestartMapMusic ; 04 dba FadeToMapMusic ; 05 - dba FadeOutMapAndMusic ; 06 + dba RotatePalettesRightMapAndMusic ; 06 dba EnterMapMusic ; 07 dba ForceMapMusic ; 08 - dba FadeInMusic ; 09 + dba RotatePalettesLeftMusic ; 09 dba LoadBlockData ; 0a dba LoadNeighboringBlockData ; 0b dba SaveScreen ; 0c @@ -272,8 +272,8 @@ MapSetupCommands: ; 15440 dba LoadMapAttributes ; 1a dba LoadMapAttributes_SkipPeople ; 1b dba ClearBGPalettes ; 1c - dba FadeOutPalettes ; 1d - dba FadeInPalettes ; 1e + dba RotatePalettesRightPalettes ; 1d + dba RotatePalettesLeftPalettes ; 1e dba GetCoordOfUpperLeftCorner ; 1f dba RestoreFacingAfterWarp ; 20 dba SpawnInFacingDown ; 21 @@ -417,14 +417,14 @@ RetainOldPalettes: ; 1556d callba _UpdateTimePals ret -FadeOutMapAndMusic: ; 15574 +RotatePalettesRightMapAndMusic: ; 15574 ld e, 0 ld a, [MusicFadeIDLo] ld d, 0 ld a, [MusicFadeIDHi] ld a, $4 ld [MusicFade], a - call FadeToWhite + call RotateThreePalettesRight ret ; 15587 |