diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-09 13:52:14 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-09 13:58:49 -0500 |
| commit | 16c6696dd5d786eafca0beb855b55c00b25b01f4 (patch) | |
| tree | e106ad7ab2aa6719393dc26623a524074c659124 /engine/intro_menu.asm | |
| parent | 0b7d8d44ad6b911c4fe2e74b7d5bcbee971d7c90 (diff) | |
Start organizing WRAM
- Use db and dw when they're more meaningful than ds 1/2
- Use unions to group related labels
Diffstat (limited to 'engine/intro_menu.asm')
| -rwxr-xr-x | engine/intro_menu.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 8e3c90204..2da478ede 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -375,9 +375,9 @@ Continue: ; 5d65 ld a, $8 ld [MusicFade], a ld a, MUSIC_NONE % $100 - ld [MusicFadeIDLo], a + ld [MusicFadeID], a ld a, MUSIC_NONE / $100 - ld [MusicFadeIDHi], a + ld [MusicFadeID + 1], a call ClearBGPalettes call Continue_MobileAdapterMenu call CloseWindow @@ -429,9 +429,9 @@ Continue_MobileAdapterMenu: ; 5df0 ld a, 5 ld [MusicFade], a ld a, MUSIC_MOBILE_ADAPTER_MENU % $100 - ld [MusicFadeIDLo], a + ld [MusicFadeID], a ld a, MUSIC_MOBILE_ADAPTER_MENU / $100 - ld [MusicFadeIDHi], a + ld [MusicFadeID + 1], a ld c, 20 call DelayFrames ld c, $1 @@ -440,9 +440,9 @@ Continue_MobileAdapterMenu: ; 5df0 ld a, 8 ld [MusicFade], a ld a, MUSIC_NONE % $100 - ld [MusicFadeIDLo], a + ld [MusicFadeID], a ld a, MUSIC_NONE / $100 - ld [MusicFadeIDHi], a + ld [MusicFadeID + 1], a ld c, 35 call DelayFrames ret @@ -859,9 +859,9 @@ ShrinkPlayer: ; 610f ld [MusicFade], a ld de, MUSIC_NONE ld a, e - ld [MusicFadeIDLo], a + ld [MusicFadeID], a ld a, d - ld [MusicFadeIDHi], a + ld [MusicFadeID + 1], a ld de, SFX_ESCAPE_ROPE call PlaySFX @@ -1282,8 +1282,8 @@ TitleScreenMain: ; 6304 ; Fade out the title screen music xor a - ld [MusicFadeIDLo], a - ld [MusicFadeIDHi], a + ld [MusicFadeID], a + ld [MusicFadeID + 1], a ld hl, MusicFade ld [hl], 8 ; 1 second |