From 16c6696dd5d786eafca0beb855b55c00b25b01f4 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 9 Dec 2017 13:52:14 -0500 Subject: Start organizing WRAM - Use db and dw when they're more meaningful than ds 1/2 - Use unions to group related labels --- engine/intro_menu.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'engine/intro_menu.asm') 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 -- cgit v1.2.3 From e3c686f6df866d1b393d9cc9e61a750a454b5270 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 9 Dec 2017 15:14:51 -0500 Subject: Further WRAM organization --- engine/intro_menu.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 2da478ede..c576e4526 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -111,8 +111,8 @@ _ResetWRAM: ; 5bae xor a call ByteFill - ld hl, wd000 - ld bc, wGameData - wd000 + ld hl, wRAM1Start + ld bc, wGameData - wRAM1Start xor a call ByteFill -- cgit v1.2.3 From d554b997c590825f030bd1be71989653b16a2ae0 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 00:18:29 -0500 Subject: Use correct WRAM labels for intro/title scenes Remove outdated WRAM alias comments --- engine/intro_menu.asm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index c576e4526..6dcda93f3 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1051,7 +1051,7 @@ StartTitleScreen: ; 6219 ld b, SCGB_DIPLOMA call GetSGBLayout call UpdateTimePals - ld a, [wcf64] + ld a, [wIntroSceneFrameCounter] cp $5 jr c, .ok xor a @@ -1191,7 +1191,7 @@ TitleScreenTimer: ; 62f6 inc [hl] ; Start a timer - ld hl, wcf65 + ld hl, wTitleScreenTimer ld de, 73 * 60 + 36 ld [hl], e inc hl @@ -1202,7 +1202,7 @@ TitleScreenTimer: ; 62f6 TitleScreenMain: ; 6304 ; Run the timer down. - ld hl, wcf65 + ld hl, wTitleScreenTimer ld e, [hl] inc hl ld d, [hl] @@ -1268,7 +1268,7 @@ TitleScreenMain: ; 6304 ld a, 1 .done - ld [wcf64], a + ld [wIntroSceneFrameCounter], a ; Return to the intro sequence. ld hl, wJumptableIndex @@ -1287,13 +1287,13 @@ TitleScreenMain: ; 6304 ld hl, MusicFade ld [hl], 8 ; 1 second - ld hl, wcf65 + ld hl, wTitleScreenTimer inc [hl] ret .clock_reset ld a, 4 - ld [wcf64], a + ld [wIntroSceneFrameCounter], a ; Return to the intro sequence. ld hl, wJumptableIndex @@ -1305,7 +1305,7 @@ TitleScreenEnd: ; 6375 ; Wait until the music is done fading. - ld hl, wcf65 + ld hl, wTitleScreenTimer inc [hl] ld a, [MusicFade] @@ -1313,7 +1313,7 @@ TitleScreenEnd: ; 6375 ret nz ld a, 2 - ld [wcf64], a + ld [wIntroSceneFrameCounter], a ; Back to the intro. ld hl, wJumptableIndex @@ -1332,8 +1332,8 @@ ResetClock: ; 6392 ; 639b Function639b: ; unreferenced - ; If bit 0 or 1 of [wcf65] is set, we don't need to be here. - ld a, [wcf65] + ; If bit 0 or 1 of [wTitleScreenTimer] is set, we don't need to be here. + ld a, [wTitleScreenTimer] and $3 ret nz ld bc, SpriteAnim10 @@ -1345,8 +1345,8 @@ Function639b: ; unreferenced add hl, hl ld de, Data63ca add hl, de - ; If bit 2 of [wcf65] is set, get the second dw; else, get the first dw - ld a, [wcf65] + ; If bit 2 of [wTitleScreenTimer] is set, get the second dw; else, get the first dw + ld a, [wTitleScreenTimer] and %00000100 srl a srl a -- cgit v1.2.3