Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start organizing WRAM

Browse Source 
- Use db and dw when they're more meaningful than ds 1/2
- Use unions to group related labels
This commit is contained in:
Remy Oukaour
2017-12-09 13:52:14 -05:00
parent 0b7d8d44ad
commit 16c6696dd5
14 changed files with 195 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
engine/intro_menu.asm
View File

@@ -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