Add VibratoTypes

3 files changed, 53 insertions, 92 deletions

diff --git a/data/vibrato_types.asm b/data/vibrato_types.asm
new file mode 100755
index 0000000..979697a
--- /dev/null
+++ b/data/vibrato_types.asm
@@ -0,0 +1,44 @@
+	dw .vibratoType0
+	dw .vibratoType1
+	dw .vibratoType2
+	dw .vibratoType3
+	dw .vibratoType4
+	dw .vibratoType5
+	dw .vibratoType6
+	dw .vibratoType7
+	dw .vibratoType8
+	dw .vibratoType9
+	dw .vibratoTypeA
+
+.vibratoType0
+	db $00,$80,$80
+
+.vibratoType1
+	db $01,$02,$01,$00,$ff,$fe,$ff,$00,$80,$80
+
+.vibratoType2
+	db $03,$fd,$03,$00,$00,$00,$00,$00,$00,$00,$00,$00,$80,$01
+
+.vibratoType3
+	db $01,$01,$00,$00,$ff,$ff,$00,$00,$80,$80
+
+.vibratoType4
+	db $01,$01,$01,$00,$00,$00,$ff,$ff,$ff,$00,$00,$00,$80,$80
+
+.vibratoType5
+	db $02,$04,$06,$04,$02,$00,$fe,$fc,$fa,$fc,$fe,$00,$80,$80
+
+.vibratoType6
+	db $04,$04,$08,$08,$04,$04,$00,$00,$fc,$fc,$f8,$f8,$fc,$fc,$00,$00,$80,$80
+
+.vibratoType7
+	db $f8,$f8,$f9,$f9,$fa,$fa,$fb,$fb,$fc,$fc,$fd,$fd,$fe,$fe,$ff,$ff,$00,$00,$80,$05
+
+.vibratoType8
+	db $02,$04,$02,$00,$fe,$fc,$fe,$00,$80,$80
+
+.vibratoType9
+	db $01,$02,$04,$02,$01,$00,$ff,$fe,$fc,$fe,$ff,$00,$80,$08
+
+.vibratoTypeA
+	db $01,$01,$01,$01,$00,$00,$00,$00,$ff,$ff,$ff,$ff,$00,$00,$00,$00,$80,$80
\ No newline at end of file
diff --git a/engine/music1.asm b/engine/music1.asm
index eca0613..75595d9 100755
--- a/engine/music1.asm
+++ b/engine/music1.asm
@@ -1417,7 +1417,7 @@ Func_f4898: ; f4898 (3d:4898)
 	add hl, bc
 	ld e, [hl]
 	ld d, $0
-	ld hl, PointerTable_f4dde
+	ld hl, Music1_VibratoTypes
 	add hl, de
 	add hl, de
 	ld a, [hli]
@@ -1861,51 +1861,8 @@ INCLUDE "data/wave_instruments.asm"
 Music1_NoiseInstruments: ; f4d34 (3d:4d34)
 INCLUDE "data/noise_instruments.asm"
 
-PointerTable_f4dde: ; f4dde (3d:4dde)
-	dw Unknown_f4df4
-	dw Unknown_f4df7
-	dw Unknown_f4e01
-	dw Unknown_f4e0f
-	dw Unknown_f4e19
-	dw Unknown_f4e27
-	dw Unknown_f4e35
-	dw Unknown_f4e47
-	dw Unknown_f4e5b
-	dw Unknown_f4e65
-	dw Unknown_f4e73
-
-Unknown_f4df4: ; f4df4 (3d:4df4)
-INCBIN "baserom.gbc",$f4df4,$f4df7 - $f4df4
-
-Unknown_f4df7: ; f4df7 (3d:4df7)
-INCBIN "baserom.gbc",$f4df7,$f4e01 - $f4df7
-
-Unknown_f4e01: ; f4e01 (3d:4e01)
-INCBIN "baserom.gbc",$f4e01,$f4e0f - $f4e01
-
-Unknown_f4e0f: ; f4e0f (3d:4e0f)
-INCBIN "baserom.gbc",$f4e0f,$f4e19 - $f4e0f
-
-Unknown_f4e19: ; f4e19 (3d:4e19)
-INCBIN "baserom.gbc",$f4e19,$f4e27 - $f4e19
-
-Unknown_f4e27: ; f4e27 (3d:4e27)
-INCBIN "baserom.gbc",$f4e27,$f4e35 - $f4e27
-
-Unknown_f4e35: ; f4e35 (3d:4e35)
-INCBIN "baserom.gbc",$f4e35,$f4e47 - $f4e35
-
-Unknown_f4e47: ; f4e47 (3d:4e47)
-INCBIN "baserom.gbc",$f4e47,$f4e5b - $f4e47
-
-Unknown_f4e5b: ; f4e5b (3d:4e5b)
-INCBIN "baserom.gbc",$f4e5b,$f4e65 - $f4e5b
-
-Unknown_f4e65: ; f4e65 (3d:4e65)
-INCBIN "baserom.gbc",$f4e65,$f4e73 - $f4e65
-
-Unknown_f4e73: ; f4e73 (3d:4e73)
-INCBIN "baserom.gbc",$f4e73,$f4e85 - $f4e73
+Music1_VibratoTypes: ; f4dde (3d:4dde)
+INCLUDE "data/vibrato_types.asm"
 
 Unknown_f4e85: ; f4e85 (3d:4e85)
 INCBIN "baserom.gbc",$f4e85,$f4ee5 - $f4e85
diff --git a/engine/music2.asm b/engine/music2.asm
index 38c4c46..623c2ea 100755
--- a/engine/music2.asm
+++ b/engine/music2.asm
@@ -48,7 +48,7 @@ Func_f802d: ; f802d (3e:402d)
 	ld c, a
 	or a
 	jr z, .asm_f8043
-	ld hl, $4e85
+	ld hl, Unknown_f8e85
 	add hl, bc
 	ld b, [hl]
 	ld a, [$dd83]
@@ -1417,7 +1417,7 @@ Func_f8898: ; f8898 (3e:4898)
 	add hl, bc
 	ld e, [hl]
 	ld d, $0
-	ld hl, PointerTable_f8dde
+	ld hl, Music2_VibratoTypes
 	add hl, de
 	add hl, de
 	ld a, [hli]
@@ -1861,51 +1861,11 @@ INCLUDE "data/wave_instruments.asm"
 Music2_NoiseInstruments: ; f8d34 (3e:4d34)
 INCLUDE "data/noise_instruments.asm"
 
-PointerTable_f8dde: ; f8dde (3e:4dde)
-	dw Unknown_f8df4
-	dw Unknown_f8df7
-	dw Unknown_f8e01
-	dw Unknown_f8e0f
-	dw Unknown_f8e19
-	dw Unknown_f8e27
-	dw Unknown_f8e35
-	dw Unknown_f8e47
-	dw Unknown_f8e5b
-	dw Unknown_f8e65
-	dw Unknown_f8e73
+Music2_VibratoTypes: ; f8dde (3e:4dde)
+INCLUDE "data/vibrato_types.asm"
 
-Unknown_f8df4: ; f8df4 (3e:4df4)
-INCBIN "baserom.gbc",$f8df4,$f8df7 - $f8df4
-
-Unknown_f8df7: ; f8df7 (3e:4df7)
-INCBIN "baserom.gbc",$f8df7,$f8e01 - $f8df7
-
-Unknown_f8e01: ; f8e01 (3e:4e01)
-INCBIN "baserom.gbc",$f8e01,$f8e0f - $f8e01
-
-Unknown_f8e0f: ; f8e0f (3e:4e0f)
-INCBIN "baserom.gbc",$f8e0f,$f8e19 - $f8e0f
-
-Unknown_f8e19: ; f8e19 (3e:4e19)
-INCBIN "baserom.gbc",$f8e19,$f8e27 - $f8e19
-
-Unknown_f8e27: ; f8e27 (3e:4e27)
-INCBIN "baserom.gbc",$f8e27,$f8e35 - $f8e27
-
-Unknown_f8e35: ; f8e35 (3e:4e35)
-INCBIN "baserom.gbc",$f8e35,$f8e47 - $f8e35
-
-Unknown_f8e47: ; f8e47 (3e:4e47)
-INCBIN "baserom.gbc",$f8e47,$f8e5b - $f8e47
-
-Unknown_f8e5b: ; f8e5b (3e:4e5b)
-INCBIN "baserom.gbc",$f8e5b,$f8e65 - $f8e5b
-
-Unknown_f8e65: ; f8e65 (3e:4e65)
-INCBIN "baserom.gbc",$f8e65,$f8e73 - $f8e65
-
-Unknown_f8e73: ; f8e73 (3e:4e73)
-INCBIN "baserom.gbc",$f8e73,$f8ee5 - $f8e73
+Unknown_f8e85: ; f8e85 (3e:4e85)
+INCBIN "baserom.gbc",$f8e85,$f8ee5 - $f8e85
 
 INCLUDE "data/music2_headers.asm"