Start organizing WRAM

- Use db and dw when they're more meaningful than ds 1/2
- Use unions to group related labels

6 files changed, 19 insertions, 19 deletions

diff --git a/engine/credits.asm b/engine/credits.asm
index 1888ef27d..3442d4f16 100644
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -491,7 +491,7 @@ ParseCredits: ; 1099aa
 	ld a, MUSIC_POST_CREDITS % $100
 	ld [MusicFadeID], a
 	ld a, MUSIC_POST_CREDITS / $100
-	ld [MusicFadeIDHi], a
+	ld [MusicFadeID + 1], a
 	ret
 
 .get
diff --git a/engine/init_gender.asm b/engine/init_gender.asm
index ff5babdf9..3ae856029 100755
--- a/engine/init_gender.asm
+++ b/engine/init_gender.asm
@@ -68,9 +68,9 @@ InitGenderScreen: ; 48e14 (12:4e14)
 	ld a, $10
 	ld [MusicFade], a
 	ld a, MUSIC_NONE
-	ld [MusicFadeIDLo], a
+	ld [MusicFadeID], a
 	ld a, $0
-	ld [MusicFadeIDHi], a
+	ld [MusicFadeID + 1], a
 	ld c, 8
 	call DelayFrames
 	call ClearBGPalettes
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
 
diff --git a/engine/map_setup.asm b/engine/map_setup.asm
index dc013ffdd..5de4f30da 100644
--- a/engine/map_setup.asm
+++ b/engine/map_setup.asm
@@ -414,9 +414,9 @@ RetainOldPalettes: ; 1556d
 
 RotatePalettesRightMapAndMusic: ; 15574
 	ld e, 0
-	ld a, [MusicFadeIDLo]
+	ld a, [MusicFadeID]
 	ld d, 0
-	ld a, [MusicFadeIDHi]
+	ld a, [MusicFadeID + 1]
 	ld a, $4
 	ld [MusicFade], a
 	call RotateThreePalettesRight
diff --git a/engine/specials.asm b/engine/specials.asm
index 6baca2697..e88112286 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -618,9 +618,9 @@ SpecialGameboyCheck: ; c478
 
 Special_FadeOutMusic: ; c48f
 	ld a, MUSIC_NONE % $100
-	ld [MusicFadeIDLo], a
+	ld [MusicFadeID], a
 	ld a, MUSIC_NONE / $100
-	ld [MusicFadeIDHi], a
+	ld [MusicFadeID + 1], a
 	ld a, $2
 	ld [MusicFade], a
 	ret
diff --git a/engine/timeset.asm b/engine/timeset.asm
index d560ae817..77ee5a0dd 100755
--- a/engine/timeset.asm
+++ b/engine/timeset.asm
@@ -10,9 +10,9 @@ InitClock: ; 90672 (24:4672)
 	ld a, $10
 	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, 8
 	call DelayFrames
 	call RotateFourPalettesLeft