Wave and noise instruments

5 files changed, 72 insertions, 136 deletions

diff --git a/data/noise_instruments.asm b/data/noise_instruments.asm
new file mode 100755
index 0000000..3081a51
--- /dev/null
+++ b/data/noise_instruments.asm
@@ -0,0 +1,37 @@
+	dw .bass
+	dw .unused
+	dw .snare1
+	dw .unused
+	dw .snare2
+	dw .unused
+	dw .snare3
+	dw .unused
+	dw .snare4
+	dw .unused
+	dw .unused
+	dw .snare5
+
+.unused
+	db $00,$ed,$02,$c0,$46,$63,$ff
+
+.bass
+	db $88,$32,$d2,$c0,$46,$61,$ff
+
+.snare1
+	db $88,$24,$a1,$80,$16,$16,$16,$15,$17,$ff
+
+.snare2
+	db $88,$00,$95,$80,$05,$04,$02,$01,$ff
+
+.snare3
+	db $88,$32,$b1,$c0,$02,$01,$01,$01,$ff
+
+.snare4
+	db $88,$00,$84,$80,$04,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02
+	db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02
+	db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$ff
+
+.snare5
+	db $88,$00,$c4,$80,$05,$03,$03,$03,$03,$03,$03,$03,$03,$02,$02,$02,$02,$02
+	db $02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02,$02
+	db $02,$02,$02,$02,$02,$02,$02,$02,$02,$01,$01,$01,$01,$01,$01,$ff
\ No newline at end of file
diff --git a/data/wave_instruments.asm b/data/wave_instruments.asm
new file mode 100755
index 0000000..132042f
--- /dev/null
+++ b/data/wave_instruments.asm
@@ -0,0 +1,20 @@
+	dw .wave0
+	dw .wave1
+	dw .wave2
+	dw .wave3
+	dw .wave4
+
+.wave0
+	db $79,$bd,$ff,$ff,$ff,$ff,$fd,$b9,$75,$31,$00,$00,$00,$00,$01,$35
+
+.wave1
+	db $01,$12,$23,$34,$45,$56,$67,$77,$88,$99,$aa,$bb,$cc,$dd,$ee,$ff
+
+.wave2
+	db $46,$8a,$cc,$cc,$cc,$cc,$ca,$86,$42,$11,$00,$00,$00,$00,$01,$12
+
+.wave3
+	db $7a,$df,$ff,$da,$74,$10,$00,$14,$7a,$df,$ff,$da,$74,$10,$00,$14
+
+.wave4
+	db $ee,$ee,$ee,$ee,$ee,$ee,$ee,$ee,$00,$00,$00,$00,$00,$00,$00,$00
\ No newline at end of file
diff --git a/engine/music1.asm b/engine/music1.asm
index 3ca0b0b..554aecf 100755
--- a/engine/music1.asm
+++ b/engine/music1.asm
@@ -759,7 +759,7 @@ Music1_note: ; f448c (3d:448c)
 	sla a
 	ld e, a
 	pop af
-	ld hl, PointerTable_f4d34
+	ld hl, Music1_NoiseInstruments
 	add a
 	ld d, c
 	ld c, a
@@ -1283,7 +1283,7 @@ Func_f47ea: ; f479c (3d:47ea)
 	add a
 	ld d, $0
 	ld e, a
-	ld hl, PointerTable_f4cda
+	ld hl, Music1_WaveInstruments
 	add hl, de
 	ld a, [hli]
 	ld h, [hl]
@@ -1858,62 +1858,11 @@ INCBIN "baserom.gbc",$f4c28,$f4c30 - $f4c28
 Unknown_f4c30: ; f4c30 (3d:4c30)
 INCBIN "baserom.gbc",$f4c30,$f4cda - $f4c30
 
-PointerTable_f4cda: ; f4cda (3d:4cda)
-	dw Unknown_f4ce4
-	dw Unknown_f4cf4
-	dw Unknown_f4d04
-	dw Unknown_f4d14
-	dw Unknown_f4d24
+Music1_WaveInstruments: ; f4cda (3d:4cda)
+INCLUDE "data/wave_instruments.asm"
 
-Unknown_f4ce4: ; f4ce4 (3d:4ce4)
-INCBIN "baserom.gbc",$f4ce4,$f4cf4 - $f4ce4
-
-Unknown_f4cf4: ; f4cf4 (3d:4cf4)
-INCBIN "baserom.gbc",$f4cf4,$f4d04 - $f4cf4
-
-Unknown_f4d04: ; f4d04 (3d:4d04)
-INCBIN "baserom.gbc",$f4d04,$f4d14 - $f4d04
-
-Unknown_f4d14: ; f4d14 (3d:4d14)
-INCBIN "baserom.gbc",$f4d14,$f4d24 - $f4d14
-
-Unknown_f4d24: ; f4d24 (3d:4d24)
-INCBIN "baserom.gbc",$f4d24,$f4d34 - $f4d24
-
-PointerTable_f4d34: ; f4d34 (3d:4d34)
-	dw Unknown_f4d53
-	dw Unknown_f4d4c
-	dw Unknown_f4d5a
-	dw Unknown_f4d4c
-	dw Unknown_f4d64
-	dw Unknown_f4d4c
-	dw Unknown_f4d6d
-	dw Unknown_f4d4c
-	dw Unknown_f4d76
-	dw Unknown_f4d4c
-	dw Unknown_f4d4c
-	dw Unknown_f4daa
-
-Unknown_f4d4c: ; f4d4c (3d:4d4c)
-INCBIN "baserom.gbc",$f4d4c,$f4d53 - $f4d4c
-
-Unknown_f4d53: ; f4d53 (3d:4d53)
-INCBIN "baserom.gbc",$f4d53,$f4d5a - $f4d53
-
-Unknown_f4d5a: ; f4d5a (3d:4d5a)
-INCBIN "baserom.gbc",$f4d5a,$f4d64 - $f4d5a
-
-Unknown_f4d64: ; f4d64 (3d:4d64)
-INCBIN "baserom.gbc",$f4d64,$f4d6d - $f4d64
-
-Unknown_f4d6d: ; f4d6d (3d:4d6d)
-INCBIN "baserom.gbc",$f4d6d,$f4d76 - $f4d6d
-
-Unknown_f4d76: ; f4d76 (3d:4d76)
-INCBIN "baserom.gbc",$f4d76,$f4daa - $f4d76
-
-Unknown_f4daa: ; f4daa (3d:4daa)
-INCBIN "baserom.gbc",$f4daa,$f4dde - $f4daa
+Music1_NoiseInstruments: ; f4d34 (3d:4d34)
+INCLUDE "data/noise_instruments.asm"
 
 PointerTable_f4dde: ; f4dde (3d:4dde)
 	dw Unknown_f4df4
diff --git a/engine/music2.asm b/engine/music2.asm
index ef5cc82..d7b42a8 100755
--- a/engine/music2.asm
+++ b/engine/music2.asm
@@ -759,7 +759,7 @@ Music2_note: ; f448c (3d:448c)
 	sla a
 	ld e, a
 	pop af
-	ld hl, PointerTable_f8d34
+	ld hl, Music2_NoiseInstruments
 	add a
 	ld d, c
 	ld c, a
@@ -1283,7 +1283,7 @@ Func_f87ea: ; f879c (3e:47ea)
 	add a
 	ld d, $0
 	ld e, a
-	ld hl, PointerTable_f8cda
+	ld hl, Music2_WaveInstruments
 	add hl, de
 	ld a, [hli]
 	ld h, [hl]
@@ -1858,62 +1858,11 @@ INCBIN "baserom.gbc",$f8c28,$f8c30 - $f8c28
 Unknown_f8c30: ; f8c30 (3e:4c30)
 INCBIN "baserom.gbc",$f8c30,$f8cda - $f8c30
 
-PointerTable_f8cda: ; f8cda (3e:4cda)
-	dw Unknown_f8ce4
-	dw Unknown_f8cf4
-	dw Unknown_f8d04
-	dw Unknown_f8d14
-	dw Unknown_f8d24
+Music2_WaveInstruments: ; f8cda (3e:4cda)
+INCLUDE "data/wave_instruments.asm"
 
-Unknown_f8ce4: ; f8ce4 (3e:4ce4)
-INCBIN "baserom.gbc",$f8ce4,$f8cf4 - $f8ce4
-
-Unknown_f8cf4: ; f8cf4 (3e:4cf4)
-INCBIN "baserom.gbc",$f8cf4,$f8d04 - $f8cf4
-
-Unknown_f8d04: ; f8d04 (3e:4d04)
-INCBIN "baserom.gbc",$f8d04,$f8d14 - $f8d04
-
-Unknown_f8d14: ; f8d14 (3e:4d14)
-INCBIN "baserom.gbc",$f8d14,$f8d24 - $f8d14
-
-Unknown_f8d24: ; f8d24 (3e:4d24)
-INCBIN "baserom.gbc",$f8d24,$f8d34 - $f8d24
-
-PointerTable_f8d34: ; f8d34 (3e:4d34)
-	dw Unknown_f8d53
-	dw Unknown_f8d4c
-	dw Unknown_f8d5a
-	dw Unknown_f8d4c
-	dw Unknown_f8d64
-	dw Unknown_f8d4c
-	dw Unknown_f8d6d
-	dw Unknown_f8d4c
-	dw Unknown_f8d76
-	dw Unknown_f8d4c
-	dw Unknown_f8d4c
-	dw Unknown_f8daa
-
-Unknown_f8d4c: ; f8d4c (3e:4d4c)
-INCBIN "baserom.gbc",$f8d4c,$f8d53 - $f8d4c
-
-Unknown_f8d53: ; f8d53 (3e:4d53)
-INCBIN "baserom.gbc",$f8d53,$f8d5a - $f8d53
-
-Unknown_f8d5a: ; f8d5a (3e:4d5a)
-INCBIN "baserom.gbc",$f8d5a,$f8d64 - $f8d5a
-
-Unknown_f8d64: ; f8d64 (3e:4d64)
-INCBIN "baserom.gbc",$f8d64,$f8d6d - $f8d64
-
-Unknown_f8d6d: ; f8d6d (3e:4d6d)
-INCBIN "baserom.gbc",$f8d6d,$f8d76 - $f8d6d
-
-Unknown_f8d76: ; f8d76 (3e:4d76)
-INCBIN "baserom.gbc",$f8d76,$f8daa - $f8d76
-
-Unknown_f8daa: ; f8daa (3e:4daa)
-INCBIN "baserom.gbc",$f8daa,$f8dde - $f8daa
+Music2_NoiseInstruments: ; f8d34 (3e:4d34)
+INCLUDE "data/noise_instruments.asm"
 
 PointerTable_f8dde: ; f8dde (3e:4dde)
 	dw Unknown_f8df4
diff --git a/engine/sfx.asm b/engine/sfx.asm
index 8aaf0a7..6c04265 100755
--- a/engine/sfx.asm
+++ b/engine/sfx.asm
@@ -394,7 +394,7 @@ SFX_7: ; fc202 (3f:4202)
 	add a
 	ld d, $0
 	ld e, a
-	ld hl, PointerTable_fc485
+	ld hl, SFX_WaveInstruments
 	add hl, de
 	ld a, [hli]
 	ld h, [hl]
@@ -495,27 +495,8 @@ Func_fc279: ; fc279 (3f:4279)
 
 INCLUDE "data/sfx_headers.asm"
 
-PointerTable_fc485: ; fc485 (3f:4485)
-	dw Unknown_fc48f
-	dw Unknown_fc49f
-	dw Unknown_fc4af
-	dw Unknown_fc4bf
-	dw Unknown_fc4cf
-
-Unknown_fc48f: ; fc48f (3f:448f)
-INCBIN "baserom.gbc",$fc48f,$fc49f - $fc48f
-
-Unknown_fc49f: ; fc49f (3f:449f)
-INCBIN "baserom.gbc",$fc49f,$fc4af - $fc49f
-
-Unknown_fc4af: ; fc4af (3f:44af)
-INCBIN "baserom.gbc",$fc4af,$fc4bf - $fc4af
-
-Unknown_fc4bf: ; fc4bf (3f:44bf)
-INCBIN "baserom.gbc",$fc4bf,$fc4cf - $fc4bf
-
-Unknown_fc4cf: ; fc4cf (3f:44cf)
-INCBIN "baserom.gbc",$fc4cf,$fc4df - $fc4cf
+SFX_WaveInstruments: ; fc485 (3f:4485)
+INCLUDE "data/wave_instruments.asm"
 
 INCLUDE "audio/sfx/sfx_01.asm"
 INCLUDE "audio/sfx/sfx_02.asm"