Start organizing WRAM

- 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

View File

@@ -40,9 +40,9 @@ InitMobileProfile: ; 4802f (12:402f)
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 b, $1

View File

@@ -496,9 +496,9 @@ Function1161d5: ; 1161d5
ld [MusicFade], a
ld de, MUSIC_MOBILE_ADAPTER
ld a, e
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
ld a, d
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
ld a, [$c319]
inc a
ld [$c319], a
@@ -680,9 +680,9 @@ Function11636e: ; 11636e
ld a, $8
ld [MusicFade], a
ld a, [wMapMusic]
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
xor a
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
xor a
ld [$c319], a
ld [wc30d], a
@@ -728,18 +728,18 @@ Function1163c0: ; 1163c0
ld a, $8
ld [MusicFade], a
ld a, [wMapMusic]
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
xor a
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
jr .asm_116439
.asm_11642a
ld a, $8
ld [MusicFade], a
ld a, $0
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
ld a, $0
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
.asm_116439
xor a
@@ -757,9 +757,9 @@ Function116441: ; 116441
ld a, $8
ld [MusicFade], a
ld a, [wMapMusic]
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
xor a
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
xor a
ld [$c319], a
ld [wc30d], a

View File

@@ -559,9 +559,9 @@ Function17d2ce: ; 17d2ce
ld de, MUSIC_MOBILE_CENTER
ld a, e
ld [wMapMusic], a
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
ld a, d
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
call PlayMusic
call ReturnToMapFromSubmenu
call CloseSubmenu
@@ -4728,9 +4728,9 @@ Function17f5e4: ; 17f5e4
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 a, " "
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
@@ -5274,9 +5274,9 @@ Function17ff23: ; 17ff23
ld a, $8
ld [MusicFade], a
ld a, [wMapMusic]
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
xor a
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
ld hl, wc303
set 7, [hl]
ret

View File

@@ -856,9 +856,9 @@ Function4a6c5: ; 4a6c5 (12:66c5)
ld a, $5
ld [MusicFade], a
ld a, e
ld [MusicFadeIDLo], a
ld [MusicFadeID], a
ld a, d
ld [MusicFadeIDHi], a
ld [MusicFadeID + 1], a
ld c, 22
call DelayFrames
ret