Use generic names for noise instruments

coming up with satisfactory names is hard, besides this will improve compatibility with crystal
2026-02-06 15:45:24 +13:00 · 2019-07-28 17:29:35 -05:00 · 2019-07-28 17:29:35 -05:00 · 6574881cda
commit 6574881cda
parent 20c4116788
82 changed files with 2350 additions and 2440 deletions
--- a/audio/sfx/noise_instrument01_1.asm
+++ b/audio/sfx/noise_instrument01_1.asm
@ -1,3 +1,3 @@
-SFX_Snare1_1_Ch8:
+SFX_Noise_Instrument01_1_Ch8:
 	noise_note 0, 12, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument01_2.asm
+++ b/audio/sfx/noise_instrument01_2.asm
@ -1,3 +1,3 @@
-SFX_Snare1_2_Ch8:
+SFX_Noise_Instrument01_2_Ch8:
 	noise_note 0, 12, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument01_3.asm
+++ b/audio/sfx/noise_instrument01_3.asm
@ -1,3 +1,3 @@
-SFX_Snare1_3_Ch8:
+SFX_Noise_Instrument01_3_Ch8:
 	noise_note 0, 12, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument02_1.asm
+++ b/audio/sfx/noise_instrument02_1.asm
@ -1,3 +1,3 @@
-SFX_Snare2_1_Ch8:
+SFX_Noise_Instrument02_1_Ch8:
 	noise_note 0, 11, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument02_2.asm
+++ b/audio/sfx/noise_instrument02_2.asm
@ -1,3 +1,3 @@
-SFX_Snare2_2_Ch8:
+SFX_Noise_Instrument02_2_Ch8:
 	noise_note 0, 11, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument02_3.asm
+++ b/audio/sfx/noise_instrument02_3.asm
@ -1,3 +1,3 @@
-SFX_Snare2_3_Ch8:
+SFX_Noise_Instrument02_3_Ch8:
 	noise_note 0, 11, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument03_1.asm
+++ b/audio/sfx/noise_instrument03_1.asm
@ -1,3 +1,3 @@
-SFX_Snare3_1_Ch8:
+SFX_Noise_Instrument03_1_Ch8:
 	noise_note 0, 10, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument03_2.asm
+++ b/audio/sfx/noise_instrument03_2.asm
@ -1,3 +1,3 @@
-SFX_Snare3_2_Ch8:
+SFX_Noise_Instrument03_2_Ch8:
 	noise_note 0, 10, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument03_3.asm
+++ b/audio/sfx/noise_instrument03_3.asm
@ -1,3 +1,3 @@
-SFX_Snare3_3_Ch8:
+SFX_Noise_Instrument03_3_Ch8:
 	noise_note 0, 10, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument04_1.asm
+++ b/audio/sfx/noise_instrument04_1.asm
@ -1,3 +1,3 @@
-SFX_Snare4_1_Ch8:
+SFX_Noise_Instrument04_1_Ch8:
 	noise_note 0, 8, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument04_2.asm
+++ b/audio/sfx/noise_instrument04_2.asm
@ -1,3 +1,3 @@
-SFX_Snare4_2_Ch8:
+SFX_Noise_Instrument04_2_Ch8:
 	noise_note 0, 8, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument04_3.asm
+++ b/audio/sfx/noise_instrument04_3.asm
@ -1,3 +1,3 @@
-SFX_Snare4_3_Ch8:
+SFX_Noise_Instrument04_3_Ch8:
 	noise_note 0, 8, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument05_1.asm
+++ b/audio/sfx/noise_instrument05_1.asm
@ -1,4 +1,4 @@
-SFX_Snare5_1_Ch8:
+SFX_Noise_Instrument05_1_Ch8:
 	noise_note 7, 8, 4, 55
 	noise_note 6, 8, 4, 54
 	noise_note 5, 8, 3, 53
--- a/audio/sfx/noise_instrument05_2.asm
+++ b/audio/sfx/noise_instrument05_2.asm
@ -1,4 +1,4 @@
-SFX_Snare5_2_Ch8:
+SFX_Noise_Instrument05_2_Ch8:
 	noise_note 7, 8, 4, 55
 	noise_note 6, 8, 4, 54
 	noise_note 5, 8, 3, 53
--- a/audio/sfx/noise_instrument05_3.asm
+++ b/audio/sfx/noise_instrument05_3.asm
@ -1,4 +1,4 @@
-SFX_Snare5_3_Ch8:
+SFX_Noise_Instrument05_3_Ch8:
 	noise_note 7, 8, 4, 55
 	noise_note 6, 8, 4, 54
 	noise_note 5, 8, 3, 53
--- a/audio/sfx/noise_instrument06_1.asm
+++ b/audio/sfx/noise_instrument06_1.asm
@ -1,3 +1,3 @@
-SFX_Triangle1_1_Ch8:
+SFX_Noise_Instrument06_1_Ch8:
 	noise_note 0, 5, 1, 42
 	sound_ret
--- a/audio/sfx/noise_instrument06_2.asm
+++ b/audio/sfx/noise_instrument06_2.asm
@ -1,3 +1,3 @@
-SFX_Triangle1_2_Ch8:
+SFX_Noise_Instrument06_2_Ch8:
 	noise_note 0, 5, 1, 42
 	sound_ret
--- a/audio/sfx/noise_instrument06_3.asm
+++ b/audio/sfx/noise_instrument06_3.asm
@ -1,3 +1,3 @@
-SFX_Triangle1_3_Ch8:
+SFX_Noise_Instrument06_3_Ch8:
 	noise_note 0, 5, 1, 42
 	sound_ret
--- a/audio/sfx/noise_instrument07_1.asm
+++ b/audio/sfx/noise_instrument07_1.asm
@ -1,4 +1,4 @@
-SFX_Triangle2_1_Ch8:
+SFX_Noise_Instrument07_1_Ch8:
 	noise_note 1, 4, 1, 43
 	noise_note 0, 6, 1, 42
 	sound_ret
--- a/audio/sfx/noise_instrument07_2.asm
+++ b/audio/sfx/noise_instrument07_2.asm
@ -1,4 +1,4 @@
-SFX_Triangle2_2_Ch8:
+SFX_Noise_Instrument07_2_Ch8:
 	noise_note 1, 4, 1, 43
 	noise_note 0, 6, 1, 42
 	sound_ret
--- a/audio/sfx/noise_instrument07_3.asm
+++ b/audio/sfx/noise_instrument07_3.asm
@ -1,4 +1,4 @@
-SFX_Triangle2_3_Ch8:
+SFX_Noise_Instrument07_3_Ch8:
 	noise_note 1, 4, 1, 43
 	noise_note 0, 6, 1, 42
 	sound_ret
--- a/audio/sfx/noise_instrument08_1.asm
+++ b/audio/sfx/noise_instrument08_1.asm
@ -1,3 +1,3 @@
-SFX_Snare6_1_Ch8:
+SFX_Noise_Instrument08_1_Ch8:
 	noise_note 0, 8, 1, 16
 	sound_ret
--- a/audio/sfx/noise_instrument08_2.asm
+++ b/audio/sfx/noise_instrument08_2.asm
@ -1,3 +1,3 @@
-SFX_Snare6_2_Ch8:
+SFX_Noise_Instrument08_2_Ch8:
 	noise_note 0, 8, 1, 16
 	sound_ret
--- a/audio/sfx/noise_instrument08_3.asm
+++ b/audio/sfx/noise_instrument08_3.asm
@ -1,3 +1,3 @@
-SFX_Snare6_3_Ch8:
+SFX_Noise_Instrument08_3_Ch8:
 	noise_note 0, 8, 1, 16
 	sound_ret
--- a/audio/sfx/noise_instrument09_1.asm
+++ b/audio/sfx/noise_instrument09_1.asm
@ -1,3 +1,3 @@
-SFX_Snare7_1_Ch8:
+SFX_Noise_Instrument09_1_Ch8:
 	noise_note 0, 8, 2, 35
 	sound_ret
--- a/audio/sfx/noise_instrument09_2.asm
+++ b/audio/sfx/noise_instrument09_2.asm
@ -1,3 +1,3 @@
-SFX_Snare7_2_Ch8:
+SFX_Noise_Instrument09_2_Ch8:
 	noise_note 0, 8, 2, 35
 	sound_ret
--- a/audio/sfx/noise_instrument09_3.asm
+++ b/audio/sfx/noise_instrument09_3.asm
@ -1,3 +1,3 @@
-SFX_Snare7_3_Ch8:
+SFX_Noise_Instrument09_3_Ch8:
 	noise_note 0, 8, 2, 35
 	sound_ret
--- a/audio/sfx/noise_instrument10_1.asm
+++ b/audio/sfx/noise_instrument10_1.asm
@ -1,3 +1,3 @@
-SFX_Snare8_1_Ch8:
+SFX_Noise_Instrument10_1_Ch8:
 	noise_note 0, 8, 2, 37
 	sound_ret
--- a/audio/sfx/noise_instrument10_2.asm
+++ b/audio/sfx/noise_instrument10_2.asm
@ -1,3 +1,3 @@
-SFX_Snare8_2_Ch8:
+SFX_Noise_Instrument10_2_Ch8:
 	noise_note 0, 8, 2, 37
 	sound_ret
--- a/audio/sfx/noise_instrument10_3.asm
+++ b/audio/sfx/noise_instrument10_3.asm
@ -1,3 +1,3 @@
-SFX_Snare8_3_Ch8:
+SFX_Noise_Instrument10_3_Ch8:
 	noise_note 0, 8, 2, 37
 	sound_ret
--- a/audio/sfx/noise_instrument11_1.asm
+++ b/audio/sfx/noise_instrument11_1.asm
@ -1,3 +1,3 @@
-SFX_Snare9_1_Ch8:
+SFX_Noise_Instrument11_1_Ch8:
 	noise_note 0, 8, 2, 38
 	sound_ret
--- a/audio/sfx/noise_instrument11_2.asm
+++ b/audio/sfx/noise_instrument11_2.asm
@ -1,3 +1,3 @@
-SFX_Snare9_2_Ch8:
+SFX_Noise_Instrument11_2_Ch8:
 	noise_note 0, 8, 2, 38
 	sound_ret
--- a/audio/sfx/noise_instrument11_3.asm
+++ b/audio/sfx/noise_instrument11_3.asm
@ -1,3 +1,3 @@
-SFX_Snare9_3_Ch8:
+SFX_Noise_Instrument11_3_Ch8:
 	noise_note 0, 8, 2, 38
 	sound_ret
--- a/audio/sfx/noise_instrument12_1.asm
+++ b/audio/sfx/noise_instrument12_1.asm
@ -1,3 +1,3 @@
-SFX_Cymbal1_1_Ch8:
+SFX_Noise_Instrument12_1_Ch8:
 	noise_note 0, 10, 1, 16
 	sound_ret
--- a/audio/sfx/noise_instrument12_2.asm
+++ b/audio/sfx/noise_instrument12_2.asm
@ -1,3 +1,3 @@
-SFX_Cymbal1_2_Ch8:
+SFX_Noise_Instrument12_2_Ch8:
 	noise_note 0, 10, 1, 16
 	sound_ret
--- a/audio/sfx/noise_instrument12_3.asm
+++ b/audio/sfx/noise_instrument12_3.asm
@ -1,3 +1,3 @@
-SFX_Cymbal1_3_Ch8:
+SFX_Noise_Instrument12_3_Ch8:
 	noise_note 0, 10, 1, 16
 	sound_ret
--- a/audio/sfx/noise_instrument13_1.asm
+++ b/audio/sfx/noise_instrument13_1.asm
@ -1,3 +1,3 @@
-SFX_Cymbal2_2_Ch8:
+SFX_Noise_Instrument13_1_Ch8:
 	noise_note 0, 10, 2, 17
 	sound_ret
--- a/audio/sfx/noise_instrument13_2.asm
+++ b/audio/sfx/noise_instrument13_2.asm
@ -1,3 +1,3 @@
-SFX_Cymbal2_3_Ch8:
+SFX_Noise_Instrument13_2_Ch8:
 	noise_note 0, 10, 2, 17
 	sound_ret
--- a/audio/sfx/noise_instrument13_3.asm
+++ b/audio/sfx/noise_instrument13_3.asm
@ -1,3 +1,3 @@
-SFX_Cymbal2_1_Ch8:
+SFX_Noise_Instrument13_3_Ch8:
 	noise_note 0, 10, 2, 17
 	sound_ret
--- a/audio/sfx/noise_instrument14_1.asm
+++ b/audio/sfx/noise_instrument14_1.asm
@ -1,3 +1,3 @@
-SFX_Cymbal3_1_Ch8:
+SFX_Noise_Instrument14_1_Ch8:
 	noise_note 0, 10, 2, 80
 	sound_ret
--- a/audio/sfx/noise_instrument14_2.asm
+++ b/audio/sfx/noise_instrument14_2.asm
@ -1,3 +1,3 @@
-SFX_Cymbal3_2_Ch8:
+SFX_Noise_Instrument14_2_Ch8:
 	noise_note 0, 10, 2, 80
 	sound_ret
--- a/audio/sfx/noise_instrument14_3.asm
+++ b/audio/sfx/noise_instrument14_3.asm
@ -1,3 +1,3 @@
-SFX_Cymbal3_3_Ch8:
+SFX_Noise_Instrument14_3_Ch8:
 	noise_note 0, 10, 2, 80
 	sound_ret
--- a/audio/sfx/noise_instrument15_1.asm
+++ b/audio/sfx/noise_instrument15_1.asm
@ -1,4 +1,4 @@
-SFX_Muted_Snare1_1_Ch8:
+SFX_Noise_Instrument15_1_Ch8:
 	noise_note 0, 10, 1, 24
 	noise_note 0, 3, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument15_2.asm
+++ b/audio/sfx/noise_instrument15_2.asm
@ -1,4 +1,4 @@
-SFX_Muted_Snare1_2_Ch8:
+SFX_Noise_Instrument15_2_Ch8:
 	noise_note 0, 10, 1, 24
 	noise_note 0, 3, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument15_3.asm
+++ b/audio/sfx/noise_instrument15_3.asm
@ -1,4 +1,4 @@
-SFX_Muted_Snare1_3_Ch8:
+SFX_Noise_Instrument15_3_Ch8:
 	noise_note 0, 10, 1, 24
 	noise_note 0, 3, 1, 51
 	sound_ret
--- a/audio/sfx/noise_instrument16_1.asm
+++ b/audio/sfx/noise_instrument16_1.asm
@ -1,4 +1,4 @@
-SFX_Triangle3_1_Ch8:
+SFX_Noise_Instrument16_1_Ch8:
 	noise_note 2, 9, 1, 40
 	noise_note 0, 7, 1, 24
 	sound_ret
--- a/audio/sfx/noise_instrument16_2.asm
+++ b/audio/sfx/noise_instrument16_2.asm
@ -1,4 +1,4 @@
-SFX_Triangle3_2_Ch8:
+SFX_Noise_Instrument16_2_Ch8:
 	noise_note 2, 9, 1, 40
 	noise_note 0, 7, 1, 24
 	sound_ret
--- a/audio/sfx/noise_instrument16_3.asm
+++ b/audio/sfx/noise_instrument16_3.asm
@ -1,4 +1,4 @@
-SFX_Triangle3_3_Ch8:
+SFX_Noise_Instrument16_3_Ch8:
 	noise_note 2, 9, 1, 40
 	noise_note 0, 7, 1, 24
 	sound_ret
--- a/audio/sfx/noise_instrument17_1.asm
+++ b/audio/sfx/noise_instrument17_1.asm
@ -1,3 +1,3 @@
-SFX_Muted_Snare2_1_Ch8:
+SFX_Noise_Instrument17_1_Ch8:
 	noise_note 0, 9, 1, 34
 	sound_ret
--- a/audio/sfx/noise_instrument17_2.asm
+++ b/audio/sfx/noise_instrument17_2.asm
@ -1,3 +1,3 @@
-SFX_Muted_Snare2_2_Ch8:
+SFX_Noise_Instrument17_2_Ch8:
 	noise_note 0, 9, 1, 34
 	sound_ret
--- a/audio/sfx/noise_instrument17_3.asm
+++ b/audio/sfx/noise_instrument17_3.asm
@ -1,3 +1,3 @@
-SFX_Muted_Snare2_3_Ch8:
+SFX_Noise_Instrument17_3_Ch8:
 	noise_note 0, 9, 1, 34
 	sound_ret
--- a/audio/sfx/noise_instrument18_1.asm
+++ b/audio/sfx/noise_instrument18_1.asm
@ -1,3 +1,3 @@
-SFX_Muted_Snare3_1_Ch8:
+SFX_Noise_Instrument18_1_Ch8:
 	noise_note 0, 7, 1, 34
 	sound_ret
--- a/audio/sfx/noise_instrument18_2.asm
+++ b/audio/sfx/noise_instrument18_2.asm
@ -1,3 +1,3 @@
-SFX_Muted_Snare3_2_Ch8:
+SFX_Noise_Instrument18_2_Ch8:
 	noise_note 0, 7, 1, 34
 	sound_ret
--- a/audio/sfx/noise_instrument18_3.asm
+++ b/audio/sfx/noise_instrument18_3.asm
@ -1,3 +1,3 @@
-SFX_Muted_Snare3_3_Ch8:
+SFX_Noise_Instrument18_3_Ch8:
 	noise_note 0, 7, 1, 34
 	sound_ret
--- a/audio/sfx/noise_instrument19_1.asm
+++ b/audio/sfx/noise_instrument19_1.asm
@ -1,3 +1,3 @@
-SFX_Muted_Snare4_1_Ch8:
+SFX_Noise_Instrument19_1_Ch8:
 	noise_note 0, 6, 1, 34
 	sound_ret
--- a/audio/sfx/noise_instrument19_2.asm
+++ b/audio/sfx/noise_instrument19_2.asm
@ -1,3 +1,3 @@
-SFX_Muted_Snare4_2_Ch8:
+SFX_Noise_Instrument19_2_Ch8:
 	noise_note 0, 6, 1, 34
 	sound_ret
--- a/audio/sfx/noise_instrument19_3.asm
+++ b/audio/sfx/noise_instrument19_3.asm
@ -1,3 +1,3 @@
-SFX_Muted_Snare4_3_Ch8:
+SFX_Noise_Instrument19_3_Ch8:
 	noise_note 0, 6, 1, 34
 	sound_ret