Use some music constants

4 files changed, 65 insertions, 5 deletions

diff --git a/engine/bank3.asm b/engine/bank3.asm
index a3a6418..0ed46a3 100755
--- a/engine/bank3.asm
+++ b/engine/bank3.asm
@@ -950,7 +950,7 @@ Func_c74d: ; c74d (3:474d)
 
 Func_c75a: ; c75a (3:475a)
 	call Func_379b
-	ld a, $5
+	ld a, MUSIC_PAUSEMENU
 	call Func_3785
 	call Func_c797
 .asm_c765
diff --git a/engine/bank4.asm b/engine/bank4.asm
index a42ed28..e47de50 100755
--- a/engine/bank4.asm
+++ b/engine/bank4.asm
@@ -920,7 +920,10 @@ Func_12c4f: ; 12c4f (4:6c4f)
 	ret
 
 Func_12c5e: ; 12c5e (4:6c5e)
-INCBIN "baserom.gbc",$12c5e,$131b3 - $12c5e
+INCBIN "baserom.gbc",$12c5e,$12c7f - $12c5e
+
+Func_12c7f: ; 12c7f (4:6c7f)
+INCBIN "baserom.gbc",$12c7f,$131b3 - $12c7f
 
 Func_131b3: ; 131b3 (4:71b3)
 INCBIN "baserom.gbc",$131b3,$131d3 - $131b3
diff --git a/engine/bank7.asm b/engine/bank7.asm
index 1f9e1aa..ee27f3c 100755
--- a/engine/bank7.asm
+++ b/engine/bank7.asm
@@ -121,7 +121,43 @@ Func_1d078: ; 1d078 (7:5078)
 INCBIN "baserom.gbc",$1d078,$1d306 - $1d078
 
 Func_1d306: ; 1d306 (7:5306)
-INCBIN "baserom.gbc",$1d306,$1d6ad - $1d306
+INCBIN "baserom.gbc",$1d306,$1d386 - $1d306
+
+Func_1d386: ; 1d386 (7:5386)
+	call Func_378a
+	or a
+	jr nz, .asm_1d39f
+	call Func_028a
+	ld a, MUSIC_TITLESCREEN
+	call Func_3785
+	ld bc, $0000
+	ld a, $0
+	call Func_3df3
+	call Func_1d59c
+.asm_1d39f
+	call Func_3ca0
+	call Func_1d3a9
+	call Func_0277
+	ret
+
+Func_1d3a9: ; 1d3a9 (7:53a9)
+INCBIN "baserom.gbc",$1d3a9,$1d42e - $1d3a9
+
+Func_1d42e: ; 1d42e (7:542e)
+INCBIN "baserom.gbc",$1d42e,$1d519 - $1d42e
+
+Func_1d519: ; 1d519 (7:5519)
+	ld a, MUSIC_TITLESCREEN
+	call Func_3785
+	call Func_1d42e
+	scf
+	ret
+; 0x1d523
+
+INCBIN "baserom.gbc",$1d523,$1d59c - $1d523
+
+Func_1d59c: ; 1d59c (7:559c)
+INCBIN "baserom.gbc",$1d59c,$1d6ad - $1d59c
 
 Func_1d6ad: ; 1d6ad (7:56ad)
 INCBIN "baserom.gbc",$1d6ad,$20000 - $1d6ad
diff --git a/engine/home.asm b/engine/home.asm
index 05c0562..305887c 100755
--- a/engine/home.asm
+++ b/engine/home.asm
@@ -3867,7 +3867,7 @@ Func_3a1f: ; 3a1f (0:3a1f)
 	jr z, .asm_3a37
 	cp $c
 	jr z, .asm_3a37
-	ld a, $f
+	ld a, MUSIC_RONALD
 	ret
 .asm_3a37
 	ld a, [$d111]
@@ -4201,7 +4201,28 @@ Func_3dbf: ; 3dbf (0:3dbf)
 	ret
 ; 0x3ddb
 
-INCBIN "baserom.gbc",$3ddb,$3fe0 - $3ddb
+INCBIN "baserom.gbc",$3ddb,$3df3 - $3ddb
+
+Func_3df3: ; 3df3 (0:3df3)
+	push af
+	ld a, [$ff80]
+	push af
+	push hl
+	ld a, BANK(Func_12c7f)
+	call BankswitchHome
+	ld hl, [sp+$5]
+	ld a, [hl]
+	call Func_12c7f
+	call Func_0404
+	pop hl
+	pop af
+	call BankswitchHome
+	pop af
+	ld a, [$d61b]
+	ret
+; 0x3e10
+
+INCBIN "baserom.gbc",$3e10,$3fe0 - $3e10
 
 ; jumps to 3f:hl
 Bankswitch3dTo3f: ; 3fe0 (0:3fe0)