fix music fade out into initial options menu

Fixes #1070
Rangi42 · Mar 1, 2025 · ed08f8e · ed08f8e
1 parent 1192b44
commit ed08f8e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/audio/engine.asm b/audio/engine.asm
@@ -64,7 +64,7 @@ MusicFadeRestart:
 	ret
 
 MusicOn:
-	ld a, 1
+	ld a, TRUE
 	ld [wMusicPlaying], a
 	ret
 

diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm
@@ -124,10 +124,14 @@ ResetWRAM_NotPlus:
 
 ResetWRAM:
 	ld hl, wShadowOAM
-	ld bc, wOptions3 - wShadowOAM
+	ld bc, wMusic - wShadowOAM
 	xor a
 	rst ByteFill
 
+	ld hl, wMusicEnd
+	ld bc, wOptions3 - wMusicEnd
+	rst ByteFill
+
 	ld hl, wRAM1Start
 	ld bc, wGameData - wRAM1Start
 	rst ByteFill

diff --git a/home/audio.asm b/home/audio.asm
@@ -282,7 +282,7 @@ WaitSFX::
 	ret
 
 MaxVolume::
-	ld a, $77 ; max
+	ld a, MAX_VOLUME
 	ld [wVolume], a
 	ret
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ MusicFadeRestart: @@
     	ret
     MusicOn:
-    	ld a, 1
+    	ld a, TRUE
     	ld [wMusicPlaying], a
     	ret
@@ Expand Down @@