diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index ef909832..64292bc2 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -3,7 +3,6 @@ SFX_59_1_Ch5: square_note 4, 15, 1, 1920 sound_ret - SFX_59_1_Ch6: duty_cycle 2 square_note 1, 0, 8, 0 diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 7510842f..bfcd1e48 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -3,7 +3,6 @@ SFX_59_3_Ch5: square_note 4, 15, 1, 1920 sound_ret - SFX_59_3_Ch6: duty_cycle 2 square_note 1, 0, 8, 0 diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 396adf44..8210406b 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -5,7 +5,6 @@ SFX_Ball_Poof_Ch5: pitch_sweep 0, 8 sound_ret - SFX_Ball_Poof_Ch8: noise_note 15, 10, 2, 34 sound_ret diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index 207bf720..065e472c 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -4,7 +4,6 @@ SFX_Ball_Toss_Ch5: square_note 15, 15, 2, 1920 sound_ret - SFX_Ball_Toss_Ch6: duty_cycle 2 square_note 15, 12, 2, 1922 diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index 26820e8d..9b04ef49 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -7,7 +7,6 @@ SFX_Battle_1E_Ch5: pitch_sweep 0, 8 sound_ret - SFX_Battle_1E_Ch8: noise_note 0, 13, 1, 66 noise_note 4, 10, 1, 50 diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index f99cf59a..4f53b368 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -5,7 +5,6 @@ SFX_Battle_24_Ch5: pitch_sweep 0, 8 sound_ret - SFX_Battle_24_Ch8: noise_note 15, 3, -7, 34 noise_note 15, 15, 2, 33 diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index 1b505811..d7b3e0ff 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,25 +1,21 @@ 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 noise_note 3, 10, 1, 17 diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index 467e411d..5913c7a3 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -5,7 +5,6 @@ SFX_Battle_28_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Battle_28_Ch6: sound_loop 12, SFX_Battle_28_Ch6 sound_ret - SFX_Battle_28_Ch8: noise_note 1, 13, 1, 73 noise_note 1, 13, 1, 41 diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index c3999ec8..e6b85bc6 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -7,7 +7,6 @@ SFX_Battle_29_Ch5: square_note 15, 12, 2, 272 sound_ret - SFX_Battle_29_Ch8: noise_note 10, 15, 3, 53 noise_note 14, 15, 6, 69 diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index 1faf2dda..7a746b5f 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -8,7 +8,6 @@ SFX_Battle_2A_Ch5: 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 @@ -18,7 +17,6 @@ SFX_Battle_2A_Ch6: sound_loop 3, SFX_Battle_2A_Ch6 sound_ret - SFX_Battle_2A_Ch8: noise_note 5, 12, 3, 51 noise_note 3, 9, 2, 67 diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index d60a96f6..e39cd73d 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -9,7 +9,6 @@ SFX_Battle_2B_Ch5: square_note 8, 8, 1, 1024 sound_ret - SFX_Battle_2B_Ch8: noise_note 3, 6, 2, 34 noise_note 3, 10, 2, 50 diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index 7530210f..ed4ad537 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -6,7 +6,6 @@ SFX_Battle_2C_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Battle_2C_Ch6: sound_loop 4, SFX_Battle_2C_Ch6 sound_ret - SFX_Battle_2C_Ch8: noise_note 9, 15, 4, 68 noise_note 9, 15, 2, 67 diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index ab5665fa..57f7fe51 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -7,7 +7,6 @@ SFX_Battle_2E_Ch5: 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 @@ -17,7 +16,6 @@ SFX_Battle_2E_Ch6: sound_loop 8, SFX_Battle_2E_Ch6 sound_ret - SFX_Battle_2E_Ch8: noise_note 2, 13, 3, 16 noise_note 3, 13, 3, 17 diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index dd80e599..0918f50e 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -5,7 +5,6 @@ SFX_Battle_2F_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Battle_2F_Ch6: sound_loop 9, SFX_Battle_2F_Ch6 sound_ret - SFX_Battle_2F_Ch8: noise_note 4, 15, -7, 67 noise_note 4, 15, 2, 68 diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index 83dc96f4..7996a7c2 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -7,7 +7,6 @@ SFX_Battle_31_Ch5: square_note 15, 15, 2, 2016 sound_ret - SFX_Battle_31_Ch6: duty_cycle 3 square_note 15, 15, -7, 2018 diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index c906dcac..d1eaf472 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -5,7 +5,6 @@ SFX_Battle_32_Ch5: pitch_sweep 0, 8 sound_ret - SFX_Battle_32_Ch6: duty_cycle 3 square_note 8, 15, 1, 1793 diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index 95afe045..85e30347 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -7,7 +7,6 @@ SFX_Battle_33_Ch5: square_note 8, 15, 1, 1792 sound_ret - SFX_Battle_33_Ch6: duty_cycle 3 square_note 6, 14, 1, 1296 diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index 654049e4..a52e8332 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -5,7 +5,6 @@ SFX_Battle_34_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Battle_34_Ch6: square_note 15, 14, 3, 960 sound_ret - SFX_Battle_34_Ch8: noise_note 4, 15, -7, 81 noise_note 8, 15, -7, 84 diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm index e9f78657..b0cc1267 100644 --- a/audio/sfx/battle_35.asm +++ b/audio/sfx/battle_35.asm @@ -12,7 +12,6 @@ SFX_Battle_35_Ch5: note G#, 8 sound_ret - SFX_Battle_35_Ch6: execute_music vibrato 10, 2, 3 diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index 773bf753..e029c249 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -11,15 +11,13 @@ SFX_Battle_36_Ch5: 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,11 +33,10 @@ SFX_Battle_36_Ch6: 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 noise_note 1, 13, 1, 41 diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm index 3fe278f3..aeae799d 100644 --- a/audio/sfx/caught_mon.asm +++ b/audio/sfx/caught_mon.asm @@ -21,7 +21,6 @@ SFX_Caught_Mon_Ch5: note E_, 8 sound_ret - SFX_Caught_Mon_Ch6: execute_music duty_cycle 2 @@ -43,7 +42,6 @@ SFX_Caught_Mon_Ch6: note G#, 8 sound_ret - SFX_Caught_Mon_Ch7: execute_music note_type 6, 1, 0 diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index 22a41634..8bcd5c7c 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -5,7 +5,6 @@ SFX_Cry00_1_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Cry00_1_Ch6: square_note 8, 7, 1, 1864 sound_ret - SFX_Cry00_1_Ch8: noise_note 3, 10, 1, 28 noise_note 14, 9, 4, 44 diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index 97d17e8f..df8fabc6 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -5,7 +5,6 @@ SFX_Cry00_2_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Cry00_2_Ch6: square_note 8, 7, 1, 1864 sound_ret - SFX_Cry00_2_Ch8: noise_note 3, 10, 1, 28 noise_note 14, 9, 4, 44 diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index e332c35e..bc3c4977 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -5,7 +5,6 @@ SFX_Cry00_3_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Cry00_3_Ch6: square_note 8, 7, 1, 1864 sound_ret - SFX_Cry00_3_Ch8: noise_note 3, 10, 1, 28 noise_note 14, 9, 4, 44 diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index cb35392b..51d468c2 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -6,7 +6,6 @@ SFX_Cry01_1_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry01_1_Ch6: square_note 8, 11, 1, 1537 sound_ret - SFX_Cry01_1_Ch8: noise_note 3, 10, 2, 60 noise_note 12, 9, 4, 44 diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index 449adac7..31c130a6 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -6,7 +6,6 @@ SFX_Cry01_2_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry01_2_Ch6: square_note 8, 11, 1, 1537 sound_ret - SFX_Cry01_2_Ch8: noise_note 3, 10, 2, 60 noise_note 12, 9, 4, 44 diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index ef8e5e8c..5e8e8ea9 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -6,7 +6,6 @@ SFX_Cry01_3_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry01_3_Ch6: square_note 8, 11, 1, 1537 sound_ret - SFX_Cry01_3_Ch8: noise_note 3, 10, 2, 60 noise_note 12, 9, 4, 44 diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index 3db37e97..3191ac1f 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -5,13 +5,11 @@ SFX_Cry02_1_Ch5: 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 diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index a623e071..9657bb51 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -5,13 +5,11 @@ SFX_Cry02_2_Ch5: 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 diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 4e0861d1..6a7d5bc8 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -5,13 +5,11 @@ SFX_Cry02_3_Ch5: 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 diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index cb58c394..34f348f6 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -9,7 +9,6 @@ SFX_Cry03_1_Ch5: 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 @@ -21,7 +20,6 @@ SFX_Cry03_1_Ch6: square_note 8, 12, 1, 1154 sound_ret - SFX_Cry03_1_Ch8: noise_note 12, 14, 4, 76 noise_note 10, 12, 7, 92 diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index 2813ce1a..92abf562 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -9,7 +9,6 @@ SFX_Cry03_2_Ch5: 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 @@ -21,7 +20,6 @@ SFX_Cry03_2_Ch6: square_note 8, 12, 1, 1154 sound_ret - SFX_Cry03_2_Ch8: noise_note 12, 14, 4, 76 noise_note 10, 12, 7, 92 diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index ae561a7a..58919104 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -9,7 +9,6 @@ SFX_Cry03_3_Ch5: 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 @@ -21,7 +20,6 @@ SFX_Cry03_3_Ch6: square_note 8, 12, 1, 1154 sound_ret - SFX_Cry03_3_Ch8: noise_note 12, 14, 4, 76 noise_note 10, 12, 7, 92 diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index 24662192..21b18815 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -9,7 +9,6 @@ SFX_Cry04_1_Ch5: 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 @@ -21,7 +20,6 @@ SFX_Cry04_1_Ch6: square_note 8, 10, 1, 1393 sound_ret - SFX_Cry04_1_Ch8: noise_note 7, 13, 6, 92 noise_note 8, 14, 6, 76 diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index f18fd9cd..1b96453a 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -9,7 +9,6 @@ SFX_Cry04_2_Ch5: 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 @@ -21,7 +20,6 @@ SFX_Cry04_2_Ch6: square_note 8, 10, 1, 1393 sound_ret - SFX_Cry04_2_Ch8: noise_note 7, 13, 6, 92 noise_note 8, 14, 6, 76 diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index 718af40f..448c440e 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -9,7 +9,6 @@ SFX_Cry04_3_Ch5: 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 @@ -21,7 +20,6 @@ SFX_Cry04_3_Ch6: square_note 8, 10, 1, 1393 sound_ret - SFX_Cry04_3_Ch8: noise_note 7, 13, 6, 92 noise_note 8, 14, 6, 76 diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 1c3fce20..5a65899a 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -6,7 +6,6 @@ SFX_Cry05_1_Ch5: 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 @@ -14,6 +13,5 @@ SFX_Cry05_1_Ch6: square_note 6, 11, 2, 1250 square_note 8, 8, 1, 1217 - SFX_Cry05_1_Ch8: sound_ret diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index 53f076f2..660491ef 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -6,7 +6,6 @@ SFX_Cry05_2_Ch5: 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 @@ -14,6 +13,5 @@ SFX_Cry05_2_Ch6: square_note 6, 11, 2, 1250 square_note 8, 8, 1, 1217 - SFX_Cry05_2_Ch8: sound_ret diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index 2d5b02b8..84242151 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -6,7 +6,6 @@ SFX_Cry05_3_Ch5: 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 @@ -14,6 +13,5 @@ SFX_Cry05_3_Ch6: square_note 6, 11, 2, 1250 square_note 8, 8, 1, 1217 - SFX_Cry05_3_Ch8: sound_ret diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index 03b75b0a..bdd9f414 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -7,11 +7,9 @@ SFX_Cry06_1_Ch5: 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 noise_note 4, 14, 2, 156 diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 6ddbfeb0..dd5938ad 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -7,11 +7,9 @@ SFX_Cry06_2_Ch5: 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 noise_note 4, 14, 2, 156 diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index d509053b..7dd94de3 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -7,11 +7,9 @@ SFX_Cry06_3_Ch5: 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 noise_note 4, 14, 2, 156 diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index 3733e746..86c61da7 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -5,7 +5,6 @@ SFX_Cry07_1_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Cry07_1_Ch6: square_note 8, 10, 1, 1537 sound_ret - SFX_Cry07_1_Ch8: noise_note 4, 13, 3, 92 noise_note 15, 14, 6, 76 diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index 6a134397..d4aa6ce2 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -5,7 +5,6 @@ SFX_Cry07_2_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Cry07_2_Ch6: square_note 8, 10, 1, 1537 sound_ret - SFX_Cry07_2_Ch8: noise_note 4, 13, 3, 92 noise_note 15, 14, 6, 76 diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index a8b60f38..213335df 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -5,7 +5,6 @@ SFX_Cry07_3_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Cry07_3_Ch6: square_note 8, 10, 1, 1537 sound_ret - SFX_Cry07_3_Ch8: noise_note 4, 13, 3, 92 noise_note 15, 14, 6, 76 diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 92f17fa8..1950e1ff 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -6,7 +6,6 @@ SFX_Cry08_1_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry08_1_Ch6: square_note 15, 10, 2, 1243 sound_ret - SFX_Cry08_1_Ch8: noise_note 12, 14, 6, 76 noise_note 11, 13, 7, 92 diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 53ac2891..7b6bb949 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -6,7 +6,6 @@ SFX_Cry08_2_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry08_2_Ch6: square_note 15, 10, 2, 1243 sound_ret - SFX_Cry08_2_Ch8: noise_note 12, 14, 6, 76 noise_note 11, 13, 7, 92 diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index 81bcf360..850f452d 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -6,7 +6,6 @@ SFX_Cry08_3_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry08_3_Ch6: square_note 15, 10, 2, 1243 sound_ret - SFX_Cry08_3_Ch8: noise_note 12, 14, 6, 76 noise_note 11, 13, 7, 92 diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index f8c600bd..a59ef288 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -9,7 +9,6 @@ SFX_Cry09_1_Ch5: 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 @@ -22,7 +21,6 @@ SFX_Cry09_1_Ch6: square_note 15, 10, 2, 1751 sound_ret - SFX_Cry09_1_Ch8: noise_note 2, 15, 2, 60 noise_note 8, 14, 4, 62 diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index 12965e07..683b5b52 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -9,7 +9,6 @@ SFX_Cry09_2_Ch5: 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 @@ -22,7 +21,6 @@ SFX_Cry09_2_Ch6: square_note 15, 10, 2, 1751 sound_ret - SFX_Cry09_2_Ch8: noise_note 2, 15, 2, 60 noise_note 8, 14, 4, 62 diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index 2c85d750..e77ec78d 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -9,7 +9,6 @@ SFX_Cry09_3_Ch5: 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 @@ -22,7 +21,6 @@ SFX_Cry09_3_Ch6: square_note 15, 10, 2, 1751 sound_ret - SFX_Cry09_3_Ch8: noise_note 2, 15, 2, 60 noise_note 8, 14, 4, 62 diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index bcb71844..5d9dc5fa 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -9,7 +9,6 @@ SFX_Cry0A_1_Ch5: 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 @@ -22,7 +21,6 @@ SFX_Cry0A_1_Ch6: square_note 15, 7, 2, 1673 sound_ret - SFX_Cry0A_1_Ch8: noise_note 2, 15, 2, 60 noise_note 8, 14, 4, 62 diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index fb365e91..a2c9e97e 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -9,7 +9,6 @@ SFX_Cry0A_2_Ch5: 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 @@ -22,7 +21,6 @@ SFX_Cry0A_2_Ch6: square_note 15, 7, 2, 1673 sound_ret - SFX_Cry0A_2_Ch8: noise_note 2, 15, 2, 60 noise_note 8, 14, 4, 62 diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index bf6dfcf1..28129736 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -9,7 +9,6 @@ SFX_Cry0A_3_Ch5: 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 @@ -22,7 +21,6 @@ SFX_Cry0A_3_Ch6: square_note 15, 7, 2, 1673 sound_ret - SFX_Cry0A_3_Ch8: noise_note 2, 15, 2, 60 noise_note 8, 14, 4, 62 diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index 51e445ab..8336817c 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -12,7 +12,6 @@ SFX_Cry0B_1_Ch5: 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 @@ -24,7 +23,6 @@ SFX_Cry0B_1_Ch6: square_note 8, 13, 1, 1793 sound_ret - SFX_Cry0B_1_Ch8: noise_note 15, 0, 8, 0 noise_note 4, 0, 8, 0 diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 68cb0ba6..37b22af9 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -12,7 +12,6 @@ SFX_Cry0B_2_Ch5: 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 @@ -24,7 +23,6 @@ SFX_Cry0B_2_Ch6: square_note 8, 13, 1, 1793 sound_ret - SFX_Cry0B_2_Ch8: noise_note 15, 0, 8, 0 noise_note 4, 0, 8, 0 diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index 3328a8b6..8ed2b5ff 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -12,7 +12,6 @@ SFX_Cry0B_3_Ch5: 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 @@ -24,7 +23,6 @@ SFX_Cry0B_3_Ch6: square_note 8, 13, 1, 1793 sound_ret - SFX_Cry0B_3_Ch8: noise_note 15, 0, 8, 0 noise_note 4, 0, 8, 0 diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index a59f9e8d..0c0d84fd 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -11,7 +11,6 @@ SFX_Cry0C_1_Ch5: 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 @@ -24,6 +23,5 @@ SFX_Cry0C_1_Ch6: square_note 2, 9, 1, 1497 square_note 8, 9, 1, 1505 - SFX_Cry0C_1_Ch8: sound_ret diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index 5be195a9..74a4c488 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -11,7 +11,6 @@ SFX_Cry0C_2_Ch5: 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 @@ -24,6 +23,5 @@ SFX_Cry0C_2_Ch6: square_note 2, 9, 1, 1497 square_note 8, 9, 1, 1505 - SFX_Cry0C_2_Ch8: sound_ret diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index f75f7a64..925a3eae 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -11,7 +11,6 @@ SFX_Cry0C_3_Ch5: 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 @@ -24,6 +23,5 @@ SFX_Cry0C_3_Ch6: square_note 2, 9, 1, 1497 square_note 8, 9, 1, 1505 - SFX_Cry0C_3_Ch8: sound_ret diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index 3bd1c4e5..ce9d07f1 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -9,7 +9,6 @@ SFX_Cry0D_1_Ch5: 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 @@ -25,7 +24,6 @@ SFX_Cry0D_1_Ch6: square_note 4, 13, 1, 1569 sound_ret - SFX_Cry0D_1_Ch8: noise_note 6, 13, 2, 28 noise_note 9, 11, 1, 44 diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index 1c57d5dc..7191493c 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -9,7 +9,6 @@ SFX_Cry0D_2_Ch5: 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 @@ -25,7 +24,6 @@ SFX_Cry0D_2_Ch6: square_note 4, 13, 1, 1569 sound_ret - SFX_Cry0D_2_Ch8: noise_note 6, 13, 2, 28 noise_note 9, 11, 1, 44 diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index be354add..d82f8b43 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -9,7 +9,6 @@ SFX_Cry0D_3_Ch5: 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 @@ -25,7 +24,6 @@ SFX_Cry0D_3_Ch6: square_note 4, 13, 1, 1569 sound_ret - SFX_Cry0D_3_Ch8: noise_note 6, 13, 2, 28 noise_note 9, 11, 1, 44 diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index 183280e2..e73e6b05 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -6,7 +6,6 @@ SFX_Cry0E_1_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry0E_1_Ch6: square_note 8, 11, 1, 1505 sound_ret - SFX_Cry0E_1_Ch8: noise_note 2, 6, 1, 50 noise_note 2, 6, 1, 33 diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index 905adbb3..f83fd85d 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -6,7 +6,6 @@ SFX_Cry0E_2_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry0E_2_Ch6: square_note 8, 11, 1, 1505 sound_ret - SFX_Cry0E_2_Ch8: noise_note 2, 6, 1, 50 noise_note 2, 6, 1, 33 diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index a17dc577..c3eed046 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -6,7 +6,6 @@ SFX_Cry0E_3_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry0E_3_Ch6: square_note 8, 11, 1, 1505 sound_ret - SFX_Cry0E_3_Ch8: noise_note 2, 6, 1, 50 noise_note 2, 6, 1, 33 diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 2cf79d6d..41c463c3 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -8,7 +8,6 @@ SFX_Cry0F_1_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry0F_1_Ch6: square_note 8, 10, 1, 1538 sound_ret - SFX_Cry0F_1_Ch8: noise_note 3, 14, 4, 60 noise_note 12, 13, 6, 44 diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 39f70bfe..306ed6e1 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -8,7 +8,6 @@ SFX_Cry0F_2_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry0F_2_Ch6: square_note 8, 10, 1, 1538 sound_ret - SFX_Cry0F_2_Ch8: noise_note 3, 14, 4, 60 noise_note 12, 13, 6, 44 diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index f96df482..04c18c7d 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -8,7 +8,6 @@ SFX_Cry0F_3_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry0F_3_Ch6: square_note 8, 10, 1, 1538 sound_ret - SFX_Cry0F_3_Ch8: noise_note 3, 14, 4, 60 noise_note 12, 13, 6, 44 diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index dc8d2b71..f8273bc8 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -10,7 +10,6 @@ SFX_Cry10_1_Ch5: 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 @@ -23,7 +22,6 @@ SFX_Cry10_1_Ch6: square_note 15, 8, 1, 1826 sound_ret - SFX_Cry10_1_Ch8: noise_note 4, 7, 4, 33 noise_note 4, 7, 4, 16 diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index f026f7c1..580736ef 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -10,7 +10,6 @@ SFX_Cry10_2_Ch5: 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 @@ -23,7 +22,6 @@ SFX_Cry10_2_Ch6: square_note 15, 8, 1, 1826 sound_ret - SFX_Cry10_2_Ch8: noise_note 4, 7, 4, 33 noise_note 4, 7, 4, 16 diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index 4b494b60..551fcfed 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -10,7 +10,6 @@ SFX_Cry10_3_Ch5: 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 @@ -23,7 +22,6 @@ SFX_Cry10_3_Ch6: square_note 15, 8, 1, 1826 sound_ret - SFX_Cry10_3_Ch8: noise_note 4, 7, 4, 33 noise_note 4, 7, 4, 16 diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index 09fa8123..823b8163 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -9,7 +9,6 @@ SFX_Cry11_1_Ch5: 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 @@ -22,7 +21,6 @@ SFX_Cry11_1_Ch6: square_note 8, 7, 1, 1752 sound_ret - SFX_Cry11_1_Ch8: noise_note 2, 15, 2, 76 noise_note 6, 14, 6, 58 diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index b51b01c1..7fab820b 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -9,7 +9,6 @@ SFX_Cry11_2_Ch5: 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 @@ -22,7 +21,6 @@ SFX_Cry11_2_Ch6: square_note 8, 7, 1, 1752 sound_ret - SFX_Cry11_2_Ch8: noise_note 2, 15, 2, 76 noise_note 6, 14, 6, 58 diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index 1a8b0c10..d462b0a0 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -9,7 +9,6 @@ SFX_Cry11_3_Ch5: 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 @@ -22,7 +21,6 @@ SFX_Cry11_3_Ch6: square_note 8, 7, 1, 1752 sound_ret - SFX_Cry11_3_Ch8: noise_note 2, 15, 2, 76 noise_note 6, 14, 6, 58 diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index d2ee5f6e..dcef04a9 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -6,7 +6,6 @@ SFX_Cry12_1_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry12_1_Ch6: square_note 8, 11, 1, 1144 sound_ret - SFX_Cry12_1_Ch8: noise_note 10, 14, 6, 108 noise_note 15, 13, 2, 92 diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index 8a4afa2a..4fb94d86 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -6,7 +6,6 @@ SFX_Cry12_2_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry12_2_Ch6: square_note 8, 11, 1, 1144 sound_ret - SFX_Cry12_2_Ch8: noise_note 10, 14, 6, 108 noise_note 15, 13, 2, 92 diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index b114cdf4..26335800 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -6,7 +6,6 @@ SFX_Cry12_3_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry12_3_Ch6: square_note 8, 11, 1, 1144 sound_ret - SFX_Cry12_3_Ch8: noise_note 10, 14, 6, 108 noise_note 15, 13, 2, 92 diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index 7ba33d8d..767a61b0 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -8,7 +8,6 @@ SFX_Cry13_1_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry13_1_Ch6: square_note 8, 9, 1, 1265 sound_ret - SFX_Cry13_1_Ch8: noise_note 10, 14, 6, 92 noise_note 10, 13, 6, 108 diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index 31ba80a1..b76aa7b8 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -8,7 +8,6 @@ SFX_Cry13_2_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry13_2_Ch6: square_note 8, 9, 1, 1265 sound_ret - SFX_Cry13_2_Ch8: noise_note 10, 14, 6, 92 noise_note 10, 13, 6, 108 diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index 8ca4cb0b..b6b52ed2 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -8,7 +8,6 @@ SFX_Cry13_3_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry13_3_Ch6: square_note 8, 9, 1, 1265 sound_ret - SFX_Cry13_3_Ch8: noise_note 10, 14, 6, 92 noise_note 10, 13, 6, 108 diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index d892918f..f1411c55 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -5,7 +5,6 @@ SFX_Cry14_1_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Cry14_1_Ch6: square_note 8, 10, 1, 1975 sound_ret - SFX_Cry14_1_Ch8: noise_note 8, 14, 4, 76 noise_note 14, 12, 4, 60 diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index 040bfe10..b9b7e394 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -5,7 +5,6 @@ SFX_Cry14_2_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Cry14_2_Ch6: square_note 8, 10, 1, 1975 sound_ret - SFX_Cry14_2_Ch8: noise_note 8, 14, 4, 76 noise_note 14, 12, 4, 60 diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index 142707c5..69446d1d 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -5,7 +5,6 @@ SFX_Cry14_3_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Cry14_3_Ch6: square_note 8, 10, 1, 1975 sound_ret - SFX_Cry14_3_Ch8: noise_note 8, 14, 4, 76 noise_note 14, 12, 4, 60 diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index 473d46cb..e040ed42 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -8,7 +8,6 @@ SFX_Cry15_1_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry15_1_Ch6: square_note 8, 10, 1, 1633 sound_ret - SFX_Cry15_1_Ch8: noise_note 6, 14, 3, 92 noise_note 14, 13, 6, 76 diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 82398789..eeb5e658 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -8,7 +8,6 @@ SFX_Cry15_2_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry15_2_Ch6: square_note 8, 10, 1, 1633 sound_ret - SFX_Cry15_2_Ch8: noise_note 6, 14, 3, 92 noise_note 14, 13, 6, 76 diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index dcd6683b..07729564 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -8,7 +8,6 @@ SFX_Cry15_3_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry15_3_Ch6: square_note 8, 10, 1, 1633 sound_ret - SFX_Cry15_3_Ch8: noise_note 6, 14, 3, 92 noise_note 14, 13, 6, 76 diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index 410ec4ad..f8e249f7 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -5,7 +5,6 @@ SFX_Cry16_1_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Cry16_1_Ch6: square_note 15, 12, 2, 1809 sound_ret - SFX_Cry16_1_Ch8: noise_note 13, 15, 6, 76 noise_note 4, 14, 6, 60 diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index a91355a6..bb23a93f 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -5,7 +5,6 @@ SFX_Cry16_2_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Cry16_2_Ch6: square_note 15, 12, 2, 1809 sound_ret - SFX_Cry16_2_Ch8: noise_note 13, 15, 6, 76 noise_note 4, 14, 6, 60 diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index 838a4241..eb136770 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -5,7 +5,6 @@ SFX_Cry16_3_Ch5: 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 @@ -13,7 +12,6 @@ SFX_Cry16_3_Ch6: square_note 15, 12, 2, 1809 sound_ret - SFX_Cry16_3_Ch8: noise_note 13, 15, 6, 76 noise_note 4, 14, 6, 60 diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index dcfde2bc..f9838dc2 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -6,7 +6,6 @@ SFX_Cry17_1_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry17_1_Ch6: square_note 15, 12, 2, 993 sound_ret - SFX_Cry17_1_Ch8: noise_note 14, 15, 7, 124 noise_note 12, 15, 6, 108 diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index f2b1f366..0906f36a 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -6,7 +6,6 @@ SFX_Cry17_2_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry17_2_Ch6: square_note 15, 12, 2, 993 sound_ret - SFX_Cry17_2_Ch8: noise_note 14, 15, 7, 124 noise_note 12, 15, 6, 108 diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index dabb4dbc..e3cd20dc 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -6,7 +6,6 @@ SFX_Cry17_3_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry17_3_Ch6: square_note 15, 12, 2, 993 sound_ret - SFX_Cry17_3_Ch8: noise_note 14, 15, 7, 124 noise_note 12, 15, 6, 108 diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index c67f03d1..95b84086 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -10,7 +10,6 @@ SFX_Cry18_1_Ch5: 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 @@ -23,7 +22,6 @@ SFX_Cry18_1_Ch6: square_note 8, 11, 1, 1617 sound_ret - SFX_Cry18_1_Ch8: noise_note 6, 14, 3, 76 noise_note 4, 12, 3, 60 diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 55be1c3f..7600e784 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -10,7 +10,6 @@ SFX_Cry18_2_Ch5: 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 @@ -23,7 +22,6 @@ SFX_Cry18_2_Ch6: square_note 8, 11, 1, 1617 sound_ret - SFX_Cry18_2_Ch8: noise_note 6, 14, 3, 76 noise_note 4, 12, 3, 60 diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index cc0db3ec..60e325fd 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -10,7 +10,6 @@ SFX_Cry18_3_Ch5: 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 @@ -23,7 +22,6 @@ SFX_Cry18_3_Ch6: square_note 8, 11, 1, 1617 sound_ret - SFX_Cry18_3_Ch8: noise_note 6, 14, 3, 76 noise_note 4, 12, 3, 60 diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index eca89a1c..d6e12b82 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -5,7 +5,6 @@ SFX_Cry19_1_Ch5: 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 @@ -13,6 +12,5 @@ SFX_Cry19_1_Ch6: square_note 15, 13, 7, 1857 square_note 15, 10, 2, 1793 - SFX_Cry19_1_Ch8: sound_ret diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index 3a7d51fd..b4f95a21 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -5,7 +5,6 @@ SFX_Cry19_2_Ch5: 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 @@ -13,6 +12,5 @@ SFX_Cry19_2_Ch6: square_note 15, 13, 7, 1857 square_note 15, 10, 2, 1793 - SFX_Cry19_2_Ch8: sound_ret diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index 965e6cf0..4ba66cff 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -5,7 +5,6 @@ SFX_Cry19_3_Ch5: 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 @@ -13,6 +12,5 @@ SFX_Cry19_3_Ch6: square_note 15, 13, 7, 1857 square_note 15, 10, 2, 1793 - SFX_Cry19_3_Ch8: sound_ret diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index f319878a..c1a94a23 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -8,7 +8,6 @@ SFX_Cry1A_1_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry1A_1_Ch6: square_note 8, 9, 1, 1890 sound_ret - SFX_Cry1A_1_Ch8: noise_note 3, 14, 2, 60 noise_note 8, 13, 6, 76 diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index 64fd0674..3e4c7528 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -8,7 +8,6 @@ SFX_Cry1A_2_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry1A_2_Ch6: square_note 8, 9, 1, 1890 sound_ret - SFX_Cry1A_2_Ch8: noise_note 3, 14, 2, 60 noise_note 8, 13, 6, 76 diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index a55f0dcf..91f011e7 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -8,7 +8,6 @@ SFX_Cry1A_3_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry1A_3_Ch6: square_note 8, 9, 1, 1890 sound_ret - SFX_Cry1A_3_Ch8: noise_note 3, 14, 2, 60 noise_note 8, 13, 6, 76 diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index 0070a0f1..9515f66b 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -7,7 +7,6 @@ SFX_Cry1B_1_Ch5: 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 @@ -17,7 +16,6 @@ SFX_Cry1B_1_Ch6: square_note 8, 12, 1, 1681 sound_ret - SFX_Cry1B_1_Ch8: noise_note 10, 10, 6, 60 noise_note 14, 9, 4, 44 diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index 9453ce9b..871cf892 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -7,7 +7,6 @@ SFX_Cry1B_2_Ch5: 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 @@ -17,7 +16,6 @@ SFX_Cry1B_2_Ch6: square_note 8, 12, 1, 1681 sound_ret - SFX_Cry1B_2_Ch8: noise_note 10, 10, 6, 60 noise_note 14, 9, 4, 44 diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index f6a1d76a..625f66c8 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -7,7 +7,6 @@ SFX_Cry1B_3_Ch5: 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 @@ -17,7 +16,6 @@ SFX_Cry1B_3_Ch6: square_note 8, 12, 1, 1681 sound_ret - SFX_Cry1B_3_Ch8: noise_note 10, 10, 6, 60 noise_note 14, 9, 4, 44 diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index 929835a5..f23a0426 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -10,7 +10,6 @@ SFX_Cry1C_1_Ch5: 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 @@ -21,7 +20,6 @@ SFX_Cry1C_1_Ch6: square_note 15, 10, 2, 1989 sound_ret - SFX_Cry1C_1_Ch8: noise_note 13, 1, -1, 124 noise_note 13, 15, 7, 140 diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index c9f23916..adea2c80 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -10,7 +10,6 @@ SFX_Cry1C_2_Ch5: 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 @@ -21,7 +20,6 @@ SFX_Cry1C_2_Ch6: square_note 15, 10, 2, 1989 sound_ret - SFX_Cry1C_2_Ch8: noise_note 13, 1, -1, 124 noise_note 13, 15, 7, 140 diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 7b18f038..182bda93 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -10,7 +10,6 @@ SFX_Cry1C_3_Ch5: 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 @@ -21,7 +20,6 @@ SFX_Cry1C_3_Ch6: square_note 15, 10, 2, 1989 sound_ret - SFX_Cry1C_3_Ch8: noise_note 13, 1, -1, 124 noise_note 13, 15, 7, 140 diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index a532ec5c..d7999114 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -8,7 +8,6 @@ SFX_Cry1D_1_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry1D_1_Ch6: square_note 8, 6, 1, 1512 sound_ret - SFX_Cry1D_1_Ch8: noise_note 6, 14, 6, 76 noise_note 15, 13, 6, 60 diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index c919ba1e..063e2490 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -8,7 +8,6 @@ SFX_Cry1D_2_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry1D_2_Ch6: square_note 8, 6, 1, 1512 sound_ret - SFX_Cry1D_2_Ch8: noise_note 6, 14, 6, 76 noise_note 15, 13, 6, 60 diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index 47e38997..8cd203cc 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -8,7 +8,6 @@ SFX_Cry1D_3_Ch5: 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 @@ -19,7 +18,6 @@ SFX_Cry1D_3_Ch6: square_note 8, 6, 1, 1512 sound_ret - SFX_Cry1D_3_Ch8: noise_note 6, 14, 6, 76 noise_note 15, 13, 6, 60 diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index 19634a5e..b1134905 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -10,7 +10,6 @@ SFX_Cry1E_1_Ch5: 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 @@ -24,7 +23,6 @@ SFX_Cry1E_1_Ch6: square_note 8, 8, 1, 1921 sound_ret - SFX_Cry1E_1_Ch8: noise_note 6, 0, 8, 1 noise_note 5, 14, 2, 92 diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index 74004489..6a88e67b 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -10,7 +10,6 @@ SFX_Cry1E_2_Ch5: 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 @@ -24,7 +23,6 @@ SFX_Cry1E_2_Ch6: square_note 8, 8, 1, 1921 sound_ret - SFX_Cry1E_2_Ch8: noise_note 6, 0, 8, 1 noise_note 5, 14, 2, 92 diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index 357c2f71..3e434a93 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -10,7 +10,6 @@ SFX_Cry1E_3_Ch5: 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 @@ -24,7 +23,6 @@ SFX_Cry1E_3_Ch6: square_note 8, 8, 1, 1921 sound_ret - SFX_Cry1E_3_Ch8: noise_note 6, 0, 8, 1 noise_note 5, 14, 2, 92 diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index 1f5b3a8d..6f55afb8 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -6,7 +6,6 @@ SFX_Cry1F_1_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry1F_1_Ch6: square_note 8, 13, 1, 1756 sound_ret - SFX_Cry1F_1_Ch8: noise_note 5, 12, 4, 70 noise_note 13, 10, 5, 68 diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index 99f3a056..36adf829 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -6,7 +6,6 @@ SFX_Cry1F_2_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry1F_2_Ch6: square_note 8, 13, 1, 1756 sound_ret - SFX_Cry1F_2_Ch8: noise_note 5, 12, 4, 70 noise_note 13, 10, 5, 68 diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index c9cf5441..aa7a780a 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -6,7 +6,6 @@ SFX_Cry1F_3_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry1F_3_Ch6: square_note 8, 13, 1, 1756 sound_ret - SFX_Cry1F_3_Ch8: noise_note 5, 12, 4, 70 noise_note 13, 10, 5, 68 diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index 15a160ae..f199b33f 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -6,7 +6,6 @@ SFX_Cry20_1_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry20_1_Ch6: square_note 8, 12, 1, 1290 sound_ret - SFX_Cry20_1_Ch8: noise_note 14, 15, 2, 101 noise_note 13, 14, 2, 85 diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index 281e478c..2d522fbf 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -6,7 +6,6 @@ SFX_Cry20_2_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry20_2_Ch6: square_note 8, 12, 1, 1290 sound_ret - SFX_Cry20_2_Ch8: noise_note 14, 15, 2, 101 noise_note 13, 14, 2, 85 diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 8191ca6e..f32f3614 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -6,7 +6,6 @@ SFX_Cry20_3_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry20_3_Ch6: square_note 8, 12, 1, 1290 sound_ret - SFX_Cry20_3_Ch8: noise_note 14, 15, 2, 101 noise_note 13, 14, 2, 85 diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index 2cf517a8..eaeb7c58 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -10,7 +10,6 @@ SFX_Cry21_1_Ch5: 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 @@ -22,6 +21,5 @@ SFX_Cry21_1_Ch6: square_note 3, 12, 4, 1248 square_note 8, 12, 1, 1280 - SFX_Cry21_1_Ch8: sound_ret diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index 8136de63..9e2bfece 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -10,7 +10,6 @@ SFX_Cry21_2_Ch5: 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 @@ -22,6 +21,5 @@ SFX_Cry21_2_Ch6: square_note 3, 12, 4, 1248 square_note 8, 12, 1, 1280 - SFX_Cry21_2_Ch8: sound_ret diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index d829f9f2..a896bac3 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -10,7 +10,6 @@ SFX_Cry21_3_Ch5: 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 @@ -22,6 +21,5 @@ SFX_Cry21_3_Ch6: square_note 3, 12, 4, 1248 square_note 8, 12, 1, 1280 - SFX_Cry21_3_Ch8: sound_ret diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index dd910103..cc9aa4b8 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -6,7 +6,6 @@ SFX_Cry22_1_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry22_1_Ch6: square_note 8, 6, 1, 1456 sound_ret - SFX_Cry22_1_Ch8: noise_note 2, 9, 2, 73 noise_note 7, 11, 5, 41 diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index 43e09d67..2ac4b7c6 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -6,7 +6,6 @@ SFX_Cry22_2_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry22_2_Ch6: square_note 8, 6, 1, 1456 sound_ret - SFX_Cry22_2_Ch8: noise_note 2, 9, 2, 73 noise_note 7, 11, 5, 41 diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 397edba1..6ed84ed8 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -6,7 +6,6 @@ SFX_Cry22_3_Ch5: 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 @@ -15,7 +14,6 @@ SFX_Cry22_3_Ch6: square_note 8, 6, 1, 1456 sound_ret - SFX_Cry22_3_Ch8: noise_note 2, 9, 2, 73 noise_note 7, 11, 5, 41 diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index 5aeafe0f..9f41e5c1 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -7,7 +7,6 @@ SFX_Cry23_1_Ch5: 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 @@ -16,7 +15,6 @@ SFX_Cry23_1_Ch6: square_note 15, 8, 3, 1921 sound_ret - SFX_Cry23_1_Ch8: noise_note 3, 15, 2, 60 noise_note 13, 14, 6, 44 diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 04e4136b..dd863419 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -7,7 +7,6 @@ SFX_Cry23_2_Ch5: 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 @@ -16,7 +15,6 @@ SFX_Cry23_2_Ch6: square_note 15, 8, 3, 1921 sound_ret - SFX_Cry23_2_Ch8: noise_note 3, 15, 2, 60 noise_note 13, 14, 6, 44 diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index 418e69bb..996be40c 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -7,7 +7,6 @@ SFX_Cry23_3_Ch5: 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 @@ -16,7 +15,6 @@ SFX_Cry23_3_Ch6: square_note 15, 8, 3, 1921 sound_ret - SFX_Cry23_3_Ch8: noise_note 3, 15, 2, 60 noise_note 13, 14, 6, 44 diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index 7e992707..91dd0069 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -10,7 +10,6 @@ SFX_Cry24_1_Ch5: 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 @@ -23,7 +22,6 @@ SFX_Cry24_1_Ch6: square_note 8, 7, 1, 1537 sound_ret - SFX_Cry24_1_Ch8: noise_note 15, 14, 4, 60 noise_note 10, 12, 7, 76 diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index d845f6ed..7bcc150b 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -10,7 +10,6 @@ SFX_Cry24_2_Ch5: 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 @@ -23,7 +22,6 @@ SFX_Cry24_2_Ch6: square_note 8, 7, 1, 1537 sound_ret - SFX_Cry24_2_Ch8: noise_note 15, 14, 4, 60 noise_note 10, 12, 7, 76 diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index e8c1f24e..b8cb248c 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -10,7 +10,6 @@ SFX_Cry24_3_Ch5: 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 @@ -23,7 +22,6 @@ SFX_Cry24_3_Ch6: square_note 8, 7, 1, 1537 sound_ret - SFX_Cry24_3_Ch8: noise_note 15, 14, 4, 60 noise_note 10, 12, 7, 76 diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index 64d59389..62087da9 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -7,7 +7,6 @@ SFX_Cry25_1_Ch5: 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 @@ -17,7 +16,6 @@ SFX_Cry25_1_Ch6: square_note 8, 11, 1, 1842 sound_ret - SFX_Cry25_1_Ch8: noise_note 8, 13, 6, 44 noise_note 12, 12, 6, 60 diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index 8ed47006..011af185 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -7,7 +7,6 @@ SFX_Cry25_2_Ch5: 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 @@ -17,7 +16,6 @@ SFX_Cry25_2_Ch6: square_note 8, 11, 1, 1842 sound_ret - SFX_Cry25_2_Ch8: noise_note 8, 13, 6, 44 noise_note 12, 12, 6, 60 diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index f9800dc8..b9fa96ca 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -7,7 +7,6 @@ SFX_Cry25_3_Ch5: 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 @@ -17,7 +16,6 @@ SFX_Cry25_3_Ch6: square_note 8, 11, 1, 1842 sound_ret - SFX_Cry25_3_Ch8: noise_note 8, 13, 6, 44 noise_note 12, 12, 6, 60 diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index 2c132003..9ac692c5 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -8,7 +8,6 @@ SFX_Denied_1_Ch5: square_note 1, 0, 0, 0 sound_ret - SFX_Denied_1_Ch6: duty_cycle 3 square_note 4, 15, 0, 1025 diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index 56a0753f..1db9f0e6 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -8,7 +8,6 @@ SFX_Denied_3_Ch5: square_note 1, 0, 0, 0 sound_ret - SFX_Denied_3_Ch6: duty_cycle 3 square_note 4, 15, 0, 1025 diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 555b3beb..342e5d56 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -7,7 +7,6 @@ SFX_Dex_Page_Added_Ch5: pitch_sweep 0, 8 sound_ret - SFX_Dex_Page_Added_Ch6: duty_cycle 2 square_note 15, 9, 2, 1536 diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 527e027f..02e60ba8 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -3,7 +3,6 @@ SFX_Faint_Thud_Ch5: pitch_sweep 0, 8 sound_ret - SFX_Faint_Thud_Ch8: noise_note 4, 15, 5, 51 noise_note 8, 15, 4, 34 diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm index 09f76c70..c8864343 100644 --- a/audio/sfx/get_item1_1.asm +++ b/audio/sfx/get_item1_1.asm @@ -15,7 +15,6 @@ SFX_Get_Item1_1_Ch5: note E_, 4 sound_ret - SFX_Get_Item1_1_Ch6: execute_music vibrato 8, 2, 7 @@ -29,7 +28,6 @@ SFX_Get_Item1_1_Ch6: note B_, 4 sound_ret - SFX_Get_Item1_1_Ch7: execute_music note_type 4, 1, 0 diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm index dfc1848f..12f17aa8 100644 --- a/audio/sfx/get_item1_3.asm +++ b/audio/sfx/get_item1_3.asm @@ -15,7 +15,6 @@ SFX_Get_Item1_3_Ch5: note E_, 4 sound_ret - SFX_Get_Item1_3_Ch6: execute_music vibrato 8, 2, 7 @@ -29,7 +28,6 @@ SFX_Get_Item1_3_Ch6: note B_, 4 sound_ret - SFX_Get_Item1_3_Ch7: execute_music note_type 4, 1, 0 diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm index 04bbdae2..f225109f 100644 --- a/audio/sfx/get_item2_1.asm +++ b/audio/sfx/get_item2_1.asm @@ -24,7 +24,6 @@ SFX_Get_Item2_1_Ch5: note C_, 8 sound_ret - SFX_Get_Item2_1_Ch6: execute_music vibrato 8, 2, 7 @@ -45,7 +44,6 @@ SFX_Get_Item2_1_Ch6: note A_, 8 sound_ret - SFX_Get_Item2_1_Ch7: execute_music note_type 5, 1, 0 diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm index f05e0728..2f7ed947 100644 --- a/audio/sfx/get_item2_2.asm +++ b/audio/sfx/get_item2_2.asm @@ -24,7 +24,6 @@ SFX_Get_Item2_2_Ch5: note C_, 8 sound_ret - SFX_Get_Item2_2_Ch6: execute_music vibrato 8, 2, 7 @@ -45,7 +44,6 @@ SFX_Get_Item2_2_Ch6: note A_, 8 sound_ret - SFX_Get_Item2_2_Ch7: execute_music note_type 5, 1, 0 diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm index 036d375b..74edbe54 100644 --- a/audio/sfx/get_item2_3.asm +++ b/audio/sfx/get_item2_3.asm @@ -24,7 +24,6 @@ SFX_Get_Item2_3_Ch5: note C_, 8 sound_ret - SFX_Get_Item2_3_Ch6: execute_music vibrato 8, 2, 7 @@ -45,7 +44,6 @@ SFX_Get_Item2_3_Ch6: note A_, 8 sound_ret - SFX_Get_Item2_3_Ch7: execute_music note_type 5, 1, 0 diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm index a19f1143..59e868b4 100644 --- a/audio/sfx/get_key_item_1.asm +++ b/audio/sfx/get_key_item_1.asm @@ -22,7 +22,6 @@ SFX_Get_Key_Item_1_Ch5: note A#, 8 sound_ret - SFX_Get_Key_Item_1_Ch6: execute_music vibrato 4, 2, 3 @@ -46,7 +45,6 @@ SFX_Get_Key_Item_1_Ch6: note D#, 8 sound_ret - SFX_Get_Key_Item_1_Ch7: execute_music note_type 5, 1, 0 diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm index c1063a7f..f06ba09d 100644 --- a/audio/sfx/get_key_item_3.asm +++ b/audio/sfx/get_key_item_3.asm @@ -22,7 +22,6 @@ SFX_Get_Key_Item_3_Ch5: note A#, 8 sound_ret - SFX_Get_Key_Item_3_Ch6: execute_music vibrato 4, 2, 3 @@ -46,7 +45,6 @@ SFX_Get_Key_Item_3_Ch6: note D#, 8 sound_ret - SFX_Get_Key_Item_3_Ch7: execute_music note_type 5, 1, 0 diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm index f1af4978..6ec2a17c 100644 --- a/audio/sfx/level_up.asm +++ b/audio/sfx/level_up.asm @@ -19,7 +19,6 @@ SFX_Level_Up_Ch5: note F_, 8 sound_ret - SFX_Level_Up_Ch6: execute_music vibrato 4, 2, 2 @@ -39,7 +38,6 @@ SFX_Level_Up_Ch6: note A_, 8 sound_ret - SFX_Level_Up_Ch7: execute_music note_type 6, 1, 0 diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm index 0df1138f..4e7d58fa 100644 --- a/audio/sfx/pokedex_rating_1.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -20,7 +20,6 @@ SFX_Pokedex_Rating_1_Ch5: note F_, 4 sound_ret - SFX_Pokedex_Rating_1_Ch6: execute_music duty_cycle 2 @@ -43,7 +42,6 @@ SFX_Pokedex_Rating_1_Ch6: note F_, 4 sound_ret - SFX_Pokedex_Rating_1_Ch7: execute_music note_type 5, 1, 0 diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm index 18dbcda2..a7142a1d 100644 --- a/audio/sfx/pokedex_rating_3.asm +++ b/audio/sfx/pokedex_rating_3.asm @@ -20,7 +20,6 @@ SFX_Pokedex_Rating_3_Ch5: note F_, 4 sound_ret - SFX_Pokedex_Rating_3_Ch6: execute_music duty_cycle 2 @@ -43,7 +42,6 @@ SFX_Pokedex_Rating_3_Ch6: note F_, 4 sound_ret - SFX_Pokedex_Rating_3_Ch7: execute_music note_type 5, 1, 0 diff --git a/audio/sfx/pokeflute_ch5_ch6.asm b/audio/sfx/pokeflute_ch5_ch6.asm index 4f0e96a8..e17eb3cc 100644 --- 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 diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 2b94cf6d..d6bf3b42 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -7,7 +7,6 @@ SFX_Psybeam_Ch5: square_note 10, 15, 1, 1600 sound_ret - SFX_Psybeam_Ch6: duty_cycle_pattern 2, 3, 0, 3 square_note 10, 15, 3, 1393 @@ -17,7 +16,6 @@ SFX_Psybeam_Ch6: square_note 10, 15, 1, 1393 sound_ret - SFX_Psybeam_Ch8: noise_note 2, 13, 1, 74 noise_note 2, 13, 2, 42 diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index ff0ab384..36aefff8 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -10,7 +10,6 @@ SFX_Psychic_M_Ch5: pitch_sweep 0, 8 sound_ret - SFX_Psychic_M_Ch6: duty_cycle 2 square_note 8, 12, 4, 1904 @@ -21,7 +20,6 @@ SFX_Psychic_M_Ch6: square_note 15, 15, 2, 1892 sound_ret - SFX_Psychic_M_Ch8: noise_note 15, 3, -7, 20 noise_note 15, 12, -7, 19 diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index 9dc06f0b..1abb8dfe 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -4,7 +4,6 @@ SFX_Purchase_1_Ch5: square_note 8, 15, 2, 2016 sound_ret - SFX_Purchase_1_Ch6: duty_cycle 2 square_note 1, 0, 8, 0 diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index eaa4bb60..f7f2ccdf 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -4,7 +4,6 @@ SFX_Purchase_3_Ch5: square_note 8, 15, 2, 2016 sound_ret - SFX_Purchase_3_Ch6: duty_cycle 2 square_note 1, 0, 8, 0 diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index d0849ff5..d1e193b2 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -9,7 +9,6 @@ SFX_Save_1_Ch5: square_note 15, 15, 2, 2016 sound_ret - SFX_Save_1_Ch6: duty_cycle 2 square_note 4, 0, 8, 0 diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index 8db092b2..cfd86732 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -15,7 +15,6 @@ ELSE ENDC sound_ret - SFX_Save_3_Ch6: duty_cycle 2 IF DEF(_RED) diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index a8b668b8..2333f5ec 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -5,7 +5,6 @@ SFX_Slots_New_Spin_Ch5: square_note 15, 15, 1, 1984 sound_ret - SFX_Slots_New_Spin_Ch6: duty_cycle 2 square_note 4, 12, 1, 1729 diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index 7f5094f4..118c4314 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -9,7 +9,6 @@ SFX_SS_Anne_Horn_1_Ch5: square_note 15, 15, 2, 1280 sound_ret - SFX_SS_Anne_Horn_1_Ch6: duty_cycle 3 square_note 15, 15, 0, 1154 diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index fda8e346..cf6b4bf5 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -9,7 +9,6 @@ SFX_SS_Anne_Horn_3_Ch5: square_note 15, 15, 2, 1280 sound_ret - SFX_SS_Anne_Horn_3_Ch6: duty_cycle 3 square_note 15, 15, 0, 1154 diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index 98bfff72..3e8c675c 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -3,7 +3,6 @@ SFX_Swap_1_Ch5: square_note 8, 14, 1, 1856 sound_ret - SFX_Swap_1_Ch6: duty_cycle 2 square_note 2, 0, 8, 0 diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 8e86ac7c..2bbf484d 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -3,7 +3,6 @@ SFX_Swap_3_Ch5: square_note 8, 14, 1, 1856 sound_ret - SFX_Swap_3_Ch6: duty_cycle 2 square_note 2, 0, 8, 0 diff --git a/audio/sfx/unused_cry_1.asm b/audio/sfx/unused_cry_1.asm index 342ca2ab..0ff7c79a 100644 --- a/audio/sfx/unused_cry_1.asm +++ b/audio/sfx/unused_cry_1.asm @@ -9,7 +9,6 @@ SFX_UnusedCry_1_Ch5: ; unreferenced 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 @@ -20,7 +19,6 @@ SFX_UnusedCry_1_Ch6: ; unreferenced square_note 8, 3, 1, 1862 sound_ret - SFX_UnusedCry_1_Ch8: ; unreferenced noise_note 2, 15, 2, 76 noise_note 6, 14, 0, 58 diff --git a/audio/sfx/unused_cry_2.asm b/audio/sfx/unused_cry_2.asm index aa6218e1..4924e560 100644 --- a/audio/sfx/unused_cry_2.asm +++ b/audio/sfx/unused_cry_2.asm @@ -9,7 +9,6 @@ SFX_UnusedCry_2_Ch5: ; unreferenced 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 @@ -20,7 +19,6 @@ SFX_UnusedCry_2_Ch6: ; unreferenced square_note 8, 3, 1, 1862 sound_ret - SFX_UnusedCry_2_Ch8: ; unreferenced noise_note 2, 15, 2, 76 noise_note 6, 14, 0, 58 diff --git a/audio/sfx/unused_cry_3.asm b/audio/sfx/unused_cry_3.asm index 95721633..6f3e2737 100644 --- a/audio/sfx/unused_cry_3.asm +++ b/audio/sfx/unused_cry_3.asm @@ -9,7 +9,6 @@ SFX_UnusedCry_3_Ch5: ; unreferenced 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 @@ -20,7 +19,6 @@ SFX_UnusedCry_3_Ch6: ; unreferenced square_note 8, 3, 1, 1862 sound_ret - SFX_UnusedCry_3_Ch8: ; unreferenced noise_note 2, 15, 2, 76 noise_note 6, 14, 0, 58