ref: cc98f282271f627773203b038def8404bf9f9dad
parent: d8c6817279e415d6177b0548c0ad0994546ff104
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Sun Jul 10 16:22:24 EDT 2022
Replace "branch" labels in SFX files with local names
--- a/audio/sfx/59_1.asm
+++ b/audio/sfx/59_1.asm
@@ -3,7 +3,6 @@
square_note 4, 15, 1, 1920
sound_ret
-
SFX_59_1_Ch6:
duty_cycle 2
square_note 1, 0, 8, 0
--- a/audio/sfx/59_3.asm
+++ b/audio/sfx/59_3.asm
@@ -3,7 +3,6 @@
square_note 4, 15, 1, 1920
sound_ret
-
SFX_59_3_Ch6:
duty_cycle 2
square_note 1, 0, 8, 0
--- a/audio/sfx/ball_poof.asm
+++ b/audio/sfx/ball_poof.asm
@@ -5,7 +5,6 @@
pitch_sweep 0, 8
sound_ret
-
SFX_Ball_Poof_Ch8:
noise_note 15, 10, 2, 34
sound_ret
--- a/audio/sfx/ball_toss.asm
+++ b/audio/sfx/ball_toss.asm
@@ -4,7 +4,6 @@
square_note 15, 15, 2, 1920
sound_ret
-
SFX_Ball_Toss_Ch6:
duty_cycle 2
square_note 15, 12, 2, 1922
--- a/audio/sfx/battle_1e.asm
+++ b/audio/sfx/battle_1e.asm
@@ -7,7 +7,6 @@
pitch_sweep 0, 8
sound_ret
-
SFX_Battle_1E_Ch8:
noise_note 0, 13, 1, 66
noise_note 4, 10, 1, 50
--- a/audio/sfx/battle_24.asm
+++ b/audio/sfx/battle_24.asm
@@ -5,7 +5,6 @@
pitch_sweep 0, 8
sound_ret
-
SFX_Battle_24_Ch8:
noise_note 15, 3, -7, 34
noise_note 15, 15, 2, 33
--- a/audio/sfx/battle_27.asm
+++ b/audio/sfx/battle_27.asm
@@ -1,24 +1,20 @@
SFX_Battle_27_Ch5:
duty_cycle 2
square_note 15, 3, -7, 1984
-
-SFX_Battle_27_branch_2062a:
+.loop1:
square_note 15, 13, -7, 1984
- sound_loop 4, SFX_Battle_27_branch_2062a
+ sound_loop 4, .loop1
square_note 15, 13, 1, 1984
sound_ret
-
SFX_Battle_27_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 15, 2, -7, 1992
-
-SFX_Battle_27_branch_2063d:
+.loop1:
square_note 15, 12, -7, 1991
- sound_loop 4, SFX_Battle_27_branch_2063d
+ sound_loop 4, .loop1
square_note 15, 12, 1, 1992
sound_ret
-
SFX_Battle_27_Ch8:
noise_note 3, 9, 7, 18
--- a/audio/sfx/battle_28.asm
+++ b/audio/sfx/battle_28.asm
@@ -5,7 +5,6 @@
sound_loop 12, SFX_Battle_28_Ch5
sound_ret
-
SFX_Battle_28_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 0, 14, 1, 1985
@@ -12,7 +11,6 @@
square_note 0, 14, 1, 1793
sound_loop 12, SFX_Battle_28_Ch6
sound_ret
-
SFX_Battle_28_Ch8:
noise_note 1, 13, 1, 73
--- a/audio/sfx/battle_29.asm
+++ b/audio/sfx/battle_29.asm
@@ -7,7 +7,6 @@
square_note 15, 12, 2, 272
sound_ret
-
SFX_Battle_29_Ch8:
noise_note 10, 15, 3, 53
noise_note 14, 15, 6, 69
--- a/audio/sfx/battle_2a.asm
+++ b/audio/sfx/battle_2a.asm
@@ -8,7 +8,6 @@
square_note 8, 13, 1, 1536
sound_ret
-
SFX_Battle_2A_Ch6:
duty_cycle_pattern 2, 0, 3, 1
square_note 5, 14, 4, 1504
@@ -17,7 +16,6 @@
square_note 14, 13, 1, 1696
sound_loop 3, SFX_Battle_2A_Ch6
sound_ret
-
SFX_Battle_2A_Ch8:
noise_note 5, 12, 3, 51
--- a/audio/sfx/battle_2b.asm
+++ b/audio/sfx/battle_2b.asm
@@ -9,7 +9,6 @@
square_note 8, 8, 1, 1024
sound_ret
-
SFX_Battle_2B_Ch8:
noise_note 3, 6, 2, 34
noise_note 3, 10, 2, 50
--- a/audio/sfx/battle_2c.asm
+++ b/audio/sfx/battle_2c.asm
@@ -6,7 +6,6 @@
sound_loop 3, SFX_Battle_2C_Ch5
sound_ret
-
SFX_Battle_2C_Ch6:
duty_cycle_pattern 2, 0, 3, 1
square_note 7, 14, 4, 1072
@@ -14,7 +13,6 @@
square_note 15, 10, 2, 1080
sound_loop 4, SFX_Battle_2C_Ch6
sound_ret
-
SFX_Battle_2C_Ch8:
noise_note 9, 15, 4, 68
--- a/audio/sfx/battle_2e.asm
+++ b/audio/sfx/battle_2e.asm
@@ -7,7 +7,6 @@
sound_loop 8, SFX_Battle_2E_Ch5
sound_ret
-
SFX_Battle_2E_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 2, 14, 1, 770
@@ -16,7 +15,6 @@
square_note 5, 14, 1, 1794
sound_loop 8, SFX_Battle_2E_Ch6
sound_ret
-
SFX_Battle_2E_Ch8:
noise_note 2, 13, 3, 16
--- a/audio/sfx/battle_2f.asm
+++ b/audio/sfx/battle_2f.asm
@@ -5,7 +5,6 @@
sound_loop 8, SFX_Battle_2F_Ch5
sound_ret
-
SFX_Battle_2F_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 4, 14, 2, 514
@@ -12,7 +11,6 @@
square_note 4, 14, 1, 2018
sound_loop 9, SFX_Battle_2F_Ch6
sound_ret
-
SFX_Battle_2F_Ch8:
noise_note 4, 15, -7, 67
--- a/audio/sfx/battle_31.asm
+++ b/audio/sfx/battle_31.asm
@@ -7,7 +7,6 @@
square_note 15, 15, 2, 2016
sound_ret
-
SFX_Battle_31_Ch6:
duty_cycle 3
square_note 15, 15, -7, 2018
--- a/audio/sfx/battle_32.asm
+++ b/audio/sfx/battle_32.asm
@@ -5,7 +5,6 @@
pitch_sweep 0, 8
sound_ret
-
SFX_Battle_32_Ch6:
duty_cycle 3
square_note 8, 15, 1, 1793
--- a/audio/sfx/battle_33.asm
+++ b/audio/sfx/battle_33.asm
@@ -7,7 +7,6 @@
square_note 8, 15, 1, 1792
sound_ret
-
SFX_Battle_33_Ch6:
duty_cycle 3
square_note 6, 14, 1, 1296
--- a/audio/sfx/battle_34.asm
+++ b/audio/sfx/battle_34.asm
@@ -5,7 +5,6 @@
square_note 15, 15, 3, 1024
sound_ret
-
SFX_Battle_34_Ch6:
duty_cycle_pattern 2, 3, 1, 0
square_note 8, 14, -7, 960
@@ -12,7 +11,6 @@
square_note 15, 14, -7, 960
square_note 15, 14, 3, 960
sound_ret
-
SFX_Battle_34_Ch8:
noise_note 4, 15, -7, 81
--- a/audio/sfx/battle_35.asm
+++ b/audio/sfx/battle_35.asm
@@ -12,7 +12,6 @@
note G#, 8
sound_ret
-
SFX_Battle_35_Ch6:
execute_music
vibrato 10, 2, 3
--- a/audio/sfx/battle_36.asm
+++ b/audio/sfx/battle_36.asm
@@ -11,15 +11,13 @@
square_note 2, 15, 1, 1984
square_note 2, 15, 1, 1792
square_note 2, 15, 1, 2000
-
-SFX_Battle_36_branch_20930:
+.loop1:
square_note 2, 15, 1, 1792
square_note 2, 15, 1, 2016
- sound_loop 12, SFX_Battle_36_branch_20930
+ sound_loop 12, .loop1
square_note 15, 15, 1, 1792
sound_ret
-
SFX_Battle_36_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 2, 15, 1, 1921
@@ -35,10 +33,9 @@
square_note 2, 15, 1, 2001
square_note 2, 15, 1, 1793
square_note 2, 15, 1, 2017
- sound_loop 12, SFX_Battle_36_branch_20930
+ sound_loop 12, SFX_Battle_36_Ch5.loop1
square_note 15, 15, 1, 1793
sound_ret
-
SFX_Battle_36_Ch8:
noise_note 1, 13, 1, 73
--- a/audio/sfx/caught_mon.asm
+++ b/audio/sfx/caught_mon.asm
@@ -21,7 +21,6 @@
note E_, 8
sound_ret
-
SFX_Caught_Mon_Ch6:
execute_music
duty_cycle 2
@@ -42,7 +41,6 @@
note_type 6, 12, 5
note G#, 8
sound_ret
-
SFX_Caught_Mon_Ch7:
execute_music
--- a/audio/sfx/cry00_1.asm
+++ b/audio/sfx/cry00_1.asm
@@ -5,7 +5,6 @@
square_note 8, 9, 1, 1880
sound_ret
-
SFX_Cry00_1_Ch6:
duty_cycle_pattern 2, 2, 0, 0
square_note 5, 11, 3, 1800
@@ -12,7 +11,6 @@
square_note 15, 12, 5, 1928
square_note 8, 7, 1, 1864
sound_ret
-
SFX_Cry00_1_Ch8:
noise_note 3, 10, 1, 28
--- a/audio/sfx/cry00_2.asm
+++ b/audio/sfx/cry00_2.asm
@@ -5,7 +5,6 @@
square_note 8, 9, 1, 1880
sound_ret
-
SFX_Cry00_2_Ch6:
duty_cycle_pattern 2, 2, 0, 0
square_note 5, 11, 3, 1800
@@ -12,7 +11,6 @@
square_note 15, 12, 5, 1928
square_note 8, 7, 1, 1864
sound_ret
-
SFX_Cry00_2_Ch8:
noise_note 3, 10, 1, 28
--- a/audio/sfx/cry00_3.asm
+++ b/audio/sfx/cry00_3.asm
@@ -5,7 +5,6 @@
square_note 8, 9, 1, 1880
sound_ret
-
SFX_Cry00_3_Ch6:
duty_cycle_pattern 2, 2, 0, 0
square_note 5, 11, 3, 1800
@@ -12,7 +11,6 @@
square_note 15, 12, 5, 1928
square_note 8, 7, 1, 1864
sound_ret
-
SFX_Cry00_3_Ch8:
noise_note 3, 10, 1, 28
--- a/audio/sfx/cry01_1.asm
+++ b/audio/sfx/cry01_1.asm
@@ -6,7 +6,6 @@
square_note 8, 13, 1, 1808
sound_ret
-
SFX_Cry01_1_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 5, 11, 3, 1777
@@ -14,7 +13,6 @@
square_note 3, 10, 2, 1809
square_note 8, 11, 1, 1537
sound_ret
-
SFX_Cry01_1_Ch8:
noise_note 3, 10, 2, 60
--- a/audio/sfx/cry01_2.asm
+++ b/audio/sfx/cry01_2.asm
@@ -6,7 +6,6 @@
square_note 8, 13, 1, 1808
sound_ret
-
SFX_Cry01_2_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 5, 11, 3, 1777
@@ -14,7 +13,6 @@
square_note 3, 10, 2, 1809
square_note 8, 11, 1, 1537
sound_ret
-
SFX_Cry01_2_Ch8:
noise_note 3, 10, 2, 60
--- a/audio/sfx/cry01_3.asm
+++ b/audio/sfx/cry01_3.asm
@@ -6,7 +6,6 @@
square_note 8, 13, 1, 1808
sound_ret
-
SFX_Cry01_3_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 5, 11, 3, 1777
@@ -14,7 +13,6 @@
square_note 3, 10, 2, 1809
square_note 8, 11, 1, 1537
sound_ret
-
SFX_Cry01_3_Ch8:
noise_note 3, 10, 2, 60
--- a/audio/sfx/cry02_1.asm
+++ b/audio/sfx/cry02_1.asm
@@ -5,13 +5,11 @@
square_note 8, 13, 1, 1500
sound_ret
-
SFX_Cry02_1_Ch6:
duty_cycle_pattern 2, 2, 1, 1
square_note 7, 9, 5, 1089
square_note 2, 8, 1, 1313
square_note 8, 6, 1, 1306
-
SFX_Cry02_1_Ch8:
sound_ret
--- a/audio/sfx/cry02_2.asm
+++ b/audio/sfx/cry02_2.asm
@@ -5,13 +5,11 @@
square_note 8, 13, 1, 1500
sound_ret
-
SFX_Cry02_2_Ch6:
duty_cycle_pattern 2, 2, 1, 1
square_note 7, 9, 5, 1089
square_note 2, 8, 1, 1313
square_note 8, 6, 1, 1306
-
SFX_Cry02_2_Ch8:
sound_ret
--- a/audio/sfx/cry02_3.asm
+++ b/audio/sfx/cry02_3.asm
@@ -5,13 +5,11 @@
square_note 8, 13, 1, 1500
sound_ret
-
SFX_Cry02_3_Ch6:
duty_cycle_pattern 2, 2, 1, 1
square_note 7, 9, 5, 1089
square_note 2, 8, 1, 1313
square_note 8, 6, 1, 1306
-
SFX_Cry02_3_Ch8:
sound_ret
--- a/audio/sfx/cry03_1.asm
+++ b/audio/sfx/cry03_1.asm
@@ -9,7 +9,6 @@
square_note 8, 14, 1, 1408
sound_ret
-
SFX_Cry03_1_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 4, 12, 7, 1284
@@ -20,7 +19,6 @@
square_note 4, 11, 3, 1187
square_note 8, 12, 1, 1154
sound_ret
-
SFX_Cry03_1_Ch8:
noise_note 12, 14, 4, 76
--- a/audio/sfx/cry03_2.asm
+++ b/audio/sfx/cry03_2.asm
@@ -9,7 +9,6 @@
square_note 8, 14, 1, 1408
sound_ret
-
SFX_Cry03_2_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 4, 12, 7, 1284
@@ -20,7 +19,6 @@
square_note 4, 11, 3, 1187
square_note 8, 12, 1, 1154
sound_ret
-
SFX_Cry03_2_Ch8:
noise_note 12, 14, 4, 76
--- a/audio/sfx/cry03_3.asm
+++ b/audio/sfx/cry03_3.asm
@@ -9,7 +9,6 @@
square_note 8, 14, 1, 1408
sound_ret
-
SFX_Cry03_3_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 4, 12, 7, 1284
@@ -20,7 +19,6 @@
square_note 4, 11, 3, 1187
square_note 8, 12, 1, 1154
sound_ret
-
SFX_Cry03_3_Ch8:
noise_note 12, 14, 4, 76
--- a/audio/sfx/cry04_1.asm
+++ b/audio/sfx/cry04_1.asm
@@ -9,7 +9,6 @@
square_note 8, 11, 1, 1552
sound_ret
-
SFX_Cry04_1_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 4, 14, 7, 1537
@@ -20,7 +19,6 @@
square_note 4, 11, 2, 1410
square_note 8, 10, 1, 1393
sound_ret
-
SFX_Cry04_1_Ch8:
noise_note 7, 13, 6, 92
--- a/audio/sfx/cry04_2.asm
+++ b/audio/sfx/cry04_2.asm
@@ -9,7 +9,6 @@
square_note 8, 11, 1, 1552
sound_ret
-
SFX_Cry04_2_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 4, 14, 7, 1537
@@ -20,7 +19,6 @@
square_note 4, 11, 2, 1410
square_note 8, 10, 1, 1393
sound_ret
-
SFX_Cry04_2_Ch8:
noise_note 7, 13, 6, 92
--- a/audio/sfx/cry04_3.asm
+++ b/audio/sfx/cry04_3.asm
@@ -9,7 +9,6 @@
square_note 8, 11, 1, 1552
sound_ret
-
SFX_Cry04_3_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 4, 14, 7, 1537
@@ -20,7 +19,6 @@
square_note 4, 11, 2, 1410
square_note 8, 10, 1, 1393
sound_ret
-
SFX_Cry04_3_Ch8:
noise_note 7, 13, 6, 92
--- a/audio/sfx/cry05_1.asm
+++ b/audio/sfx/cry05_1.asm
@@ -6,7 +6,6 @@
square_note 8, 10, 1, 1376
sound_ret
-
SFX_Cry05_1_Ch6:
duty_cycle_pattern 3, 3, 1, 1
square_note 6, 14, 2, 1154
@@ -13,7 +12,6 @@
square_note 6, 13, 3, 1281
square_note 6, 11, 2, 1250
square_note 8, 8, 1, 1217
-
SFX_Cry05_1_Ch8:
sound_ret
--- a/audio/sfx/cry05_2.asm
+++ b/audio/sfx/cry05_2.asm
@@ -6,7 +6,6 @@
square_note 8, 10, 1, 1376
sound_ret
-
SFX_Cry05_2_Ch6:
duty_cycle_pattern 3, 3, 1, 1
square_note 6, 14, 2, 1154
@@ -13,7 +12,6 @@
square_note 6, 13, 3, 1281
square_note 6, 11, 2, 1250
square_note 8, 8, 1, 1217
-
SFX_Cry05_2_Ch8:
sound_ret
--- a/audio/sfx/cry05_3.asm
+++ b/audio/sfx/cry05_3.asm
@@ -6,7 +6,6 @@
square_note 8, 10, 1, 1376
sound_ret
-
SFX_Cry05_3_Ch6:
duty_cycle_pattern 3, 3, 1, 1
square_note 6, 14, 2, 1154
@@ -13,7 +12,6 @@
square_note 6, 13, 3, 1281
square_note 6, 11, 2, 1250
square_note 8, 8, 1, 1217
-
SFX_Cry05_3_Ch8:
sound_ret
--- a/audio/sfx/cry06_1.asm
+++ b/audio/sfx/cry06_1.asm
@@ -7,10 +7,8 @@
square_note 15, 8, 2, 549
square_note 15, 4, 2, 519
-
SFX_Cry06_1_Ch6:
sound_ret
-
SFX_Cry06_1_Ch8:
noise_note 8, 13, 4, 140
--- a/audio/sfx/cry06_2.asm
+++ b/audio/sfx/cry06_2.asm
@@ -7,10 +7,8 @@
square_note 15, 8, 2, 549
square_note 15, 4, 2, 519
-
SFX_Cry06_2_Ch6:
sound_ret
-
SFX_Cry06_2_Ch8:
noise_note 8, 13, 4, 140
--- a/audio/sfx/cry06_3.asm
+++ b/audio/sfx/cry06_3.asm
@@ -7,10 +7,8 @@
square_note 15, 8, 2, 549
square_note 15, 4, 2, 519
-
SFX_Cry06_3_Ch6:
sound_ret
-
SFX_Cry06_3_Ch8:
noise_note 8, 13, 4, 140
--- a/audio/sfx/cry07_1.asm
+++ b/audio/sfx/cry07_1.asm
@@ -5,7 +5,6 @@
square_note 8, 12, 1, 1568
sound_ret
-
SFX_Cry07_1_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 3, 12, 3, 1667
@@ -12,7 +11,6 @@
square_note 14, 11, 4, 1538
square_note 8, 10, 1, 1537
sound_ret
-
SFX_Cry07_1_Ch8:
noise_note 4, 13, 3, 92
--- a/audio/sfx/cry07_2.asm
+++ b/audio/sfx/cry07_2.asm
@@ -5,7 +5,6 @@
square_note 8, 12, 1, 1568
sound_ret
-
SFX_Cry07_2_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 3, 12, 3, 1667
@@ -12,7 +11,6 @@
square_note 14, 11, 4, 1538
square_note 8, 10, 1, 1537
sound_ret
-
SFX_Cry07_2_Ch8:
noise_note 4, 13, 3, 92
--- a/audio/sfx/cry07_3.asm
+++ b/audio/sfx/cry07_3.asm
@@ -5,7 +5,6 @@
square_note 8, 12, 1, 1568
sound_ret
-
SFX_Cry07_3_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 3, 12, 3, 1667
@@ -12,7 +11,6 @@
square_note 14, 11, 4, 1538
square_note 8, 10, 1, 1537
sound_ret
-
SFX_Cry07_3_Ch8:
noise_note 4, 13, 3, 92
--- a/audio/sfx/cry08_1.asm
+++ b/audio/sfx/cry08_1.asm
@@ -6,7 +6,6 @@
square_note 15, 11, 2, 1340
sound_ret
-
SFX_Cry08_1_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 14, 13, 6, 1283
@@ -14,7 +13,6 @@
square_note 4, 9, 2, 1274
square_note 15, 10, 2, 1243
sound_ret
-
SFX_Cry08_1_Ch8:
noise_note 12, 14, 6, 76
--- a/audio/sfx/cry08_2.asm
+++ b/audio/sfx/cry08_2.asm
@@ -6,7 +6,6 @@
square_note 15, 11, 2, 1340
sound_ret
-
SFX_Cry08_2_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 14, 13, 6, 1283
@@ -14,7 +13,6 @@
square_note 4, 9, 2, 1274
square_note 15, 10, 2, 1243
sound_ret
-
SFX_Cry08_2_Ch8:
noise_note 12, 14, 6, 76
--- a/audio/sfx/cry08_3.asm
+++ b/audio/sfx/cry08_3.asm
@@ -6,7 +6,6 @@
square_note 15, 11, 2, 1340
sound_ret
-
SFX_Cry08_3_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 14, 13, 6, 1283
@@ -14,7 +13,6 @@
square_note 4, 9, 2, 1274
square_note 15, 10, 2, 1243
sound_ret
-
SFX_Cry08_3_Ch8:
noise_note 12, 14, 6, 76
--- a/audio/sfx/cry09_1.asm
+++ b/audio/sfx/cry09_1.asm
@@ -9,7 +9,6 @@
square_note 15, 15, 2, 2008
sound_ret
-
SFX_Cry09_1_Ch6:
duty_cycle_pattern 0, 0, 1, 1
square_note 2, 0, 8, 0
@@ -21,7 +20,6 @@
square_note 4, 8, 3, 1753
square_note 15, 10, 2, 1751
sound_ret
-
SFX_Cry09_1_Ch8:
noise_note 2, 15, 2, 60
--- a/audio/sfx/cry09_2.asm
+++ b/audio/sfx/cry09_2.asm
@@ -9,7 +9,6 @@
square_note 15, 15, 2, 2008
sound_ret
-
SFX_Cry09_2_Ch6:
duty_cycle_pattern 0, 0, 1, 1
square_note 2, 0, 8, 0
@@ -21,7 +20,6 @@
square_note 4, 8, 3, 1753
square_note 15, 10, 2, 1751
sound_ret
-
SFX_Cry09_2_Ch8:
noise_note 2, 15, 2, 60
--- a/audio/sfx/cry09_3.asm
+++ b/audio/sfx/cry09_3.asm
@@ -9,7 +9,6 @@
square_note 15, 15, 2, 2008
sound_ret
-
SFX_Cry09_3_Ch6:
duty_cycle_pattern 0, 0, 1, 1
square_note 2, 0, 8, 0
@@ -21,7 +20,6 @@
square_note 4, 8, 3, 1753
square_note 15, 10, 2, 1751
sound_ret
-
SFX_Cry09_3_Ch8:
noise_note 2, 15, 2, 60
--- a/audio/sfx/cry0a_1.asm
+++ b/audio/sfx/cry0a_1.asm
@@ -9,7 +9,6 @@
square_note 15, 10, 2, 1736
sound_ret
-
SFX_Cry0A_1_Ch6:
duty_cycle_pattern 0, 0, 1, 1
square_note 3, 0, 8, 0
@@ -21,7 +20,6 @@
square_note 4, 10, 2, 1649
square_note 15, 7, 2, 1673
sound_ret
-
SFX_Cry0A_1_Ch8:
noise_note 2, 15, 2, 60
--- a/audio/sfx/cry0a_2.asm
+++ b/audio/sfx/cry0a_2.asm
@@ -9,7 +9,6 @@
square_note 15, 10, 2, 1736
sound_ret
-
SFX_Cry0A_2_Ch6:
duty_cycle_pattern 0, 0, 1, 1
square_note 3, 0, 8, 0
@@ -21,7 +20,6 @@
square_note 4, 10, 2, 1649
square_note 15, 7, 2, 1673
sound_ret
-
SFX_Cry0A_2_Ch8:
noise_note 2, 15, 2, 60
--- a/audio/sfx/cry0a_3.asm
+++ b/audio/sfx/cry0a_3.asm
@@ -9,7 +9,6 @@
square_note 15, 10, 2, 1736
sound_ret
-
SFX_Cry0A_3_Ch6:
duty_cycle_pattern 0, 0, 1, 1
square_note 3, 0, 8, 0
@@ -21,7 +20,6 @@
square_note 4, 10, 2, 1649
square_note 15, 7, 2, 1673
sound_ret
-
SFX_Cry0A_3_Ch8:
noise_note 2, 15, 2, 60
--- a/audio/sfx/cry0b_1.asm
+++ b/audio/sfx/cry0b_1.asm
@@ -12,7 +12,6 @@
square_note 8, 11, 1, 1857
sound_ret
-
SFX_Cry0B_1_Ch6:
duty_cycle_pattern 1, 0, 1, 0
square_note 12, 0, 8, 0
@@ -23,7 +22,6 @@
square_note 4, 15, 1, 1922
square_note 8, 13, 1, 1793
sound_ret
-
SFX_Cry0B_1_Ch8:
noise_note 15, 0, 8, 0
--- a/audio/sfx/cry0b_2.asm
+++ b/audio/sfx/cry0b_2.asm
@@ -12,7 +12,6 @@
square_note 8, 11, 1, 1857
sound_ret
-
SFX_Cry0B_2_Ch6:
duty_cycle_pattern 1, 0, 1, 0
square_note 12, 0, 8, 0
@@ -23,7 +22,6 @@
square_note 4, 15, 1, 1922
square_note 8, 13, 1, 1793
sound_ret
-
SFX_Cry0B_2_Ch8:
noise_note 15, 0, 8, 0
--- a/audio/sfx/cry0b_3.asm
+++ b/audio/sfx/cry0b_3.asm
@@ -12,7 +12,6 @@
square_note 8, 11, 1, 1857
sound_ret
-
SFX_Cry0B_3_Ch6:
duty_cycle_pattern 1, 0, 1, 0
square_note 12, 0, 8, 0
@@ -23,7 +22,6 @@
square_note 4, 15, 1, 1922
square_note 8, 13, 1, 1793
sound_ret
-
SFX_Cry0B_3_Ch8:
noise_note 15, 0, 8, 0
--- a/audio/sfx/cry0c_1.asm
+++ b/audio/sfx/cry0c_1.asm
@@ -11,7 +11,6 @@
square_note 8, 12, 1, 1568
sound_ret
-
SFX_Cry0C_1_Ch6:
duty_cycle_pattern 1, 0, 1, 0
square_note 12, 12, 3, 1472
@@ -23,7 +22,6 @@
square_note 2, 8, 1, 1489
square_note 2, 9, 1, 1497
square_note 8, 9, 1, 1505
-
SFX_Cry0C_1_Ch8:
sound_ret
--- a/audio/sfx/cry0c_2.asm
+++ b/audio/sfx/cry0c_2.asm
@@ -11,7 +11,6 @@
square_note 8, 12, 1, 1568
sound_ret
-
SFX_Cry0C_2_Ch6:
duty_cycle_pattern 1, 0, 1, 0
square_note 12, 12, 3, 1472
@@ -23,7 +22,6 @@
square_note 2, 8, 1, 1489
square_note 2, 9, 1, 1497
square_note 8, 9, 1, 1505
-
SFX_Cry0C_2_Ch8:
sound_ret
--- a/audio/sfx/cry0c_3.asm
+++ b/audio/sfx/cry0c_3.asm
@@ -11,7 +11,6 @@
square_note 8, 12, 1, 1568
sound_ret
-
SFX_Cry0C_3_Ch6:
duty_cycle_pattern 1, 0, 1, 0
square_note 12, 12, 3, 1472
@@ -23,7 +22,6 @@
square_note 2, 8, 1, 1489
square_note 2, 9, 1, 1497
square_note 8, 9, 1, 1505
-
SFX_Cry0C_3_Ch8:
sound_ret
--- a/audio/sfx/cry0d_1.asm
+++ b/audio/sfx/cry0d_1.asm
@@ -9,7 +9,6 @@
sound_loop 2, SFX_Cry0D_1_Ch5
sound_ret
-
SFX_Cry0D_1_Ch6:
duty_cycle_pattern 1, 0, 0, 0
square_note 4, 0, 8, 0
@@ -24,7 +23,6 @@
square_note 5, 15, 2, 1553
square_note 4, 13, 1, 1569
sound_ret
-
SFX_Cry0D_1_Ch8:
noise_note 6, 13, 2, 28
--- a/audio/sfx/cry0d_2.asm
+++ b/audio/sfx/cry0d_2.asm
@@ -9,7 +9,6 @@
sound_loop 2, SFX_Cry0D_2_Ch5
sound_ret
-
SFX_Cry0D_2_Ch6:
duty_cycle_pattern 1, 0, 0, 0
square_note 4, 0, 8, 0
@@ -24,7 +23,6 @@
square_note 5, 15, 2, 1553
square_note 4, 13, 1, 1569
sound_ret
-
SFX_Cry0D_2_Ch8:
noise_note 6, 13, 2, 28
--- a/audio/sfx/cry0d_3.asm
+++ b/audio/sfx/cry0d_3.asm
@@ -9,7 +9,6 @@
sound_loop 2, SFX_Cry0D_3_Ch5
sound_ret
-
SFX_Cry0D_3_Ch6:
duty_cycle_pattern 1, 0, 0, 0
square_note 4, 0, 8, 0
@@ -24,7 +23,6 @@
square_note 5, 15, 2, 1553
square_note 4, 13, 1, 1569
sound_ret
-
SFX_Cry0D_3_Ch8:
noise_note 6, 13, 2, 28
--- a/audio/sfx/cry0e_1.asm
+++ b/audio/sfx/cry0e_1.asm
@@ -6,7 +6,6 @@
square_note 8, 14, 1, 1536
sound_ret
-
SFX_Cry0E_1_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 4, 11, 1, 1761
@@ -14,7 +13,6 @@
square_note 3, 6, 2, 1665
square_note 8, 11, 1, 1505
sound_ret
-
SFX_Cry0E_1_Ch8:
noise_note 2, 6, 1, 50
--- a/audio/sfx/cry0e_2.asm
+++ b/audio/sfx/cry0e_2.asm
@@ -6,7 +6,6 @@
square_note 8, 14, 1, 1536
sound_ret
-
SFX_Cry0E_2_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 4, 11, 1, 1761
@@ -14,7 +13,6 @@
square_note 3, 6, 2, 1665
square_note 8, 11, 1, 1505
sound_ret
-
SFX_Cry0E_2_Ch8:
noise_note 2, 6, 1, 50
--- a/audio/sfx/cry0e_3.asm
+++ b/audio/sfx/cry0e_3.asm
@@ -6,7 +6,6 @@
square_note 8, 14, 1, 1536
sound_ret
-
SFX_Cry0E_3_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 4, 11, 1, 1761
@@ -14,7 +13,6 @@
square_note 3, 6, 2, 1665
square_note 8, 11, 1, 1505
sound_ret
-
SFX_Cry0E_3_Ch8:
noise_note 2, 6, 1, 50
--- a/audio/sfx/cry0f_1.asm
+++ b/audio/sfx/cry0f_1.asm
@@ -8,7 +8,6 @@
square_note 8, 12, 1, 1600
sound_ret
-
SFX_Cry0F_1_Ch6:
duty_cycle_pattern 3, 0, 3, 0
square_note 3, 12, 7, 1921
@@ -18,7 +17,6 @@
square_note 6, 11, 5, 1569
square_note 8, 10, 1, 1538
sound_ret
-
SFX_Cry0F_1_Ch8:
noise_note 3, 14, 4, 60
--- a/audio/sfx/cry0f_2.asm
+++ b/audio/sfx/cry0f_2.asm
@@ -8,7 +8,6 @@
square_note 8, 12, 1, 1600
sound_ret
-
SFX_Cry0F_2_Ch6:
duty_cycle_pattern 3, 0, 3, 0
square_note 3, 12, 7, 1921
@@ -18,7 +17,6 @@
square_note 6, 11, 5, 1569
square_note 8, 10, 1, 1538
sound_ret
-
SFX_Cry0F_2_Ch8:
noise_note 3, 14, 4, 60
--- a/audio/sfx/cry0f_3.asm
+++ b/audio/sfx/cry0f_3.asm
@@ -8,7 +8,6 @@
square_note 8, 12, 1, 1600
sound_ret
-
SFX_Cry0F_3_Ch6:
duty_cycle_pattern 3, 0, 3, 0
square_note 3, 12, 7, 1921
@@ -18,7 +17,6 @@
square_note 6, 11, 5, 1569
square_note 8, 10, 1, 1538
sound_ret
-
SFX_Cry0F_3_Ch8:
noise_note 3, 14, 4, 60
--- a/audio/sfx/cry10_1.asm
+++ b/audio/sfx/cry10_1.asm
@@ -10,7 +10,6 @@
square_note 15, 9, 1, 1824
sound_ret
-
SFX_Cry10_1_Ch6:
duty_cycle_pattern 1, 3, 2, 1
square_note 10, 14, 7, 1666
@@ -22,7 +21,6 @@
square_note 2, 9, 7, 1842
square_note 15, 8, 1, 1826
sound_ret
-
SFX_Cry10_1_Ch8:
noise_note 4, 7, 4, 33
--- a/audio/sfx/cry10_2.asm
+++ b/audio/sfx/cry10_2.asm
@@ -10,7 +10,6 @@
square_note 15, 9, 1, 1824
sound_ret
-
SFX_Cry10_2_Ch6:
duty_cycle_pattern 1, 3, 2, 1
square_note 10, 14, 7, 1666
@@ -22,7 +21,6 @@
square_note 2, 9, 7, 1842
square_note 15, 8, 1, 1826
sound_ret
-
SFX_Cry10_2_Ch8:
noise_note 4, 7, 4, 33
--- a/audio/sfx/cry10_3.asm
+++ b/audio/sfx/cry10_3.asm
@@ -10,7 +10,6 @@
square_note 15, 9, 1, 1824
sound_ret
-
SFX_Cry10_3_Ch6:
duty_cycle_pattern 1, 3, 2, 1
square_note 10, 14, 7, 1666
@@ -22,7 +21,6 @@
square_note 2, 9, 7, 1842
square_note 15, 8, 1, 1826
sound_ret
-
SFX_Cry10_3_Ch8:
noise_note 4, 7, 4, 33
--- a/audio/sfx/cry11_1.asm
+++ b/audio/sfx/cry11_1.asm
@@ -9,7 +9,6 @@
square_note 8, 11, 1, 1840
sound_ret
-
SFX_Cry11_1_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 4, 0, 8, 0
@@ -21,7 +20,6 @@
square_note 3, 8, 2, 1740
square_note 8, 7, 1, 1752
sound_ret
-
SFX_Cry11_1_Ch8:
noise_note 2, 15, 2, 76
--- a/audio/sfx/cry11_2.asm
+++ b/audio/sfx/cry11_2.asm
@@ -9,7 +9,6 @@
square_note 8, 11, 1, 1840
sound_ret
-
SFX_Cry11_2_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 4, 0, 8, 0
@@ -21,7 +20,6 @@
square_note 3, 8, 2, 1740
square_note 8, 7, 1, 1752
sound_ret
-
SFX_Cry11_2_Ch8:
noise_note 2, 15, 2, 76
--- a/audio/sfx/cry11_3.asm
+++ b/audio/sfx/cry11_3.asm
@@ -9,7 +9,6 @@
square_note 8, 11, 1, 1840
sound_ret
-
SFX_Cry11_3_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 4, 0, 8, 0
@@ -21,7 +20,6 @@
square_note 3, 8, 2, 1740
square_note 8, 7, 1, 1752
sound_ret
-
SFX_Cry11_3_Ch8:
noise_note 2, 15, 2, 76
--- a/audio/sfx/cry12_1.asm
+++ b/audio/sfx/cry12_1.asm
@@ -6,7 +6,6 @@
square_note 8, 13, 1, 1152
sound_ret
-
SFX_Cry12_1_Ch6:
duty_cycle_pattern 3, 2, 3, 2
square_note 11, 13, 2, 1080
@@ -14,7 +13,6 @@
square_note 3, 11, 2, 1160
square_note 8, 11, 1, 1144
sound_ret
-
SFX_Cry12_1_Ch8:
noise_note 10, 14, 6, 108
--- a/audio/sfx/cry12_2.asm
+++ b/audio/sfx/cry12_2.asm
@@ -6,7 +6,6 @@
square_note 8, 13, 1, 1152
sound_ret
-
SFX_Cry12_2_Ch6:
duty_cycle_pattern 3, 2, 3, 2
square_note 11, 13, 2, 1080
@@ -14,7 +13,6 @@
square_note 3, 11, 2, 1160
square_note 8, 11, 1, 1144
sound_ret
-
SFX_Cry12_2_Ch8:
noise_note 10, 14, 6, 108
--- a/audio/sfx/cry12_3.asm
+++ b/audio/sfx/cry12_3.asm
@@ -6,7 +6,6 @@
square_note 8, 13, 1, 1152
sound_ret
-
SFX_Cry12_3_Ch6:
duty_cycle_pattern 3, 2, 3, 2
square_note 11, 13, 2, 1080
@@ -14,7 +13,6 @@
square_note 3, 11, 2, 1160
square_note 8, 11, 1, 1144
sound_ret
-
SFX_Cry12_3_Ch8:
noise_note 10, 14, 6, 108
--- a/audio/sfx/cry13_1.asm
+++ b/audio/sfx/cry13_1.asm
@@ -8,7 +8,6 @@
square_note 8, 11, 1, 1536
sound_ret
-
SFX_Cry13_1_Ch6:
duty_cycle_pattern 2, 1, 2, 1
square_note 14, 12, 6, 1201
@@ -18,7 +17,6 @@
square_note 6, 10, 2, 1249
square_note 8, 9, 1, 1265
sound_ret
-
SFX_Cry13_1_Ch8:
noise_note 10, 14, 6, 92
--- a/audio/sfx/cry13_2.asm
+++ b/audio/sfx/cry13_2.asm
@@ -8,7 +8,6 @@
square_note 8, 11, 1, 1536
sound_ret
-
SFX_Cry13_2_Ch6:
duty_cycle_pattern 2, 1, 2, 1
square_note 14, 12, 6, 1201
@@ -18,7 +17,6 @@
square_note 6, 10, 2, 1249
square_note 8, 9, 1, 1265
sound_ret
-
SFX_Cry13_2_Ch8:
noise_note 10, 14, 6, 92
--- a/audio/sfx/cry13_3.asm
+++ b/audio/sfx/cry13_3.asm
@@ -8,7 +8,6 @@
square_note 8, 11, 1, 1536
sound_ret
-
SFX_Cry13_3_Ch6:
duty_cycle_pattern 2, 1, 2, 1
square_note 14, 12, 6, 1201
@@ -18,7 +17,6 @@
square_note 6, 10, 2, 1249
square_note 8, 9, 1, 1265
sound_ret
-
SFX_Cry13_3_Ch8:
noise_note 10, 14, 6, 92
--- a/audio/sfx/cry14_1.asm
+++ b/audio/sfx/cry14_1.asm
@@ -5,7 +5,6 @@
square_note 8, 13, 1, 2008
sound_ret
-
SFX_Cry14_1_Ch6:
duty_cycle_pattern 2, 2, 1, 1
square_note 10, 12, 4, 1905
@@ -12,7 +11,6 @@
square_note 15, 11, 6, 1954
square_note 8, 10, 1, 1975
sound_ret
-
SFX_Cry14_1_Ch8:
noise_note 8, 14, 4, 76
--- a/audio/sfx/cry14_2.asm
+++ b/audio/sfx/cry14_2.asm
@@ -5,7 +5,6 @@
square_note 8, 13, 1, 2008
sound_ret
-
SFX_Cry14_2_Ch6:
duty_cycle_pattern 2, 2, 1, 1
square_note 10, 12, 4, 1905
@@ -12,7 +11,6 @@
square_note 15, 11, 6, 1954
square_note 8, 10, 1, 1975
sound_ret
-
SFX_Cry14_2_Ch8:
noise_note 8, 14, 4, 76
--- a/audio/sfx/cry14_3.asm
+++ b/audio/sfx/cry14_3.asm
@@ -5,7 +5,6 @@
square_note 8, 13, 1, 2008
sound_ret
-
SFX_Cry14_3_Ch6:
duty_cycle_pattern 2, 2, 1, 1
square_note 10, 12, 4, 1905
@@ -12,7 +11,6 @@
square_note 15, 11, 6, 1954
square_note 8, 10, 1, 1975
sound_ret
-
SFX_Cry14_3_Ch8:
noise_note 8, 14, 4, 76
--- a/audio/sfx/cry15_1.asm
+++ b/audio/sfx/cry15_1.asm
@@ -8,7 +8,6 @@
square_note 8, 12, 1, 1760
sound_ret
-
SFX_Cry15_1_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 6, 12, 3, 1793
@@ -18,7 +17,6 @@
square_note 4, 11, 2, 1650
square_note 8, 10, 1, 1633
sound_ret
-
SFX_Cry15_1_Ch8:
noise_note 6, 14, 3, 92
--- a/audio/sfx/cry15_2.asm
+++ b/audio/sfx/cry15_2.asm
@@ -8,7 +8,6 @@
square_note 8, 12, 1, 1760
sound_ret
-
SFX_Cry15_2_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 6, 12, 3, 1793
@@ -18,7 +17,6 @@
square_note 4, 11, 2, 1650
square_note 8, 10, 1, 1633
sound_ret
-
SFX_Cry15_2_Ch8:
noise_note 6, 14, 3, 92
--- a/audio/sfx/cry15_3.asm
+++ b/audio/sfx/cry15_3.asm
@@ -8,7 +8,6 @@
square_note 8, 12, 1, 1760
sound_ret
-
SFX_Cry15_3_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 6, 12, 3, 1793
@@ -18,7 +17,6 @@
square_note 4, 11, 2, 1650
square_note 8, 10, 1, 1633
sound_ret
-
SFX_Cry15_3_Ch8:
noise_note 6, 14, 3, 92
--- a/audio/sfx/cry16_1.asm
+++ b/audio/sfx/cry16_1.asm
@@ -5,7 +5,6 @@
square_note 15, 13, 2, 1856
sound_ret
-
SFX_Cry16_1_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 15, 12, 7, 1875
@@ -12,7 +11,6 @@
square_note 5, 11, 6, 1906
square_note 15, 12, 2, 1809
sound_ret
-
SFX_Cry16_1_Ch8:
noise_note 13, 15, 6, 76
--- a/audio/sfx/cry16_2.asm
+++ b/audio/sfx/cry16_2.asm
@@ -5,7 +5,6 @@
square_note 15, 13, 2, 1856
sound_ret
-
SFX_Cry16_2_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 15, 12, 7, 1875
@@ -12,7 +11,6 @@
square_note 5, 11, 6, 1906
square_note 15, 12, 2, 1809
sound_ret
-
SFX_Cry16_2_Ch8:
noise_note 13, 15, 6, 76
--- a/audio/sfx/cry16_3.asm
+++ b/audio/sfx/cry16_3.asm
@@ -5,7 +5,6 @@
square_note 15, 13, 2, 1856
sound_ret
-
SFX_Cry16_3_Ch6:
duty_cycle_pattern 1, 1, 2, 2
square_note 15, 12, 7, 1875
@@ -12,7 +11,6 @@
square_note 5, 11, 6, 1906
square_note 15, 12, 2, 1809
sound_ret
-
SFX_Cry16_3_Ch8:
noise_note 13, 15, 6, 76
--- a/audio/sfx/cry17_1.asm
+++ b/audio/sfx/cry17_1.asm
@@ -6,7 +6,6 @@
square_note 15, 10, 2, 1120
sound_ret
-
SFX_Cry17_1_Ch6:
duty_cycle_pattern 1, 0, 1, 0
square_note 14, 13, 7, 1153
@@ -14,7 +13,6 @@
square_note 10, 11, 4, 1025
square_note 15, 12, 2, 993
sound_ret
-
SFX_Cry17_1_Ch8:
noise_note 14, 15, 7, 124
--- a/audio/sfx/cry17_2.asm
+++ b/audio/sfx/cry17_2.asm
@@ -6,7 +6,6 @@
square_note 15, 10, 2, 1120
sound_ret
-
SFX_Cry17_2_Ch6:
duty_cycle_pattern 1, 0, 1, 0
square_note 14, 13, 7, 1153
@@ -14,7 +13,6 @@
square_note 10, 11, 4, 1025
square_note 15, 12, 2, 993
sound_ret
-
SFX_Cry17_2_Ch8:
noise_note 14, 15, 7, 124
--- a/audio/sfx/cry17_3.asm
+++ b/audio/sfx/cry17_3.asm
@@ -6,7 +6,6 @@
square_note 15, 10, 2, 1120
sound_ret
-
SFX_Cry17_3_Ch6:
duty_cycle_pattern 1, 0, 1, 0
square_note 14, 13, 7, 1153
@@ -14,7 +13,6 @@
square_note 10, 11, 4, 1025
square_note 15, 12, 2, 993
sound_ret
-
SFX_Cry17_3_Ch8:
noise_note 14, 15, 7, 124
--- a/audio/sfx/cry18_1.asm
+++ b/audio/sfx/cry18_1.asm
@@ -10,7 +10,6 @@
square_note 8, 12, 1, 1696
sound_ret
-
SFX_Cry18_1_Ch6:
duty_cycle_pattern 0, 0, 3, 3
square_note 9, 13, 5, 1585
@@ -22,7 +21,6 @@
square_note 3, 12, 2, 1649
square_note 8, 11, 1, 1617
sound_ret
-
SFX_Cry18_1_Ch8:
noise_note 6, 14, 3, 76
--- a/audio/sfx/cry18_2.asm
+++ b/audio/sfx/cry18_2.asm
@@ -10,7 +10,6 @@
square_note 8, 12, 1, 1696
sound_ret
-
SFX_Cry18_2_Ch6:
duty_cycle_pattern 0, 0, 3, 3
square_note 9, 13, 5, 1585
@@ -22,7 +21,6 @@
square_note 3, 12, 2, 1649
square_note 8, 11, 1, 1617
sound_ret
-
SFX_Cry18_2_Ch8:
noise_note 6, 14, 3, 76
--- a/audio/sfx/cry18_3.asm
+++ b/audio/sfx/cry18_3.asm
@@ -10,7 +10,6 @@
square_note 8, 12, 1, 1696
sound_ret
-
SFX_Cry18_3_Ch6:
duty_cycle_pattern 0, 0, 3, 3
square_note 9, 13, 5, 1585
@@ -22,7 +21,6 @@
square_note 3, 12, 2, 1649
square_note 8, 11, 1, 1617
sound_ret
-
SFX_Cry18_3_Ch8:
noise_note 6, 14, 3, 76
--- a/audio/sfx/cry19_1.asm
+++ b/audio/sfx/cry19_1.asm
@@ -5,7 +5,6 @@
square_note 15, 12, 1, 1840
sound_ret
-
SFX_Cry19_1_Ch6:
duty_cycle_pattern 2, 0, 0, 1
square_note 2, 12, 2, 1793
@@ -12,7 +11,6 @@
square_note 4, 12, 2, 1800
square_note 15, 13, 7, 1857
square_note 15, 10, 2, 1793
-
SFX_Cry19_1_Ch8:
sound_ret
--- a/audio/sfx/cry19_2.asm
+++ b/audio/sfx/cry19_2.asm
@@ -5,7 +5,6 @@
square_note 15, 12, 1, 1840
sound_ret
-
SFX_Cry19_2_Ch6:
duty_cycle_pattern 2, 0, 0, 1
square_note 2, 12, 2, 1793
@@ -12,7 +11,6 @@
square_note 4, 12, 2, 1800
square_note 15, 13, 7, 1857
square_note 15, 10, 2, 1793
-
SFX_Cry19_2_Ch8:
sound_ret
--- a/audio/sfx/cry19_3.asm
+++ b/audio/sfx/cry19_3.asm
@@ -5,7 +5,6 @@
square_note 15, 12, 1, 1840
sound_ret
-
SFX_Cry19_3_Ch6:
duty_cycle_pattern 2, 0, 0, 1
square_note 2, 12, 2, 1793
@@ -12,7 +11,6 @@
square_note 4, 12, 2, 1800
square_note 15, 13, 7, 1857
square_note 15, 10, 2, 1793
-
SFX_Cry19_3_Ch8:
sound_ret
--- a/audio/sfx/cry1a_1.asm
+++ b/audio/sfx/cry1a_1.asm
@@ -8,7 +8,6 @@
square_note 8, 13, 1, 1952
sound_ret
-
SFX_Cry1A_1_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 6, 12, 7, 1793
@@ -18,7 +17,6 @@
square_note 3, 10, 3, 1857
square_note 8, 9, 1, 1890
sound_ret
-
SFX_Cry1A_1_Ch8:
noise_note 3, 14, 2, 60
--- a/audio/sfx/cry1a_2.asm
+++ b/audio/sfx/cry1a_2.asm
@@ -8,7 +8,6 @@
square_note 8, 13, 1, 1952
sound_ret
-
SFX_Cry1A_2_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 6, 12, 7, 1793
@@ -18,7 +17,6 @@
square_note 3, 10, 3, 1857
square_note 8, 9, 1, 1890
sound_ret
-
SFX_Cry1A_2_Ch8:
noise_note 3, 14, 2, 60
--- a/audio/sfx/cry1a_3.asm
+++ b/audio/sfx/cry1a_3.asm
@@ -8,7 +8,6 @@
square_note 8, 13, 1, 1952
sound_ret
-
SFX_Cry1A_3_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 6, 12, 7, 1793
@@ -18,7 +17,6 @@
square_note 3, 10, 3, 1857
square_note 8, 9, 1, 1890
sound_ret
-
SFX_Cry1A_3_Ch8:
noise_note 3, 14, 2, 60
--- a/audio/sfx/cry1b_1.asm
+++ b/audio/sfx/cry1b_1.asm
@@ -7,7 +7,6 @@
square_note 8, 13, 1, 1744
sound_ret
-
SFX_Cry1B_1_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 7, 14, 6, 1665
@@ -16,7 +15,6 @@
square_note 4, 13, 4, 1697
square_note 8, 12, 1, 1681
sound_ret
-
SFX_Cry1B_1_Ch8:
noise_note 10, 10, 6, 60
--- a/audio/sfx/cry1b_2.asm
+++ b/audio/sfx/cry1b_2.asm
@@ -7,7 +7,6 @@
square_note 8, 13, 1, 1744
sound_ret
-
SFX_Cry1B_2_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 7, 14, 6, 1665
@@ -16,7 +15,6 @@
square_note 4, 13, 4, 1697
square_note 8, 12, 1, 1681
sound_ret
-
SFX_Cry1B_2_Ch8:
noise_note 10, 10, 6, 60
--- a/audio/sfx/cry1b_3.asm
+++ b/audio/sfx/cry1b_3.asm
@@ -7,7 +7,6 @@
square_note 8, 13, 1, 1744
sound_ret
-
SFX_Cry1B_3_Ch6:
duty_cycle_pattern 0, 0, 2, 2
square_note 7, 14, 6, 1665
@@ -16,7 +15,6 @@
square_note 4, 13, 4, 1697
square_note 8, 12, 1, 1681
sound_ret
-
SFX_Cry1B_3_Ch8:
noise_note 10, 10, 6, 60
--- a/audio/sfx/cry1c_1.asm
+++ b/audio/sfx/cry1c_1.asm
@@ -10,7 +10,6 @@
square_note 8, 10, 1, 2015
sound_ret
-
SFX_Cry1C_1_Ch6:
duty_cycle_pattern 1, 0, 1, 0
square_note 6, 12, 3, 1993
@@ -20,7 +19,6 @@
square_note 6, 12, 3, 1993
square_note 15, 10, 2, 1989
sound_ret
-
SFX_Cry1C_1_Ch8:
noise_note 13, 1, -1, 124
--- a/audio/sfx/cry1c_2.asm
+++ b/audio/sfx/cry1c_2.asm
@@ -10,7 +10,6 @@
square_note 8, 10, 1, 2015
sound_ret
-
SFX_Cry1C_2_Ch6:
duty_cycle_pattern 1, 0, 1, 0
square_note 6, 12, 3, 1993
@@ -20,7 +19,6 @@
square_note 6, 12, 3, 1993
square_note 15, 10, 2, 1989
sound_ret
-
SFX_Cry1C_2_Ch8:
noise_note 13, 1, -1, 124
--- a/audio/sfx/cry1c_3.asm
+++ b/audio/sfx/cry1c_3.asm
@@ -10,7 +10,6 @@
square_note 8, 10, 1, 2015
sound_ret
-
SFX_Cry1C_3_Ch6:
duty_cycle_pattern 1, 0, 1, 0
square_note 6, 12, 3, 1993
@@ -20,7 +19,6 @@
square_note 6, 12, 3, 1993
square_note 15, 10, 2, 1989
sound_ret
-
SFX_Cry1C_3_Ch8:
noise_note 13, 1, -1, 124
--- a/audio/sfx/cry1d_1.asm
+++ b/audio/sfx/cry1d_1.asm
@@ -8,7 +8,6 @@
square_note 8, 10, 1, 1572
sound_ret
-
SFX_Cry1D_1_Ch6:
duty_cycle_pattern 0, 2, 0, 2
square_note 15, 11, 0, 1731
@@ -18,7 +17,6 @@
square_note 6, 8, 2, 1505
square_note 8, 6, 1, 1512
sound_ret
-
SFX_Cry1D_1_Ch8:
noise_note 6, 14, 6, 76
--- a/audio/sfx/cry1d_2.asm
+++ b/audio/sfx/cry1d_2.asm
@@ -8,7 +8,6 @@
square_note 8, 10, 1, 1572
sound_ret
-
SFX_Cry1D_2_Ch6:
duty_cycle_pattern 0, 2, 0, 2
square_note 15, 11, 0, 1731
@@ -18,7 +17,6 @@
square_note 6, 8, 2, 1505
square_note 8, 6, 1, 1512
sound_ret
-
SFX_Cry1D_2_Ch8:
noise_note 6, 14, 6, 76
--- a/audio/sfx/cry1d_3.asm
+++ b/audio/sfx/cry1d_3.asm
@@ -8,7 +8,6 @@
square_note 8, 10, 1, 1572
sound_ret
-
SFX_Cry1D_3_Ch6:
duty_cycle_pattern 0, 2, 0, 2
square_note 15, 11, 0, 1731
@@ -18,7 +17,6 @@
square_note 6, 8, 2, 1505
square_note 8, 6, 1, 1512
sound_ret
-
SFX_Cry1D_3_Ch8:
noise_note 6, 14, 6, 76
--- a/audio/sfx/cry1e_1.asm
+++ b/audio/sfx/cry1e_1.asm
@@ -10,7 +10,6 @@
square_note 8, 10, 1, 1984
sound_ret
-
SFX_Cry1E_1_Ch6:
duty_cycle_pattern 0, 1, 0, 1
square_note 3, 0, 8, 1
@@ -23,7 +22,6 @@
square_note 6, 10, 2, 1858
square_note 8, 8, 1, 1921
sound_ret
-
SFX_Cry1E_1_Ch8:
noise_note 6, 0, 8, 1
--- a/audio/sfx/cry1e_2.asm
+++ b/audio/sfx/cry1e_2.asm
@@ -10,7 +10,6 @@
square_note 8, 10, 1, 1984
sound_ret
-
SFX_Cry1E_2_Ch6:
duty_cycle_pattern 0, 1, 0, 1
square_note 3, 0, 8, 1
@@ -23,7 +22,6 @@
square_note 6, 10, 2, 1858
square_note 8, 8, 1, 1921
sound_ret
-
SFX_Cry1E_2_Ch8:
noise_note 6, 0, 8, 1
--- a/audio/sfx/cry1e_3.asm
+++ b/audio/sfx/cry1e_3.asm
@@ -10,7 +10,6 @@
square_note 8, 10, 1, 1984
sound_ret
-
SFX_Cry1E_3_Ch6:
duty_cycle_pattern 0, 1, 0, 1
square_note 3, 0, 8, 1
@@ -23,7 +22,6 @@
square_note 6, 10, 2, 1858
square_note 8, 8, 1, 1921
sound_ret
-
SFX_Cry1E_3_Ch8:
noise_note 6, 0, 8, 1
--- a/audio/sfx/cry1f_1.asm
+++ b/audio/sfx/cry1f_1.asm
@@ -6,7 +6,6 @@
square_note 8, 12, 1, 1818
sound_ret
-
SFX_Cry1F_1_Ch6:
duty_cycle_pattern 3, 0, 3, 0
square_note 4, 15, 4, 1408
@@ -14,7 +13,6 @@
square_note 8, 13, 5, 1752
square_note 8, 13, 1, 1756
sound_ret
-
SFX_Cry1F_1_Ch8:
noise_note 5, 12, 4, 70
--- a/audio/sfx/cry1f_2.asm
+++ b/audio/sfx/cry1f_2.asm
@@ -6,7 +6,6 @@
square_note 8, 12, 1, 1818
sound_ret
-
SFX_Cry1F_2_Ch6:
duty_cycle_pattern 3, 0, 3, 0
square_note 4, 15, 4, 1408
@@ -14,7 +13,6 @@
square_note 8, 13, 5, 1752
square_note 8, 13, 1, 1756
sound_ret
-
SFX_Cry1F_2_Ch8:
noise_note 5, 12, 4, 70
--- a/audio/sfx/cry1f_3.asm
+++ b/audio/sfx/cry1f_3.asm
@@ -6,7 +6,6 @@
square_note 8, 12, 1, 1818
sound_ret
-
SFX_Cry1F_3_Ch6:
duty_cycle_pattern 3, 0, 3, 0
square_note 4, 15, 4, 1408
@@ -14,7 +13,6 @@
square_note 8, 13, 5, 1752
square_note 8, 13, 1, 1756
sound_ret
-
SFX_Cry1F_3_Ch8:
noise_note 5, 12, 4, 70
--- a/audio/sfx/cry20_1.asm
+++ b/audio/sfx/cry20_1.asm
@@ -6,7 +6,6 @@
square_note 8, 13, 1, 1297
sound_ret
-
SFX_Cry20_1_Ch6:
duty_cycle_pattern 0, 1, 1, 1
square_note 12, 14, 1, 1292
@@ -14,7 +13,6 @@
square_note 14, 12, 1, 1292
square_note 8, 12, 1, 1290
sound_ret
-
SFX_Cry20_1_Ch8:
noise_note 14, 15, 2, 101
--- a/audio/sfx/cry20_2.asm
+++ b/audio/sfx/cry20_2.asm
@@ -6,7 +6,6 @@
square_note 8, 13, 1, 1297
sound_ret
-
SFX_Cry20_2_Ch6:
duty_cycle_pattern 0, 1, 1, 1
square_note 12, 14, 1, 1292
@@ -14,7 +13,6 @@
square_note 14, 12, 1, 1292
square_note 8, 12, 1, 1290
sound_ret
-
SFX_Cry20_2_Ch8:
noise_note 14, 15, 2, 101
--- a/audio/sfx/cry20_3.asm
+++ b/audio/sfx/cry20_3.asm
@@ -6,7 +6,6 @@
square_note 8, 13, 1, 1297
sound_ret
-
SFX_Cry20_3_Ch6:
duty_cycle_pattern 0, 1, 1, 1
square_note 12, 14, 1, 1292
@@ -14,7 +13,6 @@
square_note 14, 12, 1, 1292
square_note 8, 12, 1, 1290
sound_ret
-
SFX_Cry20_3_Ch8:
noise_note 14, 15, 2, 101
--- a/audio/sfx/cry21_1.asm
+++ b/audio/sfx/cry21_1.asm
@@ -10,7 +10,6 @@
square_note 8, 13, 1, 1282
sound_ret
-
SFX_Cry21_1_Ch6:
duty_cycle_pattern 3, 0, 3, 0
square_note 3, 13, 3, 1376
@@ -21,7 +20,6 @@
square_note 3, 13, 3, 1312
square_note 3, 12, 4, 1248
square_note 8, 12, 1, 1280
-
SFX_Cry21_1_Ch8:
sound_ret
--- a/audio/sfx/cry21_2.asm
+++ b/audio/sfx/cry21_2.asm
@@ -10,7 +10,6 @@
square_note 8, 13, 1, 1282
sound_ret
-
SFX_Cry21_2_Ch6:
duty_cycle_pattern 3, 0, 3, 0
square_note 3, 13, 3, 1376
@@ -21,7 +20,6 @@
square_note 3, 13, 3, 1312
square_note 3, 12, 4, 1248
square_note 8, 12, 1, 1280
-
SFX_Cry21_2_Ch8:
sound_ret
--- a/audio/sfx/cry21_3.asm
+++ b/audio/sfx/cry21_3.asm
@@ -10,7 +10,6 @@
square_note 8, 13, 1, 1282
sound_ret
-
SFX_Cry21_3_Ch6:
duty_cycle_pattern 3, 0, 3, 0
square_note 3, 13, 3, 1376
@@ -21,7 +20,6 @@
square_note 3, 13, 3, 1312
square_note 3, 12, 4, 1248
square_note 8, 12, 1, 1280
-
SFX_Cry21_3_Ch8:
sound_ret
--- a/audio/sfx/cry22_1.asm
+++ b/audio/sfx/cry22_1.asm
@@ -6,7 +6,6 @@
square_note 8, 9, 1, 897
sound_ret
-
SFX_Cry22_1_Ch6:
duty_cycle_pattern 3, 2, 3, 2
square_note 2, 3, -6, 1456
@@ -14,7 +13,6 @@
square_note 1, 11, 2, 1712
square_note 8, 6, 1, 1456
sound_ret
-
SFX_Cry22_1_Ch8:
noise_note 2, 9, 2, 73
--- a/audio/sfx/cry22_2.asm
+++ b/audio/sfx/cry22_2.asm
@@ -6,7 +6,6 @@
square_note 8, 9, 1, 897
sound_ret
-
SFX_Cry22_2_Ch6:
duty_cycle_pattern 3, 2, 3, 2
square_note 2, 3, -6, 1456
@@ -14,7 +13,6 @@
square_note 1, 11, 2, 1712
square_note 8, 6, 1, 1456
sound_ret
-
SFX_Cry22_2_Ch8:
noise_note 2, 9, 2, 73
--- a/audio/sfx/cry22_3.asm
+++ b/audio/sfx/cry22_3.asm
@@ -6,7 +6,6 @@
square_note 8, 9, 1, 897
sound_ret
-
SFX_Cry22_3_Ch6:
duty_cycle_pattern 3, 2, 3, 2
square_note 2, 3, -6, 1456
@@ -14,7 +13,6 @@
square_note 1, 11, 2, 1712
square_note 8, 6, 1, 1456
sound_ret
-
SFX_Cry22_3_Ch8:
noise_note 2, 9, 2, 73
--- a/audio/sfx/cry23_1.asm
+++ b/audio/sfx/cry23_1.asm
@@ -7,7 +7,6 @@
square_note 8, 12, 1, 1984
sound_ret
-
SFX_Cry23_1_Ch6:
duty_cycle_pattern 1, 1, 3, 3
square_note 15, 9, 7, 1921
@@ -15,7 +14,6 @@
square_note 10, 9, 6, 1921
square_note 15, 8, 3, 1921
sound_ret
-
SFX_Cry23_1_Ch8:
noise_note 3, 15, 2, 60
--- a/audio/sfx/cry23_2.asm
+++ b/audio/sfx/cry23_2.asm
@@ -7,7 +7,6 @@
square_note 8, 12, 1, 1984
sound_ret
-
SFX_Cry23_2_Ch6:
duty_cycle_pattern 1, 1, 3, 3
square_note 15, 9, 7, 1921
@@ -15,7 +14,6 @@
square_note 10, 9, 6, 1921
square_note 15, 8, 3, 1921
sound_ret
-
SFX_Cry23_2_Ch8:
noise_note 3, 15, 2, 60
--- a/audio/sfx/cry23_3.asm
+++ b/audio/sfx/cry23_3.asm
@@ -7,7 +7,6 @@
square_note 8, 12, 1, 1984
sound_ret
-
SFX_Cry23_3_Ch6:
duty_cycle_pattern 1, 1, 3, 3
square_note 15, 9, 7, 1921
@@ -15,7 +14,6 @@
square_note 10, 9, 6, 1921
square_note 15, 8, 3, 1921
sound_ret
-
SFX_Cry23_3_Ch8:
noise_note 3, 15, 2, 60
--- a/audio/sfx/cry24_1.asm
+++ b/audio/sfx/cry24_1.asm
@@ -10,7 +10,6 @@
square_note 8, 12, 1, 1600
sound_ret
-
SFX_Cry24_1_Ch6:
duty_cycle_pattern 0, 0, 1, 1
square_note 15, 11, 7, 1601
@@ -22,7 +21,6 @@
square_note 4, 9, 3, 1570
square_note 8, 7, 1, 1537
sound_ret
-
SFX_Cry24_1_Ch8:
noise_note 15, 14, 4, 60
--- a/audio/sfx/cry24_2.asm
+++ b/audio/sfx/cry24_2.asm
@@ -10,7 +10,6 @@
square_note 8, 12, 1, 1600
sound_ret
-
SFX_Cry24_2_Ch6:
duty_cycle_pattern 0, 0, 1, 1
square_note 15, 11, 7, 1601
@@ -22,7 +21,6 @@
square_note 4, 9, 3, 1570
square_note 8, 7, 1, 1537
sound_ret
-
SFX_Cry24_2_Ch8:
noise_note 15, 14, 4, 60
--- a/audio/sfx/cry24_3.asm
+++ b/audio/sfx/cry24_3.asm
@@ -10,7 +10,6 @@
square_note 8, 12, 1, 1600
sound_ret
-
SFX_Cry24_3_Ch6:
duty_cycle_pattern 0, 0, 1, 1
square_note 15, 11, 7, 1601
@@ -22,7 +21,6 @@
square_note 4, 9, 3, 1570
square_note 8, 7, 1, 1537
sound_ret
-
SFX_Cry24_3_Ch8:
noise_note 15, 14, 4, 60
--- a/audio/sfx/cry25_1.asm
+++ b/audio/sfx/cry25_1.asm
@@ -7,7 +7,6 @@
square_note 8, 13, 1, 1872
sound_ret
-
SFX_Cry25_1_Ch6:
duty_cycle_pattern 1, 3, 1, 3
square_note 6, 12, 3, 1810
@@ -16,7 +15,6 @@
square_note 4, 12, 3, 1825
square_note 8, 11, 1, 1842
sound_ret
-
SFX_Cry25_1_Ch8:
noise_note 8, 13, 6, 44
--- a/audio/sfx/cry25_2.asm
+++ b/audio/sfx/cry25_2.asm
@@ -7,7 +7,6 @@
square_note 8, 13, 1, 1872
sound_ret
-
SFX_Cry25_2_Ch6:
duty_cycle_pattern 1, 3, 1, 3
square_note 6, 12, 3, 1810
@@ -16,7 +15,6 @@
square_note 4, 12, 3, 1825
square_note 8, 11, 1, 1842
sound_ret
-
SFX_Cry25_2_Ch8:
noise_note 8, 13, 6, 44
--- a/audio/sfx/cry25_3.asm
+++ b/audio/sfx/cry25_3.asm
@@ -7,7 +7,6 @@
square_note 8, 13, 1, 1872
sound_ret
-
SFX_Cry25_3_Ch6:
duty_cycle_pattern 1, 3, 1, 3
square_note 6, 12, 3, 1810
@@ -16,7 +15,6 @@
square_note 4, 12, 3, 1825
square_note 8, 11, 1, 1842
sound_ret
-
SFX_Cry25_3_Ch8:
noise_note 8, 13, 6, 44
--- a/audio/sfx/denied_1.asm
+++ b/audio/sfx/denied_1.asm
@@ -8,7 +8,6 @@
square_note 1, 0, 0, 0
sound_ret
-
SFX_Denied_1_Ch6:
duty_cycle 3
square_note 4, 15, 0, 1025
--- a/audio/sfx/denied_3.asm
+++ b/audio/sfx/denied_3.asm
@@ -8,7 +8,6 @@
square_note 1, 0, 0, 0
sound_ret
-
SFX_Denied_3_Ch6:
duty_cycle 3
square_note 4, 15, 0, 1025
--- a/audio/sfx/dex_page_added.asm
+++ b/audio/sfx/dex_page_added.asm
@@ -7,7 +7,6 @@
pitch_sweep 0, 8
sound_ret
-
SFX_Dex_Page_Added_Ch6:
duty_cycle 2
square_note 15, 9, 2, 1536
--- a/audio/sfx/faint_thud.asm
+++ b/audio/sfx/faint_thud.asm
@@ -3,7 +3,6 @@
pitch_sweep 0, 8
sound_ret
-
SFX_Faint_Thud_Ch8:
noise_note 4, 15, 5, 51
noise_note 8, 15, 4, 34
--- a/audio/sfx/get_item1_1.asm
+++ b/audio/sfx/get_item1_1.asm
@@ -15,7 +15,6 @@
note E_, 4
sound_ret
-
SFX_Get_Item1_1_Ch6:
execute_music
vibrato 8, 2, 7
@@ -28,7 +27,6 @@
note_type 12, 12, 3
note B_, 4
sound_ret
-
SFX_Get_Item1_1_Ch7:
execute_music
--- a/audio/sfx/get_item1_3.asm
+++ b/audio/sfx/get_item1_3.asm
@@ -15,7 +15,6 @@
note E_, 4
sound_ret
-
SFX_Get_Item1_3_Ch6:
execute_music
vibrato 8, 2, 7
@@ -28,7 +27,6 @@
note_type 12, 12, 3
note B_, 4
sound_ret
-
SFX_Get_Item1_3_Ch7:
execute_music
--- a/audio/sfx/get_item2_1.asm
+++ b/audio/sfx/get_item2_1.asm
@@ -24,7 +24,6 @@
note C_, 8
sound_ret
-
SFX_Get_Item2_1_Ch6:
execute_music
vibrato 8, 2, 7
@@ -44,7 +43,6 @@
note_type 5, 12, 4
note A_, 8
sound_ret
-
SFX_Get_Item2_1_Ch7:
execute_music
--- a/audio/sfx/get_item2_2.asm
+++ b/audio/sfx/get_item2_2.asm
@@ -24,7 +24,6 @@
note C_, 8
sound_ret
-
SFX_Get_Item2_2_Ch6:
execute_music
vibrato 8, 2, 7
@@ -44,7 +43,6 @@
note_type 5, 12, 4
note A_, 8
sound_ret
-
SFX_Get_Item2_2_Ch7:
execute_music
--- a/audio/sfx/get_item2_3.asm
+++ b/audio/sfx/get_item2_3.asm
@@ -24,7 +24,6 @@
note C_, 8
sound_ret
-
SFX_Get_Item2_3_Ch6:
execute_music
vibrato 8, 2, 7
@@ -44,7 +43,6 @@
note_type 5, 12, 4
note A_, 8
sound_ret
-
SFX_Get_Item2_3_Ch7:
execute_music
--- a/audio/sfx/get_key_item_1.asm
+++ b/audio/sfx/get_key_item_1.asm
@@ -22,7 +22,6 @@
note A#, 8
sound_ret
-
SFX_Get_Key_Item_1_Ch6:
execute_music
vibrato 4, 2, 3
@@ -45,7 +44,6 @@
octave 5
note D#, 8
sound_ret
-
SFX_Get_Key_Item_1_Ch7:
execute_music
--- a/audio/sfx/get_key_item_3.asm
+++ b/audio/sfx/get_key_item_3.asm
@@ -22,7 +22,6 @@
note A#, 8
sound_ret
-
SFX_Get_Key_Item_3_Ch6:
execute_music
vibrato 4, 2, 3
@@ -45,7 +44,6 @@
octave 5
note D#, 8
sound_ret
-
SFX_Get_Key_Item_3_Ch7:
execute_music
--- a/audio/sfx/level_up.asm
+++ b/audio/sfx/level_up.asm
@@ -19,7 +19,6 @@
note F_, 8
sound_ret
-
SFX_Level_Up_Ch6:
execute_music
vibrato 4, 2, 2
@@ -38,7 +37,6 @@
note_type 6, 12, 4
note A_, 8
sound_ret
-
SFX_Level_Up_Ch7:
execute_music
--- a/audio/sfx/pokedex_rating_1.asm
+++ b/audio/sfx/pokedex_rating_1.asm
@@ -20,7 +20,6 @@
note F_, 4
sound_ret
-
SFX_Pokedex_Rating_1_Ch6:
execute_music
duty_cycle 2
@@ -42,7 +41,6 @@
note G_, 4
note F_, 4
sound_ret
-
SFX_Pokedex_Rating_1_Ch7:
execute_music
--- a/audio/sfx/pokedex_rating_3.asm
+++ b/audio/sfx/pokedex_rating_3.asm
@@ -20,7 +20,6 @@
note F_, 4
sound_ret
-
SFX_Pokedex_Rating_3_Ch6:
execute_music
duty_cycle 2
@@ -42,7 +41,6 @@
note G_, 4
note F_, 4
sound_ret
-
SFX_Pokedex_Rating_3_Ch7:
execute_music
--- a/audio/sfx/pokeflute_ch5_ch6.asm
+++ b/audio/sfx/pokeflute_ch5_ch6.asm
@@ -1,7 +1,6 @@
SFX_Pokeflute_Ch5:
tempo 256
-
SFX_Pokeflute_Ch6:
execute_music
note_type 8, 0, 0
--- a/audio/sfx/psybeam.asm
+++ b/audio/sfx/psybeam.asm
@@ -7,7 +7,6 @@
square_note 10, 15, 1, 1600
sound_ret
-
SFX_Psybeam_Ch6:
duty_cycle_pattern 2, 3, 0, 3
square_note 10, 15, 3, 1393
@@ -16,7 +15,6 @@
sound_loop 4, SFX_Psybeam_Ch6
square_note 10, 15, 1, 1393
sound_ret
-
SFX_Psybeam_Ch8:
noise_note 2, 13, 1, 74
--- a/audio/sfx/psychic_m.asm
+++ b/audio/sfx/psychic_m.asm
@@ -10,7 +10,6 @@
pitch_sweep 0, 8
sound_ret
-
SFX_Psychic_M_Ch6:
duty_cycle 2
square_note 8, 12, 4, 1904
@@ -20,7 +19,6 @@
square_note 15, 12, 4, 1892
square_note 15, 15, 2, 1892
sound_ret
-
SFX_Psychic_M_Ch8:
noise_note 15, 3, -7, 20
--- a/audio/sfx/purchase_1.asm
+++ b/audio/sfx/purchase_1.asm
@@ -4,7 +4,6 @@
square_note 8, 15, 2, 2016
sound_ret
-
SFX_Purchase_1_Ch6:
duty_cycle 2
square_note 1, 0, 8, 0
--- a/audio/sfx/purchase_3.asm
+++ b/audio/sfx/purchase_3.asm
@@ -4,7 +4,6 @@
square_note 8, 15, 2, 2016
sound_ret
-
SFX_Purchase_3_Ch6:
duty_cycle 2
square_note 1, 0, 8, 0
--- a/audio/sfx/save_1.asm
+++ b/audio/sfx/save_1.asm
@@ -9,7 +9,6 @@
square_note 15, 15, 2, 2016
sound_ret
-
SFX_Save_1_Ch6:
duty_cycle 2
square_note 4, 0, 8, 0
--- a/audio/sfx/save_3.asm
+++ b/audio/sfx/save_3.asm
@@ -15,7 +15,6 @@
ENDC
sound_ret
-
SFX_Save_3_Ch6:
duty_cycle 2
IF DEF(_RED)
--- a/audio/sfx/slots_new_spin.asm
+++ b/audio/sfx/slots_new_spin.asm
@@ -5,7 +5,6 @@
square_note 15, 15, 1, 1984
sound_ret
-
SFX_Slots_New_Spin_Ch6:
duty_cycle 2
square_note 4, 12, 1, 1729
--- a/audio/sfx/ss_anne_horn_1.asm
+++ b/audio/sfx/ss_anne_horn_1.asm
@@ -9,7 +9,6 @@
square_note 15, 15, 2, 1280
sound_ret
-
SFX_SS_Anne_Horn_1_Ch6:
duty_cycle 3
square_note 15, 15, 0, 1154
--- a/audio/sfx/ss_anne_horn_3.asm
+++ b/audio/sfx/ss_anne_horn_3.asm
@@ -9,7 +9,6 @@
square_note 15, 15, 2, 1280
sound_ret
-
SFX_SS_Anne_Horn_3_Ch6:
duty_cycle 3
square_note 15, 15, 0, 1154
--- a/audio/sfx/swap_1.asm
+++ b/audio/sfx/swap_1.asm
@@ -3,7 +3,6 @@
square_note 8, 14, 1, 1856
sound_ret
-
SFX_Swap_1_Ch6:
duty_cycle 2
square_note 2, 0, 8, 0
--- a/audio/sfx/swap_3.asm
+++ b/audio/sfx/swap_3.asm
@@ -3,7 +3,6 @@
square_note 8, 14, 1, 1856
sound_ret
-
SFX_Swap_3_Ch6:
duty_cycle 2
square_note 2, 0, 8, 0
--- a/audio/sfx/unused_cry_1.asm
+++ b/audio/sfx/unused_cry_1.asm
@@ -9,7 +9,6 @@
square_note 8, 7, 1, 1924
sound_ret
-
SFX_UnusedCry_1_Ch6: ; unreferenced
duty_cycle_pattern 0, 0, 1, 1
square_note 15, 10, 0, 1857
@@ -19,7 +18,6 @@
square_note 10, 4, -4, 1857
square_note 8, 3, 1, 1862
sound_ret
-
SFX_UnusedCry_1_Ch8: ; unreferenced
noise_note 2, 15, 2, 76
--- a/audio/sfx/unused_cry_2.asm
+++ b/audio/sfx/unused_cry_2.asm
@@ -9,7 +9,6 @@
square_note 8, 7, 1, 1924
sound_ret
-
SFX_UnusedCry_2_Ch6: ; unreferenced
duty_cycle_pattern 0, 0, 1, 1
square_note 15, 10, 0, 1857
@@ -19,7 +18,6 @@
square_note 10, 4, -4, 1857
square_note 8, 3, 1, 1862
sound_ret
-
SFX_UnusedCry_2_Ch8: ; unreferenced
noise_note 2, 15, 2, 76
--- a/audio/sfx/unused_cry_3.asm
+++ b/audio/sfx/unused_cry_3.asm
@@ -9,7 +9,6 @@
square_note 8, 7, 1, 1924
sound_ret
-
SFX_UnusedCry_3_Ch6: ; unreferenced
duty_cycle_pattern 0, 0, 1, 1
square_note 15, 10, 0, 1857
@@ -19,7 +18,6 @@
square_note 10, 4, -4, 1857
square_note 8, 3, 1, 1862
sound_ret
-
SFX_UnusedCry_3_Ch8: ; unreferenced
noise_note 2, 15, 2, 76