Combine wave files

7 files changed, 21 insertions, 87 deletions

diff --git a/audio.asm b/audio.asm
index 0f0f2b26..6dffd23a 100644
--- a/audio.asm
+++ b/audio.asm
@@ -50,7 +50,7 @@ INCLUDE "audio/sfx/sfx_02_11.asm"
 INCLUDE "audio/sfx/sfx_02_12.asm"
 INCLUDE "audio/sfx/sfx_02_13.asm"
 
-INCLUDE "audio/duty_1.asm"
+Music2_WavePointers: INCLUDE "audio/wave_instruments.asm"
 
 INCLUDE "audio/sfx/sfx_02_3f.asm"
 INCLUDE "audio/sfx/sfx_02_5e.asm"
@@ -149,7 +149,7 @@ INCLUDE "audio/sfx/sfx_08_11.asm"
 INCLUDE "audio/sfx/sfx_08_12.asm"
 INCLUDE "audio/sfx/sfx_08_13.asm"
 
-INCLUDE "audio/duty_2.asm"
+Music8_WavePointers: INCLUDE "audio/wave_instruments.asm"
 
 INCLUDE "audio/sfx/sfx_08_40.asm"
 INCLUDE "audio/sfx/sfx_08_3f.asm"
@@ -274,7 +274,7 @@ INCLUDE "audio/sfx/sfx_1f_11.asm"
 INCLUDE "audio/sfx/sfx_1f_12.asm"
 INCLUDE "audio/sfx/sfx_1f_13.asm"
 
-INCLUDE "audio/duty_3.asm"
+Music1f_WavePointers: INCLUDE "audio/wave_instruments.asm"
 
 INCLUDE "audio/sfx/sfx_1f_3f.asm"
 INCLUDE "audio/sfx/sfx_1f_56.asm"
diff --git a/audio/duty_2.asm b/audio/duty_2.asm
deleted file mode 100644
index b4561091..00000000
--- a/audio/duty_2.asm
+++ /dev/null
@@ -1,32 +0,0 @@
-Music8_Channel3DutyPointers: ; 20361 (8:4361)
-	dw Music8_Channel3Duty0
-	dw Music8_Channel3Duty1
-	dw Music8_Channel3Duty2
-	dw Music8_Channel3Duty3
-	dw Music8_Channel3Duty4
-	dw Music8_Channel3Duty5 ; unused
-	dw Music8_Channel3Duty5 ; unused
-	dw Music8_Channel3Duty5 ; unused
-	dw Music8_Channel3Duty5 ; unused
-
-; these are the definitions for the channel 3 instruments
-; each instrument definition is made up of 32 points (nibbles) that form
-; the graph of the wave
-; the current instrument is copied to $FF30
-Music8_Channel3Duty0: ; 20373 (8:4373)
-	db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11
-
-Music8_Channel3Duty1: ; 20383 (8:4383)
-	db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11
-
-Music8_Channel3Duty2: ; 20393 (8:4393)
-	db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31
-
-Music8_Channel3Duty3: ; 203a3 (8:43a3)
-	db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10
-
-Music8_Channel3Duty4: ; 203b3 (8:43b3)
-	db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10
-
-Music8_Channel3Duty5:
-
diff --git a/audio/duty_3.asm b/audio/duty_3.asm
deleted file mode 100644
index b9702a7f..00000000
--- a/audio/duty_3.asm
+++ /dev/null
@@ -1,33 +0,0 @@
-Music1f_Channel3DutyPointers: ; 7c361 (1f:4361)
-	dw Music1f_Channel3Duty0
-	dw Music1f_Channel3Duty1
-	dw Music1f_Channel3Duty2
-	dw Music1f_Channel3Duty3
-	dw Music1f_Channel3Duty4
-	dw Music1f_Channel3Duty5 ; used in the Pokemon Tower theme
-	dw Music1f_Channel3Duty5 ; unused
-	dw Music1f_Channel3Duty5 ; unused
-	dw Music1f_Channel3Duty5 ; unused
-
-; these are the definitions for the channel 3 instruments
-; each instrument definition is made up of 32 points (nibbles) that form
-; the graph of the wave
-; the current instrument is copied to $FF30
-Music1f_Channel3Duty0: ; 7c373 (1f:4373)
-	db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11
-
-Music1f_Channel3Duty1: ; 7c383 (1f:4383)
-	db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11
-
-Music1f_Channel3Duty2: ; 7c393 (1f:4393)
-	db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31
-
-Music1f_Channel3Duty3: ; 7c3a3 (1f:43a3)
-	db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10
-
-Music1f_Channel3Duty4: ; 7c3b3 (1f:43b3)
-	db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10
-
-; duty 5 reads from sfx data
-Music1f_Channel3Duty5: ; 7c3c3 (1f:43c3)
-
diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index 14733513..c1c4999b 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -883,7 +883,7 @@ Func_964b: ; 0x964b
 	add a
 	ld d, $0
 	ld e, a
-	ld hl, Music2_Channel3DutyPointers
+	ld hl, Music2_WavePointers
 	add hl, de
 	ld e, [hl]
 	inc hl
diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 8052a393..b5a07c0f 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -890,7 +890,7 @@ Func_21dcc: ; 21dcc (8:5dcc)
 	add a
 	ld d, $0
 	ld e, a
-	ld hl, Music8_Channel3DutyPointers
+	ld hl, Music8_WavePointers
 	add hl, de
 	ld e, [hl]
 	inc hl
diff --git a/audio/engine_3.asm b/audio/engine_3.asm
index 27b49860..45f890df 100644
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -883,7 +883,7 @@ Func_7d6bf: ; 7d6bf (1f:56bf)
 	add a
 	ld d, $0
 	ld e, a
-	ld hl, Music1f_Channel3DutyPointers
+	ld hl, Music1f_WavePointers
 	add hl, de
 	ld e, [hl]
 	inc hl
diff --git a/audio/duty_1.asm b/audio/wave_instruments.asm
index 2c650ac1..fede06af 100644
--- a/audio/duty_1.asm
+++ b/audio/wave_instruments.asm
@@ -1,33 +1,32 @@
-Music2_Channel3DutyPointers: ; 0x8361
-	dw Music2_Channel3Duty0
-	dw Music2_Channel3Duty1
-	dw Music2_Channel3Duty2
-	dw Music2_Channel3Duty3
-	dw Music2_Channel3Duty4
-	dw Music2_Channel3Duty5 ; used in the Lavender Town theme
-	dw Music2_Channel3Duty5 ; unused
-	dw Music2_Channel3Duty5 ; unused
-	dw Music2_Channel3Duty5 ; unused
+	dw .wave0
+	dw .wave1
+	dw .wave2
+	dw .wave3
+	dw .wave4
+	dw .wave5 ; used in the Lavender Town and Pokemon Tower themes
+	dw .wave5 ; unused
+	dw .wave5 ; unused
+	dw .wave5 ; unused
 
 ; these are the definitions for the channel 3 instruments
 ; each instrument definition is made up of 32 points (nibbles) that form
 ; the graph of the wave
 ; the current instrument is copied to $FF30
-Music2_Channel3Duty0: ; 0x8373
+.wave0
 	db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11
 
-Music2_Channel3Duty1: ; 0x8383
+.wave1
 	db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11
 
-Music2_Channel3Duty2: ; 0x8393
+.wave2
 	db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31
 
-Music2_Channel3Duty3: ; 0x83a3
+.wave3
 	db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10
 
-Music2_Channel3Duty4: ; 0x83b3
+.wave4
 	db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10
 
 ; duty 5 reads from sfx data
-Music2_Channel3Duty5: ; 0x83c3
+.wave5