More music constants

5 files changed, 476 insertions, 37 deletions

diff --git a/engine/bank3.asm b/engine/bank3.asm
index 0ed46a3..68e0f01 100755
--- a/engine/bank3.asm
+++ b/engine/bank3.asm
@@ -941,17 +941,17 @@ Func_c74d: ; c74d (3:474d)
 	push hl
 	push bc
 	push de
-	call Func_c75a
+	call MainMenu_c75a
 	call Func_c111
 	pop de
 	pop bc
 	pop hl
 	ret
 
-Func_c75a: ; c75a (3:475a)
+MainMenu_c75a: ; c75a (3:475a)
 	call Func_379b
 	ld a, MUSIC_PAUSEMENU
-	call Func_3785
+	call PlaySong
 	call Func_c797
 .asm_c765
 	ld a, $1
@@ -1027,9 +1027,50 @@ Func_c7e0: ; c7e0 (3:47e0)
 Func_c7e5: ; c7e5 (3:47e5)
 	farcall Func_103d2
 	ret
-; 0xc7ea
 
-INCBIN "baserom.gbc",$c7ea,$c935 - $c7ea
+PC_c7ea: ; c7ea (3:47ea)
+	ld a, MUSIC_PCMAINMENU
+	call PlaySong
+	call Func_c241
+	call $4915
+	call Func_3c48
+	ld hl, $0352
+	call $2c73
+	call $484e
+.asm_c801
+	ld a, $1
+	call Func_c29b
+.asm_c806
+	call Func_3c48
+	call Func_264b
+	jr nc, .asm_c806
+	ld a, e
+	ld [$d0b9], a
+	ld a, [$ffb1]
+	cp e
+	jr nz, .asm_c82f
+	cp $4
+	jr z, .asm_c82f
+	call Func_c2a3
+	ld a, [$d0b9]
+	ld hl, $4846
+	call JumpToFunctionInTable
+	ld hl, $484e
+	call Func_c32b
+	jr .asm_c801
+.asm_c82f
+	call Func_c135
+	call Func_3c48
+	ld hl, $0353
+	call $4891
+	call Func_c111
+	xor a
+	ld [$d112], a
+	call Func_39fc
+	ret
+; 0xc846
+
+INCBIN "baserom.gbc",$c846,$c935 - $c846
 
 Func_c935: ; c935 (3:4935)
 	push hl
@@ -1344,7 +1385,37 @@ RST20: ; cc42 (3:4c42)
 INCBIN "baserom.gbc",$cc60,$cd98 - $cc60
 
 Unknown_cd98: ; cd98 (3:4d98)
-INCBIN "baserom.gbc",$cd98,$fc2b - $cd98
+INCBIN "baserom.gbc",$cd98,$d336 - $cd98
+
+DeckMachine_d336: ; d336 (3:5336)
+	push bc
+	call Func_c2a3
+	call Func_379b
+	ld a, MUSIC_DECKMACHINE
+	call PlaySong
+	call Func_04a2
+	xor a
+	ld [$ff92], a
+	ld [$ff93], a
+	farcall Func_1288c
+	call Func_0277
+	pop bc
+	ld a, c
+	or a
+	jr z, .asm_d360
+	dec a
+	ld [$d0a9], a
+	farcallx $2, $7a04
+	jr .asm_d364
+.asm_d360
+	farcallx $2, $719d
+.asm_d364
+	call Func_37a0
+	call $42d4
+	jp $4c64
+; 0xd36d
+
+INCBIN "baserom.gbc",$d36d,$fc2b - $d36d
 
 Func_fc2b: ; fc2b (3:7c2b)
 	ld a, [$d0c3]
diff --git a/engine/bank4.asm b/engine/bank4.asm
index e47de50..b25e7d2 100755
--- a/engine/bank4.asm
+++ b/engine/bank4.asm
@@ -4,7 +4,130 @@ Func_10059: ; 10059 (4:4059)
 INCBIN "baserom.gbc",$10059,$100a2 - $10059
 
 Func_100a2: ; 100a2 (4:40a2)
-INCBIN "baserom.gbc",$100a2,$103d2 - $100a2
+INCBIN "baserom.gbc",$100a2,$1029e - $100a2
+
+Medal_1029e: ; 1029e (4:429e)
+	sub $8
+	ld c, a
+	ld [$d115], a
+	ld a, [$d291]
+	push af
+	push bc
+	call Func_379b
+	ld a, MUSIC_STOP
+	call PlaySong
+	farcall Func_70000
+	call Func_028a
+	call $4000
+	ld a, $fa
+	ld [$d114], a
+	call $410c
+	pop bc
+	ld a, c
+	add a
+	ld c, a
+	ld b, $0
+	ld hl, Unknown_1030b
+	add hl, bc
+	ld a, [hli]
+	ld [$ce3f], a
+	ld a, [hl]
+	ld [$ce40], a
+	call $4031
+	ld a, MUSIC_MEDAL
+	call PlaySong
+	ld a, $ff
+	ld [$d116], a
+.asm_102e2
+	call Func_3c48
+	ld a, [$d116]
+	inc a
+	ld [$d116], a
+	and $f
+	jr nz, .asm_102e2
+	call $4197
+	ld a, [$d116]
+	cp $e0
+	jr nz, .asm_102e2
+	ld hl, $038b
+	call $2c73
+	call $3c96
+	call Func_37a0
+	pop af
+	ld [$d291], a
+	ret
+
+Unknown_1030b: ; 1030b (4:430b)
+INCBIN "baserom.gbc",$1030b,$1031b - $1030b
+
+BoosterPack_1031b: ; 1031b (4:431b)
+	ld c, a
+	ld a, [$d291]
+	push af
+	push bc
+	call Func_028a
+	call $4000
+	xor a
+	ld [$ccf3], a
+	pop bc
+	push bc
+	ld b, $0
+	ld hl, $43a5
+	add hl, bc
+	ld a, [hl]
+	ld c, a
+	add a
+	add a
+	ld c, a
+	ld hl, $43c2
+	add hl, bc
+	ld a, [hli]
+	push hl
+	ld bc, $0600
+	call $70ca
+	pop hl
+	ld a, [hli]
+	ld [$ce43], a
+	xor a
+	ld [$ce44], a
+	ld a, [hli]
+	ld [$ce3f], a
+	ld a, [hl]
+	ld [$ce40], a
+	call $4031
+	call Func_379b
+	ld a, MUSIC_BOOSTERPACK
+	call PlaySong
+	pop bc
+	ld a, c
+	farcallx $7, $61c4
+	ld hl, $0387
+	ld a, [$d117]
+	cp $1
+	jr nz, .asm_10373
+	ld hl, $0388
+.asm_10373
+	call $2c73
+	call $3c96
+	call Func_37a0
+	ld hl, $0389
+	call $2c73
+	call Func_028a
+	call Func_1288c
+	call Func_099c
+	ld a, $1
+	ld [$cac0], a
+	ld a, $4
+	ld [$ccf3], a
+	farcallx $1, $7599
+	farcall Func_c1a4
+	call Func_3c48
+	pop af
+	ld [$d291], a
+	ret
+; 0x103a5
+
+INCBIN "baserom.gbc",$103a5,$103d2 - $103a5
 
 Func_103d2: ; 103d2 (4:43d2)
 INCBIN "baserom.gbc",$103d2,$103d3 - $103d2
@@ -528,7 +651,7 @@ Func_126d1: ; 126d1 (4:66d1)
 	ret
 
 PointerTable_126fc
-	dw Func_12768
+	dw CardPop_12768
 	dw Func_12741
 	dw Func_12704
 	dw Func_1277e
@@ -543,8 +666,8 @@ Func_12704: ; 12704 (4:6704)
 	ld a, [$a006]
 	ld [$ce47], a
 	call Func_07be
-	ld a, $0
-	call Func_3785
+	ld a, MUSIC_STOP
+	call PlaySong
 	farcall Func_70000
 	ld a, $9
 	ld [$d111], a
@@ -557,8 +680,8 @@ Func_12704: ; 12704 (4:6704)
 	ret
 
 Func_12741: ; 12741 (4:6741)
-	ld a, $0
-	call Func_3785
+	ld a, MUSIC_STOP
+	call PlaySong
 	call Func_11320
 	jr nc, Func_12704
 	farcall Func_c1ed
@@ -573,20 +696,20 @@ Func_12741: ; 12741 (4:6741)
 	or a
 	ret
 
-Func_12768: ; 12768 (4:6768)
-	ld a, $8
-	call Func_3785
+CardPop_12768: ; 12768 (4:6768)
+	ld a, MUSIC_CARDPOP
+	call PlaySong
 	bank1call Func_7571
 	farcall Func_c1a4
 	call Func_3c48
-	ld a, $0
-	call Func_3785
+	ld a, MUSIC_STOP
+	call PlaySong
 	scf
 	ret
 
 Func_1277e: ; 1277e (4:677e)
-	ld a, $0
-	call Func_3785
+	ld a, MUSIC_STOP
+	call PlaySong
 	farcall Func_c9cb
 	farcallx $04, Func_3a40
 	farcall Func_70000
@@ -929,4 +1052,39 @@ Func_131b3: ; 131b3 (4:71b3)
 INCBIN "baserom.gbc",$131b3,$131d3 - $131b3
 
 Func_131d3: ; 131d3 (4:71d3)
-INCBIN "baserom.gbc",$131d3,$14000 - $131d3
+INCBIN "baserom.gbc",$131d3,$1344d - $131d3
+
+Func_1344d: ; 1344d (4:744d)
+	call Func_379b
+	ld a, MUSIC_MEDAL
+	call PlaySong
+	ld hl, $07e6
+	call $2c73
+	call $3c96
+	call Func_37a0
+	ret
+; 0x13462
+
+INCBIN "baserom.gbc",$13462,$13485 - $13462
+
+Func_13485: ; 13485 (4:7485)
+	call Func_07b6
+	ld a, [$ba68]
+	or a
+	ret z
+	ld a, [$ba56]
+	ld [$ce43], a
+	ld a, [$ba57]
+	ld [$ce44], a
+	call Func_07be
+	call Func_379b
+	ld a, MUSIC_MEDAL
+	call PlaySong
+	ld hl, $07e8
+	call $2c73
+	call $3c96
+	call Func_37a0
+	ret
+; 0x134b1
+
+INCBIN "baserom.gbc",$134b1,$14000 - $134b1
diff --git a/engine/bank6.asm b/engine/bank6.asm
index 71212cb..778aaf9 100755
--- a/engine/bank6.asm
+++ b/engine/bank6.asm
@@ -104,7 +104,66 @@ Func_19a12: ; 19a12 (6:5a12)
 	ret
 ; 0x19a1f
 
-INCBIN "baserom.gbc",$19a1f,$1a6cc - $19a1f
+INCBIN "baserom.gbc",$19a1f,$1a61f - $19a1f
+
+Func_1a61f: ; 1a61f (6:661f)
+	push af
+	ld de, $389f
+	call Func_2275
+	pop af
+	or a
+	jr nz, .asm_1a640
+	ld a, $40
+	call $663b
+	ld a, $5f
+	call $663b
+	ld a, $76
+	call $663b
+	ld a, $c1
+	ld hl, $0191
+	jr .asm_1a660
+.asm_1a640
+	ld hl, $018f
+	cp $1e
+	jr z, .asm_1a660
+	cp $43
+	jr z, .asm_1a660
+	ld hl, $0192
+	cp $64
+	jr z, .asm_1a660
+	ld hl, $0193
+	cp $65
+	jr z, .asm_1a660
+	cp $66
+	jr z, .asm_1a660
+	ld hl, $0190
+.asm_1a660
+	push hl
+	ld e, a
+	ld d, $0
+	call $2f10
+	call Func_379b
+	ld a, MUSIC_MEDAL
+	call PlaySong
+	ld hl, $cc27
+	ld a, [hli]
+	ld h, [hl]
+	ld l, a
+	bank1call $2ebb
+	ld a, $c2
+	ld [$ff97], a
+	pop hl
+	bank1call $5e5f
+.asm_1a680
+	call Func_378a
+	or a
+	jr nz, .asm_1a680
+	call Func_37a0
+	bank1call $5773
+	ret
+; 0x1a68d
+
+INCBIN "baserom.gbc",$1a68d,$1a6cc - $1a68d
 
 Func_1a6cc: ; 1a6cc (6:66cc)
 	ret
diff --git a/engine/bank7.asm b/engine/bank7.asm
index ee27f3c..525e2d7 100755
--- a/engine/bank7.asm
+++ b/engine/bank7.asm
@@ -118,18 +118,134 @@ Func_1c82e: ; 1c82e (7:482e)
 INCBIN "baserom.gbc",$1c82e,$1d078 - $1c82e
 
 Func_1d078: ; 1d078 (7:5078)
-INCBIN "baserom.gbc",$1d078,$1d306 - $1d078
+	ld a, [$d627]
+	or a
+	jr z, .asm_1d0c7
+.asm_1d07e
+	ld a, MUSIC_STOP
+	call PlaySong
+	call Func_3ca0
+	call $5335
+	call $53ce
+	xor a
+	ld [$d635], a
+	ld a, $3c
+	ld [$d626], a
+.asm_1d095
+	call Func_3c48
+	call Func_089b
+	call $5614
+	ld hl, $d635
+	inc [hl]
+	call Func_378a
+	or a
+	jr nz, .asm_1d0ae
+	farcall Func_10ab4
+	jr .asm_1d07e
+.asm_1d0ae
+	ld hl, $d626
+	ld a, [hl]
+	or a
+	jr z, .asm_1d0b8
+	dec [hl]
+	jr .asm_1d095
+.asm_1d0b8
+	ld a, [$ff91]
+	and $9
+	jr z, .asm_1d095
+	ld a, $2
+	call Func_3796
+	farcall Func_10ab4
+
+.asm_1d0c7
+	call $50fa
+	call $511c
+	ld a, [$d628]
+	cp $2
+	jr nz, .asm_1d0db
+	call $5289
+	jr c, Func_1d078
+	jr .asm_1d0e7
+.asm_1d0db
+	ld a, [$d628]
+	cp $1
+	jr nz, .asm_1d0e7
+	call $52b8
+	jr c, Func_1d078
+.asm_1d0e7
+	ld a, [$d628]
+	cp $0
+	jr nz, .asm_1d0f3
+	call $52dd
+	jr c, Func_1d078
+.asm_1d0f3
+	call Func_3bdb
+	call Func_3ca0
+	ret
+; 0x1d0fa
+
+INCBIN "baserom.gbc",$1d0fa,$1d11c - $1d0fa
+
+Func_1d11c: ; 1d11c (7:511c)
+	ld a, MUSIC_PCMAINMENU
+	call PlaySong
+	call Func_028a
+	farcallx $4, $4000
+	ld de, $308f
+	call Func_2275
+	call Func_3ca0
+	xor a
+	ld [$cd08], a
+	call $51e1
+	call $517f
+	ld a, $ff
+	ld [$d626], a
+	ld a, [$d627]
+	cp $4
+	jr c, .asm_1d14f
+	ld a, [$d624]
+	or a
+	jr z, .asm_1d14f
+	ld a, $1
+.asm_1d14f
+	ld hl, $d636
+	farcall Func_111e9
+	farcallx $4, $4031
+.asm_1d15a
+	call Func_3c48
+	call Func_089b
+	call Func_264b
+	push af
+	call $51e9
+	pop af
+	jr nc, .asm_1d15a
+	ld a, [$ffb1]
+	cp e
+	jr nz, .asm_1d15a
+	ld [$d627], a
+	ld a, [$d624]
+	or a
+	jr nz, .asm_1d17a
+	inc e
+	inc e
+.asm_1d17a
+	ld a, e
+	ld [$d628], a
+	ret
+; 0x1d17f
+
+INCBIN "baserom.gbc",$1d17f,$1d306 - $1d17f
 
 Func_1d306: ; 1d306 (7:5306)
 INCBIN "baserom.gbc",$1d306,$1d386 - $1d306
 
-Func_1d386: ; 1d386 (7:5386)
+Titlescreen_1d386: ; 1d386 (7:5386)
 	call Func_378a
 	or a
 	jr nz, .asm_1d39f
 	call Func_028a
 	ld a, MUSIC_TITLESCREEN
-	call Func_3785
+	call PlaySong
 	ld bc, $0000
 	ld a, $0
 	call Func_3df3
@@ -146,9 +262,9 @@ INCBIN "baserom.gbc",$1d3a9,$1d42e - $1d3a9
 Func_1d42e: ; 1d42e (7:542e)
 INCBIN "baserom.gbc",$1d42e,$1d519 - $1d42e
 
-Func_1d519: ; 1d519 (7:5519)
+Titlescreen_1d519: ; 1d519 (7:5519)
 	ld a, MUSIC_TITLESCREEN
-	call Func_3785
+	call PlaySong
 	call Func_1d42e
 	scf
 	ret
@@ -159,5 +275,40 @@ 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
+Credits_1d6ad: ; 1d6ad (7:56ad)
+	ld a, MUSIC_STOP
+	call PlaySong
+	call $5705
+	call $4858
+	xor a
+	ld [$d324], a
+	ld a, MUSIC_CREDITS
+	call PlaySong
+	farcallx $4, $4031
+	call $57fc
+.asm_1d6c8
+	call Func_3c48
+	call $5765
+	call $580b
+	ld a, [$d633]
+	cp $ff
+	jr nz, .asm_1d6c8
+	call $3c96
+	ld a, $8
+	farcallx $4, $6863
+	ld a, MUSIC_STOP
+	call PlaySong
+	farcall Func_10ab4
+	call $3ca4
+	call $02d4
+	call $5758
+	call Func_0277
+	call Func_3c48
+	call Func_028a
+	ld hl, $cabb
+	set 1, [hl]
+	call Func_3bdb
+	ret
+; 0x1d705
+
+INCBIN "baserom.gbc",$1d705,$20000 - $1d705
diff --git a/engine/home.asm b/engine/home.asm
index 305887c..fd9a992 100755
--- a/engine/home.asm
+++ b/engine/home.asm
@@ -3546,7 +3546,7 @@ Func_377f: ; 377f (0:377f)
 
 Func_3784: ; 3784 (0:3784)
 	xor a
-Func_3785: ; 3785 (0:3785)
+PlaySong: ; 3785 (0:3785)
 	farcall Func_f4006
 	ret
 
@@ -3626,7 +3626,7 @@ PointerTable_3864: ; 3864 (0:3864)
 	dw Func_38c0
 	dw Func_38a3
 	dw Func_3876
-	dw Func_3911
+	dw Credits_3911
 	dw Func_38fb
 	dw Func_38db
 	dw Func_3874
@@ -3639,8 +3639,8 @@ Func_3876: ; 3876 (0:3876)
 	ld a, [$ff80]
 	push af
 	call Func_379b
-	ld a, $8
-	call Func_3785
+	ld a, MUSIC_CARDPOP
+	call PlaySong
 	ld a, $3
 	ld [$d0c2], a
 	ld a, [$d10e]
@@ -3665,8 +3665,8 @@ Func_38a3: ; 38a3 (0:38a3)
 	ld [$d0c3], a
 	ld a, $2
 	ld [$cc1a], a
-	ld a, $8
-	call Func_3785
+	ld a, MUSIC_CARDPOP
+	call PlaySong
 	bank1call Func_758f
 	scf
 	ret
@@ -3713,8 +3713,8 @@ Func_38fb: ; 38fb (0:38fb)
 	scf
 	ret
 
-Func_3911: ; 3911 (0:3911)
-	farcall Func_1d6ad
+Credits_3911: ; 3911 (0:3911)
+	farcall Credits_1d6ad
 	or a
 	ret
 ; 0x3917
@@ -3850,7 +3850,7 @@ Func_39fc: ; 39fc (0:39fc)
 	cp $1f
 	jr nc, .asm_3a1c
 	ld [$d112], a
-	call Func_3785
+	call PlaySong
 .asm_3a1c
 	pop bc
 	pop hl