diff options
Diffstat (limited to 'audio/sfx')
325 files changed, 4806 insertions, 4806 deletions
diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index c904a18a..ef909832 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,11 +1,11 @@ -SFX_59_1_Ch4: - duty 2 - squarenote 4, 15, 1, 1920 - endchannel +SFX_59_1_Ch5: + duty_cycle 2 + square_note 4, 15, 1, 1920 + sound_ret -SFX_59_1_Ch5: - duty 2 - squarenote 1, 0, 8, 0 - squarenote 4, 10, 1, 1889 - endchannel +SFX_59_1_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 10, 1, 1889 + sound_ret diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 7331f973..7510842f 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -1,11 +1,11 @@ -SFX_59_3_Ch4: - duty 2 - squarenote 4, 15, 1, 1920 - endchannel +SFX_59_3_Ch5: + duty_cycle 2 + square_note 4, 15, 1, 1920 + sound_ret -SFX_59_3_Ch5: - duty 2 - squarenote 1, 0, 8, 0 - squarenote 4, 10, 1, 1889 - endchannel +SFX_59_3_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 10, 1, 1889 + sound_ret diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index 0d45f451..0ab4cbe2 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,6 +1,6 @@ -SFX_Arrow_Tiles_1_Ch4: - duty 0 - pitchenvelope 1, 7 - squarenote 15, 13, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Arrow_Tiles_1_Ch5: + duty_cycle 0 + pitch_sweep 1, 7 + square_note 15, 13, 2, 1792 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index 2ee03ec0..787e431d 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,6 +1,6 @@ -SFX_Arrow_Tiles_3_Ch4: - duty 0 - pitchenvelope 1, 7 - squarenote 15, 13, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Arrow_Tiles_3_Ch5: + duty_cycle 0 + pitch_sweep 1, 7 + square_note 15, 13, 2, 1792 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index c3fefdd2..9503c570 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,11 +1,11 @@ -SFX_Ball_Poof_Ch4: - duty 2 - pitchenvelope 1, 6 - squarenote 15, 15, 2, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Ball_Poof_Ch5: + duty_cycle 2 + pitch_sweep 1, 6 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 0 + sound_ret -SFX_Ball_Poof_Ch7: - noisenote 15, 10, 2, 34 - endchannel +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 e4518dfc..207bf720 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ -SFX_Ball_Toss_Ch4: - duty 2 - pitchenvelope 2, -7 - squarenote 15, 15, 2, 1920 - endchannel +SFX_Ball_Toss_Ch5: + duty_cycle 2 + pitch_sweep 2, -7 + square_note 15, 15, 2, 1920 + sound_ret -SFX_Ball_Toss_Ch5: - duty 2 - squarenote 15, 12, 2, 1922 - endchannel +SFX_Ball_Toss_Ch6: + duty_cycle 2 + square_note 15, 12, 2, 1922 + sound_ret diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 2ab97942..ef3cf017 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,6 +1,6 @@ -SFX_Battle_09_Ch4: - duty 1 - pitchenvelope 9, 7 - squarenote 15, 15, 2, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Battle_09_Ch5: + duty_cycle 1 + pitch_sweep 9, 7 + square_note 15, 15, 2, 1280 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index 06e2fa14..e60fe9c7 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ -SFX_Battle_0B_Ch7: - noisenote 8, 15, 1, 84 - endchannel +SFX_Battle_0B_Ch8: + noise_note 8, 15, 1, 84 + sound_ret diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index 67e910eb..285e0d52 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,5 +1,5 @@ -SFX_Battle_0C_Ch7: - noisenote 15, 8, -7, 17 - noisenote 4, 15, -7, 18 - noisenote 10, 15, 1, 85 - endchannel +SFX_Battle_0C_Ch8: + noise_note 15, 8, -7, 17 + noise_note 4, 15, -7, 18 + noise_note 10, 15, 1, 85 + sound_ret diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index 231d324f..293d9743 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,5 +1,5 @@ -SFX_Battle_0D_Ch7: - noisenote 15, 8, -7, 52 - noisenote 8, 15, 2, 53 - noisenote 10, 15, 1, 85 - endchannel +SFX_Battle_0D_Ch8: + noise_note 15, 8, -7, 52 + noise_note 8, 15, 2, 53 + noise_note 10, 15, 1, 85 + sound_ret diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index eb67a126..39d971c9 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ -SFX_Battle_0E_Ch7: - noisenote 15, 9, -7, 35 - noisenote 8, 15, 1, 33 - endchannel +SFX_Battle_0E_Ch8: + noise_note 15, 9, -7, 35 + noise_note 8, 15, 1, 33 + sound_ret diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index 26386131..ae81e747 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,6 +1,6 @@ -SFX_Battle_0F_Ch7: - noisenote 2, 14, 1, 75 - noisenote 10, 15, 1, 68 - noisenote 2, 14, 1, 58 - noisenote 6, 15, 1, 52 - endchannel +SFX_Battle_0F_Ch8: + noise_note 2, 14, 1, 75 + noise_note 10, 15, 1, 68 + noise_note 2, 14, 1, 58 + noise_note 6, 15, 1, 52 + sound_ret diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 86d5a815..7a092bd3 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,6 +1,6 @@ -SFX_Battle_12_Ch7: - noisenote 8, 4, -7, 35 - noisenote 4, 12, 4, 34 - noisenote 6, 15, 2, 35 - loopchannel 4, SFX_Battle_12_Ch7 - endchannel +SFX_Battle_12_Ch8: + noise_note 8, 4, -7, 35 + noise_note 4, 12, 4, 34 + noise_note 6, 15, 2, 35 + sound_loop 4, SFX_Battle_12_Ch8 + sound_ret diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 882be8c7..0f910cec 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,6 +1,6 @@ -SFX_Battle_13_Ch7: - noisenote 8, 4, -7, 51 - noisenote 4, 12, 4, 34 - noisenote 6, 15, 2, 35 - noisenote 15, 15, 2, 34 - endchannel +SFX_Battle_13_Ch8: + noise_note 8, 4, -7, 51 + noise_note 4, 12, 4, 34 + noise_note 6, 15, 2, 35 + noise_note 15, 15, 2, 34 + sound_ret diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index 97a88b95..7c3a7c68 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,6 +1,6 @@ -SFX_Battle_14_Ch7: - noisenote 8, 15, -7, 50 - noisenote 8, 15, 4, 67 - noisenote 8, 15, 2, 84 - noisenote 8, 15, 1, 101 - endchannel +SFX_Battle_14_Ch8: + noise_note 8, 15, -7, 50 + noise_note 8, 15, 4, 67 + noise_note 8, 15, 2, 84 + noise_note 8, 15, 1, 101 + sound_ret diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index daa614cd..6e162cce 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,5 +1,5 @@ -SFX_Battle_16_Ch7: - noisenote 1, 9, 4, 35 - noisenote 1, 11, 4, 34 - noisenote 8, 15, 1, 68 - endchannel +SFX_Battle_16_Ch8: + noise_note 1, 9, 4, 35 + noise_note 1, 11, 4, 34 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index b6cc787e..f863f8ee 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,6 +1,6 @@ -SFX_Battle_17_Ch7: - noisenote 2, 9, 4, 51 - noisenote 4, 11, 4, 34 - noisenote 4, 15, 1, 68 - noisenote 8, 15, 1, 85 - endchannel +SFX_Battle_17_Ch8: + noise_note 2, 9, 4, 51 + noise_note 4, 11, 4, 34 + noise_note 4, 15, 1, 68 + noise_note 8, 15, 1, 85 + sound_ret diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index ced87cd8..f8ece58e 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ -SFX_Battle_18_Ch7: - noisenote 4, 15, -7, 85 - noisenote 8, 15, 1, 101 - endchannel +SFX_Battle_18_Ch8: + noise_note 4, 15, -7, 85 + noise_note 8, 15, 1, 101 + sound_ret diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 53de4341..a7cf5292 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,5 +1,5 @@ -SFX_Battle_19_Ch7: - noisenote 2, 8, 4, 67 - noisenote 2, 12, 4, 34 - noisenote 8, 15, 2, 52 - endchannel +SFX_Battle_19_Ch8: + noise_note 2, 8, 4, 67 + noise_note 2, 12, 4, 34 + noise_note 8, 15, 2, 52 + sound_ret diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index 06c2b6f1..16ea584d 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ -SFX_Battle_1B_Ch7: - noisenote 2, 15, 1, 34 - noisenote 15, 15, 2, 18 - endchannel +SFX_Battle_1B_Ch8: + noise_note 2, 15, 1, 34 + noise_note 15, 15, 2, 18 + sound_ret diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index 7518acd9..3045576b 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,5 +1,5 @@ -SFX_Battle_1C_Ch7: - noisenote 2, 12, 2, 1 - noisenote 15, 15, 4, 1 - noisenote 15, 15, 2, 1 - endchannel +SFX_Battle_1C_Ch8: + noise_note 2, 12, 2, 1 + noise_note 15, 15, 4, 1 + noise_note 15, 15, 2, 1 + sound_ret diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index e924414a..ff4b0cbc 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,16 +1,16 @@ -SFX_Battle_1E_Ch4: - duty 0 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 512 - pitchenvelope 2, 2 - squarenote 8, 14, 2, 512 - pitchenvelope 0, 0 - endchannel +SFX_Battle_1E_Ch5: + duty_cycle 0 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 0 + sound_ret -SFX_Battle_1E_Ch7: - noisenote 0, 13, 1, 66 - noisenote 4, 10, 1, 50 - noisenote 0, 13, 1, 34 - noisenote 6, 10, 1, 50 - endchannel +SFX_Battle_1E_Ch8: + noise_note 0, 13, 1, 66 + noise_note 4, 10, 1, 50 + noise_note 0, 13, 1, 34 + noise_note 6, 10, 1, 50 + sound_ret diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index 4e5687d8..b73b0a8f 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ -SFX_Battle_20_Ch7: - noisenote 12, 15, 1, 84 - noisenote 8, 15, 1, 100 - endchannel +SFX_Battle_20_Ch8: + noise_note 12, 15, 1, 84 + noise_note 8, 15, 1, 100 + sound_ret diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index 616b0c42..fc1b1186 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,7 +1,7 @@ -SFX_Battle_21_Ch7: - noisenote 2, 15, 1, 51 - noisenote 2, 12, 1, 50 - noisenote 2, 10, 1, 49 - noisenote 15, 8, 2, 50 - noisenote 8, 15, 1, 52 - endchannel +SFX_Battle_21_Ch8: + noise_note 2, 15, 1, 51 + noise_note 2, 12, 1, 50 + noise_note 2, 10, 1, 49 + noise_note 15, 8, 2, 50 + noise_note 8, 15, 1, 52 + sound_ret diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index e19417e0..3c42996e 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ -SFX_Battle_22_Ch7: - noisenote 2, 13, 2, 50 - noisenote 15, 15, 2, 67 - endchannel +SFX_Battle_22_Ch8: + noise_note 2, 13, 2, 50 + noise_note 15, 15, 2, 67 + sound_ret diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index febce65a..bf546248 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,7 +1,7 @@ -SFX_Battle_23_Ch7: - noisenote 2, 15, 2, 67 - noisenote 4, 11, 5, 50 - noisenote 9, 8, 6, 49 - noisenote 7, 6, 4, 0 - noisenote 15, 15, 2, 85 - endchannel +SFX_Battle_23_Ch8: + noise_note 2, 15, 2, 67 + noise_note 4, 11, 5, 50 + noise_note 9, 8, 6, 49 + noise_note 7, 6, 4, 0 + noise_note 15, 15, 2, 85 + sound_ret diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 5a9ab9ca..5b6c8e56 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,12 +1,12 @@ -SFX_Battle_24_Ch4: - duty 1 - pitchenvelope 9, 7 - squarenote 15, 15, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Battle_24_Ch5: + duty_cycle 1 + pitch_sweep 9, 7 + square_note 15, 15, 2, 1792 + pitch_sweep 0, 0 + sound_ret -SFX_Battle_24_Ch7: - noisenote 15, 3, -7, 34 - noisenote 15, 15, 2, 33 - endchannel +SFX_Battle_24_Ch8: + noise_note 15, 3, -7, 34 + noise_note 15, 15, 2, 33 + sound_ret diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index 1d50b391..54623b5f 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,7 +1,7 @@ -SFX_Battle_25_Ch7: - noisenote 15, 4, -7, 65 - noisenote 8, 8, -7, 65 - noisenote 8, 12, -7, 65 - noisenote 8, 15, 2, 66 - noisenote 15, 15, 2, 65 - endchannel +SFX_Battle_25_Ch8: + noise_note 15, 4, -7, 65 + noise_note 8, 8, -7, 65 + noise_note 8, 12, -7, 65 + noise_note 8, 15, 2, 66 + noise_note 15, 15, 2, 65 + sound_ret diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index 0c0e21ae..f3baea99 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,9 +1,9 @@ -SFX_Battle_26_Ch7: - noisenote 10, 15, -7, 80 - noisenote 15, 15, -7, 81 - noisenote 8, 15, 2, 81 - noisenote 6, 15, -7, 82 - noisenote 6, 15, -7, 83 - noisenote 8, 15, -7, 84 - noisenote 15, 15, 2, 84 - endchannel +SFX_Battle_26_Ch8: + noise_note 10, 15, -7, 80 + noise_note 15, 15, -7, 81 + noise_note 8, 15, 2, 81 + noise_note 6, 15, -7, 82 + noise_note 6, 15, -7, 83 + noise_note 8, 15, -7, 84 + noise_note 15, 15, 2, 84 + sound_ret diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index 4e02cfe9..19ce5bf7 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,27 +1,27 @@ -SFX_Battle_27_Ch4: - duty 2 - squarenote 15, 3, -7, 1984 +SFX_Battle_27_Ch5: + duty_cycle 2 + square_note 15, 3, -7, 1984 SFX_Battle_27_branch_2062a: - squarenote 15, 13, -7, 1984 - loopchannel 4, SFX_Battle_27_branch_2062a - squarenote 15, 13, 1, 1984 - endchannel + square_note 15, 13, -7, 1984 + sound_loop 4, SFX_Battle_27_branch_2062a + square_note 15, 13, 1, 1984 + sound_ret -SFX_Battle_27_Ch5: - dutycycle 179 - squarenote 15, 2, -7, 1992 +SFX_Battle_27_Ch6: + duty_cycle_pattern 179 + square_note 15, 2, -7, 1992 SFX_Battle_27_branch_2063d: - squarenote 15, 12, -7, 1991 - loopchannel 4, SFX_Battle_27_branch_2063d - squarenote 15, 12, 1, 1992 - endchannel + square_note 15, 12, -7, 1991 + sound_loop 4, SFX_Battle_27_branch_2063d + square_note 15, 12, 1, 1992 + sound_ret -SFX_Battle_27_Ch7: - noisenote 3, 9, 7, 18 - noisenote 3, 10, 1, 17 - loopchannel 10, SFX_Battle_27_Ch7 - endchannel +SFX_Battle_27_Ch8: + noise_note 3, 9, 7, 18 + noise_note 3, 10, 1, 17 + sound_loop 10, SFX_Battle_27_Ch8 + sound_ret diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index c2f0c511..38646a09 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,21 +1,21 @@ -SFX_Battle_28_Ch4: - duty 0 - squarenote 0, 15, 1, 1984 - squarenote 0, 15, 1, 1792 - loopchannel 12, SFX_Battle_28_Ch4 - endchannel +SFX_Battle_28_Ch5: + duty_cycle 0 + square_note 0, 15, 1, 1984 + square_note 0, 15, 1, 1792 + sound_loop 12, SFX_Battle_28_Ch5 + sound_ret -SFX_Battle_28_Ch5: - dutycycle 179 - squarenote 0, 14, 1, 1985 - squarenote 0, 14, 1, 1793 - loopchannel 12, SFX_Battle_28_Ch5 - endchannel +SFX_Battle_28_Ch6: + duty_cycle_pattern 179 + square_note 0, 14, 1, 1985 + square_note 0, 14, 1, 1793 + sound_loop 12, SFX_Battle_28_Ch6 + sound_ret -SFX_Battle_28_Ch7: - noisenote 1, 13, 1, 73 - noisenote 1, 13, 1, 41 - loopchannel 6, SFX_Battle_28_Ch7 - endchannel +SFX_Battle_28_Ch8: + noise_note 1, 13, 1, 73 + noise_note 1, 13, 1, 41 + sound_loop 6, SFX_Battle_28_Ch8 + sound_ret diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index 534826fe..f0d27ca7 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,18 +1,18 @@ -SFX_Battle_29_Ch4: - dutycycle 201 - squarenote 11, 15, 3, 288 - squarenote 9, 13, 3, 336 - loopchannel 5, SFX_Battle_29_Ch4 - squarenote 8, 14, 3, 304 - squarenote 15, 12, 2, 272 - endchannel +SFX_Battle_29_Ch5: + duty_cycle_pattern 201 + square_note 11, 15, 3, 288 + square_note 9, 13, 3, 336 + sound_loop 5, SFX_Battle_29_Ch5 + square_note 8, 14, 3, 304 + square_note 15, 12, 2, 272 + sound_ret -SFX_Battle_29_Ch7: - noisenote 10, 15, 3, 53 - noisenote 14, 15, 6, 69 - loopchannel 4, SFX_Battle_29_Ch7 - noisenote 12, 15, 4, 188 - noisenote 12, 15, 5, 156 - noisenote 15, 15, 4, 172 - endchannel +SFX_Battle_29_Ch8: + noise_note 10, 15, 3, 53 + noise_note 14, 15, 6, 69 + sound_loop 4, SFX_Battle_29_Ch8 + noise_note 12, 15, 4, 188 + noise_note 12, 15, 5, 156 + noise_note 15, 15, 4, 172 + sound_ret diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index f4986805..ea4196a8 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,28 +1,28 @@ -SFX_Battle_2A_Ch4: - dutycycle 57 - squarenote 4, 15, 4, 1536 - squarenote 3, 12, 4, 1280 - squarenote 5, 11, 5, 1536 - squarenote 13, 14, 2, 1728 - loopchannel 3, SFX_Battle_2A_Ch4 - squarenote 8, 13, 1, 1536 - endchannel +SFX_Battle_2A_Ch5: + duty_cycle_pattern 57 + square_note 4, 15, 4, 1536 + square_note 3, 12, 4, 1280 + square_note 5, 11, 5, 1536 + square_note 13, 14, 2, 1728 + sound_loop 3, SFX_Battle_2A_Ch5 + square_note 8, 13, 1, 1536 + sound_ret -SFX_Battle_2A_Ch5: - dutycycle 141 - squarenote 5, 14, 4, 1504 - squarenote 4, 11, 4, 1248 - squarenote 6, 10, 5, 1512 - squarenote 14, 13, 1, 1696 - loopchannel 3, SFX_Battle_2A_Ch5 - endchannel +SFX_Battle_2A_Ch6: + duty_cycle_pattern 141 + square_note 5, 14, 4, 1504 + square_note 4, 11, 4, 1248 + square_note 6, 10, 5, 1512 + square_note 14, 13, 1, 1696 + sound_loop 3, SFX_Battle_2A_Ch6 + sound_ret -SFX_Battle_2A_Ch7: - noisenote 5, 12, 3, 51 - noisenote 3, 9, 2, 67 - noisenote 10, 11, 5, 51 - noisenote 15, 12, 3, 50 - loopchannel 2, SFX_Battle_2A_Ch7 - endchannel +SFX_Battle_2A_Ch8: + noise_note 5, 12, 3, 51 + noise_note 3, 9, 2, 67 + noise_note 10, 11, 5, 51 + noise_note 15, 12, 3, 50 + sound_loop 2, SFX_Battle_2A_Ch8 + sound_ret diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index 418ab5cb..b9b20d1d 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,21 +1,21 @@ -SFX_Battle_2B_Ch4: - dutycycle 210 - squarenote 3, 8, 1, 768 - squarenote 3, 12, 1, 1024 - squarenote 3, 15, 1, 1280 - squarenote 3, 11, 1, 1024 - squarenote 3, 7, 1, 768 - loopchannel 5, SFX_Battle_2B_Ch4 - squarenote 8, 8, 1, 1024 - endchannel +SFX_Battle_2B_Ch5: + duty_cycle_pattern 210 + square_note 3, 8, 1, 768 + square_note 3, 12, 1, 1024 + square_note 3, 15, 1, 1280 + square_note 3, 11, 1, 1024 + square_note 3, 7, 1, 768 + sound_loop 5, SFX_Battle_2B_Ch5 + square_note 8, 8, 1, 1024 + sound_ret -SFX_Battle_2B_Ch7: - noisenote 3, 6, 2, 34 - noisenote 3, 10, 2, 50 - noisenote 3, 13, 2, 51 - noisenote 3, 9, 2, 35 - noisenote 3, 5, 2, 18 - loopchannel 5, SFX_Battle_2B_Ch7 - noisenote 8, 8, 1, 18 - endchannel +SFX_Battle_2B_Ch8: + noise_note 3, 6, 2, 34 + noise_note 3, 10, 2, 50 + noise_note 3, 13, 2, 51 + noise_note 3, 9, 2, 35 + noise_note 3, 5, 2, 18 + sound_loop 5, SFX_Battle_2B_Ch8 + noise_note 8, 8, 1, 18 + sound_ret diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index aedb91bd..c6d47413 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,25 +1,25 @@ -SFX_Battle_2C_Ch4: - dutycycle 57 - squarenote 15, 15, 4, 1280 - squarenote 15, 12, 4, 1024 - squarenote 15, 14, 2, 1472 - loopchannel 3, SFX_Battle_2C_Ch4 - endchannel +SFX_Battle_2C_Ch5: + duty_cycle_pattern 57 + square_note 15, 15, 4, 1280 + square_note 15, 12, 4, 1024 + square_note 15, 14, 2, 1472 + sound_loop 3, SFX_Battle_2C_Ch5 + sound_ret -SFX_Battle_2C_Ch5: - dutycycle 141 - squarenote 7, 14, 4, 1072 - squarenote 15, 11, 4, 816 - squarenote 15, 10, 2, 1080 - loopchannel 4, SFX_Battle_2C_Ch5 - endchannel +SFX_Battle_2C_Ch6: + duty_cycle_pattern 141 + square_note 7, 14, 4, 1072 + square_note 15, 11, 4, 816 + square_note 15, 10, 2, 1080 + sound_loop 4, SFX_Battle_2C_Ch6 + sound_ret -SFX_Battle_2C_Ch7: - noisenote 9, 15, 4, 68 - noisenote 9, 15, 2, 67 - noisenote 15, 15, 4, 66 - noisenote 15, 15, 4, 65 - loopchannel 3, SFX_Battle_2C_Ch7 - endchannel +SFX_Battle_2C_Ch8: + noise_note 9, 15, 4, 68 + noise_note 9, 15, 2, 67 + noise_note 15, 15, 4, 66 + noise_note 15, 15, 4, 65 + sound_loop 3, SFX_Battle_2C_Ch8 + sound_ret diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index ca1afc42..c509b8d5 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,27 +1,27 @@ -SFX_Battle_2E_Ch4: - duty 0 - squarenote 2, 15, 1, 512 - squarenote 3, 15, 1, 1792 - squarenote 4, 15, 1, 1280 - squarenote 5, 15, 1, 2032 - loopchannel 8, SFX_Battle_2E_Ch4 - endchannel +SFX_Battle_2E_Ch5: + duty_cycle 0 + square_note 2, 15, 1, 512 + square_note 3, 15, 1, 1792 + square_note 4, 15, 1, 1280 + square_note 5, 15, 1, 2032 + sound_loop 8, SFX_Battle_2E_Ch5 + sound_ret -SFX_Battle_2E_Ch5: - dutycycle 179 - squarenote 2, 14, 1, 770 - squarenote 3, 14, 1, 2034 - squarenote 4, 14, 1, 1538 - squarenote 5, 14, 1, 1794 - loopchannel 8, SFX_Battle_2E_Ch5 - endchannel +SFX_Battle_2E_Ch6: + duty_cycle_pattern 179 + square_note 2, 14, 1, 770 + square_note 3, 14, 1, 2034 + square_note 4, 14, 1, 1538 + square_note 5, 14, 1, 1794 + sound_loop 8, SFX_Battle_2E_Ch6 + sound_ret -SFX_Battle_2E_Ch7: - noisenote 2, 13, 3, 16 - noisenote 3, 13, 3, 17 - noisenote 2, 13, 2, 16 - noisenote 5, 13, 2, 18 - loopchannel 9, SFX_Battle_2E_Ch7 - endchannel +SFX_Battle_2E_Ch8: + noise_note 2, 13, 3, 16 + noise_note 3, 13, 3, 17 + noise_note 2, 13, 2, 16 + noise_note 5, 13, 2, 18 + sound_loop 9, SFX_Battle_2E_Ch8 + sound_ret diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index d8c2bd91..a3138abb 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,21 +1,21 @@ -SFX_Battle_2F_Ch4: - dutycycle 43 - squarenote 3, 15, 1, 2032 - squarenote 4, 15, 2, 512 - loopchannel 8, SFX_Battle_2F_Ch4 - endchannel +SFX_Battle_2F_Ch5: + duty_cycle_pattern 43 + square_note 3, 15, 1, 2032 + square_note 4, 15, 2, 512 + sound_loop 8, SFX_Battle_2F_Ch5 + sound_ret -SFX_Battle_2F_Ch5: - dutycycle 179 - squarenote 4, 14, 2, 514 - squarenote 4, 14, 1, 2018 - loopchannel 9, SFX_Battle_2F_Ch5 - endchannel +SFX_Battle_2F_Ch6: + duty_cycle_pattern 179 + square_note 4, 14, 2, 514 + square_note 4, 14, 1, 2018 + sound_loop 9, SFX_Battle_2F_Ch6 + sound_ret -SFX_Battle_2F_Ch7: - noisenote 4, 15, -7, 67 - noisenote 4, 15, 2, 68 - loopchannel 9, SFX_Battle_2F_Ch7 - endchannel +SFX_Battle_2F_Ch8: + noise_note 4, 15, -7, 67 + noise_note 4, 15, 2, 68 + sound_loop 9, SFX_Battle_2F_Ch8 + sound_ret diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index ee1cc671..83dc96f4 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,18 +1,18 @@ -SFX_Battle_31_Ch4: - duty 2 - squarenote 15, 15, -7, 2016 - squarenote 15, 15, -7, 2016 - squarenote 15, 15, -7, 2016 - squarenote 15, 15, -7, 2016 - squarenote 15, 15, 2, 2016 - endchannel +SFX_Battle_31_Ch5: + duty_cycle 2 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, 2, 2016 + sound_ret -SFX_Battle_31_Ch5: - duty 3 - squarenote 15, 15, -7, 2018 - squarenote 15, 15, -7, 2017 - squarenote 15, 15, -7, 2018 - squarenote 15, 15, -7, 2017 - squarenote 15, 15, 2, 2018 - endchannel +SFX_Battle_31_Ch6: + duty_cycle 3 + square_note 15, 15, -7, 2018 + square_note 15, 15, -7, 2017 + square_note 15, 15, -7, 2018 + square_note 15, 15, -7, 2017 + square_note 15, 15, 2, 2018 + sound_ret diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index 92ea4661..53dfac32 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,12 +1,12 @@ -SFX_Battle_32_Ch4: - duty 2 - pitchenvelope 10, -7 - squarenote 8, 15, 1, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Battle_32_Ch5: + duty_cycle 2 + pitch_sweep 10, -7 + square_note 8, 15, 1, 1792 + pitch_sweep 0, 0 + sound_ret -SFX_Battle_32_Ch5: - duty 3 - squarenote 8, 15, 1, 1793 - endchannel +SFX_Battle_32_Ch6: + duty_cycle 3 + square_note 8, 15, 1, 1793 + sound_ret diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index 5eee7b32..95afe045 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,18 +1,18 @@ -SFX_Battle_33_Ch4: - duty 2 - squarenote 6, 15, 1, 1280 - squarenote 6, 15, 1, 1408 - squarenote 6, 15, 1, 1536 - squarenote 6, 15, 1, 1664 - squarenote 8, 15, 1, 1792 - endchannel +SFX_Battle_33_Ch5: + duty_cycle 2 + square_note 6, 15, 1, 1280 + square_note 6, 15, 1, 1408 + square_note 6, 15, 1, 1536 + square_note 6, 15, 1, 1664 + square_note 8, 15, 1, 1792 + sound_ret -SFX_Battle_33_Ch5: - duty 3 - squarenote 6, 14, 1, 1296 - squarenote 6, 14, 1, 1424 - squarenote 6, 14, 1, 1552 - squarenote 6, 14, 1, 1680 - squarenote 8, 14, 1, 1808 - endchannel +SFX_Battle_33_Ch6: + duty_cycle 3 + square_note 6, 14, 1, 1296 + square_note 6, 14, 1, 1424 + square_note 6, 14, 1, 1552 + square_note 6, 14, 1, 1680 + square_note 8, 14, 1, 1808 + sound_ret diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index af9d5b65..4abbdbc3 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,22 +1,22 @@ -SFX_Battle_34_Ch4: - dutycycle 237 - squarenote 8, 15, -7, 1016 - squarenote 15, 15, -7, 1024 - squarenote 15, 15, 3, 1024 - endchannel +SFX_Battle_34_Ch5: + duty_cycle_pattern 237 + square_note 8, 15, -7, 1016 + square_note 15, 15, -7, 1024 + square_note 15, 15, 3, 1024 + sound_ret -SFX_Battle_34_Ch5: - dutycycle 180 - squarenote 8, 14, -7, 960 - squarenote 15, 14, -7, 960 - squarenote 15, 14, 3, 960 - endchannel +SFX_Battle_34_Ch6: + duty_cycle_pattern 180 + square_note 8, 14, -7, 960 + square_note 15, 14, -7, 960 + square_note 15, 14, 3, 960 + sound_ret -SFX_Battle_34_Ch7: - noisenote 4, 15, -7, 81 - noisenote 8, 15, -7, 84 - noisenote 15, 15, -7, 85 - noisenote 15, 15, 3, 86 - endchannel +SFX_Battle_34_Ch8: + noise_note 4, 15, -7, 81 + noise_note 8, 15, -7, 84 + noise_note 15, 15, -7, 85 + noise_note 15, 15, 3, 86 + sound_ret diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm index 7ce3afb4..e9f78657 100644 --- a/audio/sfx/battle_35.asm +++ b/audio/sfx/battle_35.asm @@ -1,29 +1,29 @@ -SFX_Battle_35_Ch4: - executemusic +SFX_Battle_35_Ch5: + execute_music vibrato 10, 2, 4 - duty 2 - notetype 10, 8, 7 + duty_cycle 2 + note_type 10, 8, 7 octave 5 - G# 8 + note G#, 8 octave 6 - F# 4 - E_ 4 + note F#, 4 + note E_, 4 octave 5 - G# 8 - endchannel + note G#, 8 + sound_ret -SFX_Battle_35_Ch5: - executemusic +SFX_Battle_35_Ch6: + execute_music vibrato 10, 2, 3 - duty 2 - notetype 11, 6, 7 + duty_cycle 2 + note_type 11, 6, 7 octave 5 - G# 8 - notetype 10, 6, 7 + note G#, 8 + note_type 10, 6, 7 octave 6 - F# 4 - E_ 4 + note F#, 4 + note E_, 4 octave 5 - G# 8 - endchannel + note G#, 8 + sound_ret diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index 9d00fad9..2fd40bd3 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,47 +1,47 @@ -SFX_Battle_36_Ch4: - duty 0 - squarenote 2, 15, 1, 1920 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1936 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1952 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1968 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 1984 - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 2000 +SFX_Battle_36_Ch5: + duty_cycle 0 + square_note 2, 15, 1, 1920 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1936 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1952 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1968 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1984 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2000 SFX_Battle_36_branch_20930: - squarenote 2, 15, 1, 1792 - squarenote 2, 15, 1, 2016 - loopchannel 12, SFX_Battle_36_branch_20930 - squarenote 15, 15, 1, 1792 - endchannel + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2016 + sound_loop 12, SFX_Battle_36_branch_20930 + square_note 15, 15, 1, 1792 + sound_ret -SFX_Battle_36_Ch5: - dutycycle 179 - squarenote 2, 15, 1, 1921 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1937 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1953 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1969 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 1985 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 2001 - squarenote 2, 15, 1, 1793 - squarenote 2, 15, 1, 2017 - loopchannel 12, SFX_Battle_36_branch_20930 - squarenote 15, 15, 1, 1793 - endchannel +SFX_Battle_36_Ch6: + duty_cycle_pattern 179 + square_note 2, 15, 1, 1921 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1937 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1953 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1969 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1985 + square_note 2, 15, 1, 1793 + 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 + square_note 15, 15, 1, 1793 + sound_ret -SFX_Battle_36_Ch7: - noisenote 1, 13, 1, 73 - noisenote 1, 13, 1, 41 - loopchannel 26, SFX_Battle_36_Ch7 - endchannel +SFX_Battle_36_Ch8: + noise_note 1, 13, 1, 73 + noise_note 1, 13, 1, 41 + sound_loop 26, SFX_Battle_36_Ch8 + sound_ret diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm index b844a54a..3fe278f3 100644 --- a/audio/sfx/caught_mon.asm +++ b/audio/sfx/caught_mon.asm @@ -1,61 +1,61 @@ -SFX_Caught_Mon_Ch4: - executemusic +SFX_Caught_Mon_Ch5: + execute_music tempo 256 volume 7, 7 - duty 3 - toggleperfectpitch - notetype 6, 11, 2 + duty_cycle 3 + toggle_perfect_pitch + note_type 6, 11, 2 octave 3 - E_ 2 - F# 2 - G# 2 - G# 1 - G# 1 - B_ 2 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 1 + note G#, 1 + note B_, 2 octave 4 - C# 2 - D# 2 - D# 1 - D# 1 - notetype 6, 11, 5 - E_ 8 - endchannel + note C#, 2 + note D#, 2 + note D#, 1 + note D#, 1 + note_type 6, 11, 5 + note E_, 8 + sound_ret -SFX_Caught_Mon_Ch5: - executemusic - duty 2 - notetype 6, 12, 2 +SFX_Caught_Mon_Ch6: + execute_music + duty_cycle 2 + note_type 6, 12, 2 octave 4 - G# 2 - G# 1 - G# 1 - E_ 2 - E_ 1 - E_ 1 - B_ 2 - B_ 1 - B_ 1 - A_ 2 - A_ 1 - A_ 1 - notetype 6, 12, 5 - G# 8 - endchannel + note G#, 2 + note G#, 1 + note G#, 1 + note E_, 2 + note E_, 1 + note E_, 1 + note B_, 2 + note B_, 1 + note B_, 1 + note A_, 2 + note A_, 1 + note A_, 1 + note_type 6, 12, 5 + note G#, 8 + sound_ret -SFX_Caught_Mon_Ch6: - executemusic - notetype 6, 1, 0 +SFX_Caught_Mon_Ch7: + execute_music + note_type 6, 1, 0 octave 4 - B_ 2 + note B_, 2 rest 2 octave 5 - C# 2 + note C#, 2 rest 2 - D# 2 + note D#, 2 rest 2 - F# 2 - G_ 2 - G# 4 - endchannel + note F#, 2 + note G_, 2 + note G#, 4 + sound_ret diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index a58adb8a..a6303265 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,6 +1,6 @@ -SFX_Collision_1_Ch4: - duty 2 - pitchenvelope 5, -2 - squarenote 15, 15, 1, 768 - pitchenvelope 0, 0 - endchannel +SFX_Collision_1_Ch5: + duty_cycle 2 + pitch_sweep 5, -2 + square_note 15, 15, 1, 768 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 60e8cde3..ae68314a 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,6 +1,6 @@ -SFX_Collision_3_Ch4: - duty 2 - pitchenvelope 5, -2 - squarenote 15, 15, 1, 768 - pitchenvelope 0, 0 - endchannel +SFX_Collision_3_Ch5: + duty_cycle 2 + pitch_sweep 5, -2 + square_note 15, 15, 1, 768 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index c0c128c0..087ea06f 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,21 +1,21 @@ -SFX_Cry00_1_Ch4: - dutycycle 245 - squarenote 4, 15, 3, 1816 - squarenote 15, 14, 5, 1944 - squarenote 8, 9, 1, 1880 - endchannel +SFX_Cry00_1_Ch5: + duty_cycle_pattern 245 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret -SFX_Cry00_1_Ch5: - dutycycle 160 - squarenote 5, 11, 3, 1800 - squarenote 15, 12, 5, 1928 - squarenote 8, 7, 1, 1864 - endchannel +SFX_Cry00_1_Ch6: + duty_cycle_pattern 160 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret -SFX_Cry00_1_Ch7: - noisenote 3, 10, 1, 28 - noisenote 14, 9, 4, 44 - noisenote 8, 8, 1, 28 - endchannel +SFX_Cry00_1_Ch8: + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index f9f104c0..0469948a 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,21 +1,21 @@ -SFX_Cry00_2_Ch4: - dutycycle 245 - squarenote 4, 15, 3, 1816 - squarenote 15, 14, 5, 1944 - squarenote 8, 9, 1, 1880 - endchannel +SFX_Cry00_2_Ch5: + duty_cycle_pattern 245 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret -SFX_Cry00_2_Ch5: - dutycycle 160 - squarenote 5, 11, 3, 1800 - squarenote 15, 12, 5, 1928 - squarenote 8, 7, 1, 1864 - endchannel +SFX_Cry00_2_Ch6: + duty_cycle_pattern 160 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret -SFX_Cry00_2_Ch7: - noisenote 3, 10, 1, 28 - noisenote 14, 9, 4, 44 - noisenote 8, 8, 1, 28 - endchannel +SFX_Cry00_2_Ch8: + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index 3956e46c..f0389adf 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,21 +1,21 @@ -SFX_Cry00_3_Ch4: - dutycycle 245 - squarenote 4, 15, 3, 1816 - squarenote 15, 14, 5, 1944 - squarenote 8, 9, 1, 1880 - endchannel +SFX_Cry00_3_Ch5: + duty_cycle_pattern 245 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret -SFX_Cry00_3_Ch5: - dutycycle 160 - squarenote 5, 11, 3, 1800 - squarenote 15, 12, 5, 1928 - squarenote 8, 7, 1, 1864 - endchannel +SFX_Cry00_3_Ch6: + duty_cycle_pattern 160 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret -SFX_Cry00_3_Ch7: - noisenote 3, 10, 1, 28 - noisenote 14, 9, 4, 44 - noisenote 8, 8, 1, 28 - endchannel +SFX_Cry00_3_Ch8: + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index 24ebcbc6..4f4ec4fa 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,24 +1,24 @@ -SFX_Cry01_1_Ch4: - dutycycle 160 - squarenote 4, 15, 3, 1536 - squarenote 8, 13, 5, 1888 - squarenote 3, 14, 2, 1824 - squarenote 8, 13, 1, 1808 - endchannel +SFX_Cry01_1_Ch5: + duty_cycle_pattern 160 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret -SFX_Cry01_1_Ch5: - dutycycle 90 - squarenote 5, 11, 3, 1777 - squarenote 7, 12, 5, 1874 - squarenote 3, 10, 2, 1809 - squarenote 8, 11, 1, 1537 - endchannel +SFX_Cry01_1_Ch6: + duty_cycle_pattern 90 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret -SFX_Cry01_1_Ch7: - noisenote 3, 10, 2, 60 - noisenote 12, 9, 4, 44 - noisenote 3, 8, 2, 28 - noisenote 8, 7, 1, 44 - endchannel +SFX_Cry01_1_Ch8: + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index e226ed44..55be1d01 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,24 +1,24 @@ -SFX_Cry01_2_Ch4: - dutycycle 160 - squarenote 4, 15, 3, 1536 - squarenote 8, 13, 5, 1888 - squarenote 3, 14, 2, 1824 - squarenote 8, 13, 1, 1808 - endchannel +SFX_Cry01_2_Ch5: + duty_cycle_pattern 160 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret -SFX_Cry01_2_Ch5: - dutycycle 90 - squarenote 5, 11, 3, 1777 - squarenote 7, 12, 5, 1874 - squarenote 3, 10, 2, 1809 - squarenote 8, 11, 1, 1537 - endchannel +SFX_Cry01_2_Ch6: + duty_cycle_pattern 90 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret -SFX_Cry01_2_Ch7: - noisenote 3, 10, 2, 60 - noisenote 12, 9, 4, 44 - noisenote 3, 8, 2, 28 - noisenote 8, 7, 1, 44 - endchannel +SFX_Cry01_2_Ch8: + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index 43cf91df..f89ed321 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,24 +1,24 @@ -SFX_Cry01_3_Ch4: - dutycycle 160 - squarenote 4, 15, 3, 1536 - squarenote 8, 13, 5, 1888 - squarenote 3, 14, 2, 1824 - squarenote 8, 13, 1, 1808 - endchannel +SFX_Cry01_3_Ch5: + duty_cycle_pattern 160 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret -SFX_Cry01_3_Ch5: - dutycycle 90 - squarenote 5, 11, 3, 1777 - squarenote 7, 12, 5, 1874 - squarenote 3, 10, 2, 1809 - squarenote 8, 11, 1, 1537 - endchannel +SFX_Cry01_3_Ch6: + duty_cycle_pattern 90 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret -SFX_Cry01_3_Ch7: - noisenote 3, 10, 2, 60 - noisenote 12, 9, 4, 44 - noisenote 3, 8, 2, 28 - noisenote 8, 7, 1, 44 - endchannel +SFX_Cry01_3_Ch8: + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index 1cc710d2..c1eeac36 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,17 +1,17 @@ -SFX_Cry02_1_Ch4: - duty 0 - squarenote 8, 15, 5, 1152 - squarenote 2, 14, 1, 1504 - squarenote 8, 13, 1, 1500 - endchannel +SFX_Cry02_1_Ch5: + duty_cycle 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret -SFX_Cry02_1_Ch5: - dutycycle 165 - squarenote 7, 9, 5, 1089 - squarenote 2, 8, 1, 1313 - squarenote 8, 6, 1, 1306 +SFX_Cry02_1_Ch6: + duty_cycle_pattern 165 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 -SFX_Cry02_1_Ch7: - endchannel +SFX_Cry02_1_Ch8: + sound_ret diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index 6e9ff69f..f3718e57 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,17 +1,17 @@ -SFX_Cry02_2_Ch4: - duty 0 - squarenote 8, 15, 5, 1152 - squarenote 2, 14, 1, 1504 - squarenote 8, 13, 1, 1500 - endchannel +SFX_Cry02_2_Ch5: + duty_cycle 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret -SFX_Cry02_2_Ch5: - dutycycle 165 - squarenote 7, 9, 5, 1089 - squarenote 2, 8, 1, 1313 - squarenote 8, 6, 1, 1306 +SFX_Cry02_2_Ch6: + duty_cycle_pattern 165 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 -SFX_Cry02_2_Ch7: - endchannel +SFX_Cry02_2_Ch8: + sound_ret diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 9f369ad7..2334ae7f 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,17 +1,17 @@ -SFX_Cry02_3_Ch4: - duty 0 - squarenote 8, 15, 5, 1152 - squarenote 2, 14, 1, 1504 - squarenote 8, 13, 1, 1500 - endchannel +SFX_Cry02_3_Ch5: + duty_cycle 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret -SFX_Cry02_3_Ch5: - dutycycle 165 - squarenote 7, 9, 5, 1089 - squarenote 2, 8, 1, 1313 - squarenote 8, 6, 1, 1306 +SFX_Cry02_3_Ch6: + duty_cycle_pattern 165 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 -SFX_Cry02_3_Ch7: - endchannel +SFX_Cry02_3_Ch8: + sound_ret diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 5039203d..5cb3de34 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,30 +1,30 @@ -SFX_Cry03_1_Ch4: - dutycycle 240 - squarenote 4, 15, 7, 1544 - squarenote 6, 14, 6, 1536 - squarenote 6, 13, 7, 1520 - squarenote 6, 12, 4, 1504 - squarenote 5, 13, 3, 1472 - squarenote 4, 13, 3, 1440 - squarenote 8, 14, 1, 1408 - endchannel +SFX_Cry03_1_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret -SFX_Cry03_1_Ch5: - dutycycle 10 - squarenote 4, 12, 7, 1284 - squarenote 6, 10, 6, 1282 - squarenote 6, 9, 7, 1265 - squarenote 4, 11, 4, 1249 - squarenote 5, 10, 3, 1218 - squarenote 4, 11, 3, 1187 - squarenote 8, 12, 1, 1154 - endchannel +SFX_Cry03_1_Ch6: + duty_cycle_pattern 10 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret -SFX_Cry03_1_Ch7: - noisenote 12, 14, 4, 76 - noisenote 10, 12, 7, 92 - noisenote 12, 11, 6, 76 - noisenote 15, 10, 2, 92 - endchannel +SFX_Cry03_1_Ch8: + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index 54375387..208492c1 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,30 +1,30 @@ -SFX_Cry03_2_Ch4: - dutycycle 240 - squarenote 4, 15, 7, 1544 - squarenote 6, 14, 6, 1536 - squarenote 6, 13, 7, 1520 - squarenote 6, 12, 4, 1504 - squarenote 5, 13, 3, 1472 - squarenote 4, 13, 3, 1440 - squarenote 8, 14, 1, 1408 - endchannel +SFX_Cry03_2_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret -SFX_Cry03_2_Ch5: - dutycycle 10 - squarenote 4, 12, 7, 1284 - squarenote 6, 10, 6, 1282 - squarenote 6, 9, 7, 1265 - squarenote 4, 11, 4, 1249 - squarenote 5, 10, 3, 1218 - squarenote 4, 11, 3, 1187 - squarenote 8, 12, 1, 1154 - endchannel +SFX_Cry03_2_Ch6: + duty_cycle_pattern 10 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret -SFX_Cry03_2_Ch7: - noisenote 12, 14, 4, 76 - noisenote 10, 12, 7, 92 - noisenote 12, 11, 6, 76 - noisenote 15, 10, 2, 92 - endchannel +SFX_Cry03_2_Ch8: + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index 83e1bdd1..11ed4afa 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,30 +1,30 @@ -SFX_Cry03_3_Ch4: - dutycycle 240 - squarenote 4, 15, 7, 1544 - squarenote 6, 14, 6, 1536 - squarenote 6, 13, 7, 1520 - squarenote 6, 12, 4, 1504 - squarenote 5, 13, 3, 1472 - squarenote 4, 13, 3, 1440 - squarenote 8, 14, 1, 1408 - endchannel +SFX_Cry03_3_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret -SFX_Cry03_3_Ch5: - dutycycle 10 - squarenote 4, 12, 7, 1284 - squarenote 6, 10, 6, 1282 - squarenote 6, 9, 7, 1265 - squarenote 4, 11, 4, 1249 - squarenote 5, 10, 3, 1218 - squarenote 4, 11, 3, 1187 - squarenote 8, 12, 1, 1154 - endchannel +SFX_Cry03_3_Ch6: + duty_cycle_pattern 10 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret -SFX_Cry03_3_Ch7: - noisenote 12, 14, 4, 76 - noisenote 10, 12, 7, 92 - noisenote 12, 11, 6, 76 - noisenote 15, 10, 2, 92 - endchannel +SFX_Cry03_3_Ch8: + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index c99f9582..7099c7cb 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,32 +1,32 @@ -SFX_Cry04_1_Ch4: - dutycycle 240 - squarenote 4, 15, 7, 1696 - squarenote 8, 14, 6, 1700 - squarenote 4, 13, 6, 1696 - squarenote 12, 13, 3, 1568 - squarenote 8, 12, 3, 1572 - squarenote 4, 12, 2, 1568 - squarenote 8, 11, 1, 1552 - endchannel +SFX_Cry04_1_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret -SFX_Cry04_1_Ch5: - dutycycle 90 - squarenote 4, 14, 7, 1537 - squarenote 8, 13, 6, 1539 - squarenote 4, 12, 6, 1537 - squarenote 12, 12, 3, 1409 - squarenote 8, 11, 3, 1411 - squarenote 4, 11, 2, 1410 - squarenote 8, 10, 1, 1393 - endchannel +SFX_Cry04_1_Ch6: + duty_cycle_pattern 90 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret -SFX_Cry04_1_Ch7: - noisenote 7, 13, 6, 92 - noisenote 8, 14, 6, 76 - noisenote 4, 13, 4, 92 - noisenote 4, 13, 4, 76 - noisenote 7, 12, 3, 76 - noisenote 8, 10, 1, 92 - endchannel +SFX_Cry04_1_Ch8: + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index def5b459..f2f2a0c7 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,32 +1,32 @@ -SFX_Cry04_2_Ch4: - dutycycle 240 - squarenote 4, 15, 7, 1696 - squarenote 8, 14, 6, 1700 - squarenote 4, 13, 6, 1696 - squarenote 12, 13, 3, 1568 - squarenote 8, 12, 3, 1572 - squarenote 4, 12, 2, 1568 - squarenote 8, 11, 1, 1552 - endchannel +SFX_Cry04_2_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret -SFX_Cry04_2_Ch5: - dutycycle 90 - squarenote 4, 14, 7, 1537 - squarenote 8, 13, 6, 1539 - squarenote 4, 12, 6, 1537 - squarenote 12, 12, 3, 1409 - squarenote 8, 11, 3, 1411 - squarenote 4, 11, 2, 1410 - squarenote 8, 10, 1, 1393 - endchannel +SFX_Cry04_2_Ch6: + duty_cycle_pattern 90 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret -SFX_Cry04_2_Ch7: - noisenote 7, 13, 6, 92 - noisenote 8, 14, 6, 76 - noisenote 4, 13, 4, 92 - noisenote 4, 13, 4, 76 - noisenote 7, 12, 3, 76 - noisenote 8, 10, 1, 92 - endchannel +SFX_Cry04_2_Ch8: + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index 83e81ead..9e155fb4 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,32 +1,32 @@ -SFX_Cry04_3_Ch4: - dutycycle 240 - squarenote 4, 15, 7, 1696 - squarenote 8, 14, 6, 1700 - squarenote 4, 13, 6, 1696 - squarenote 12, 13, 3, 1568 - squarenote 8, 12, 3, 1572 - squarenote 4, 12, 2, 1568 - squarenote 8, 11, 1, 1552 - endchannel +SFX_Cry04_3_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret -SFX_Cry04_3_Ch5: - dutycycle 90 - squarenote 4, 14, 7, 1537 - squarenote 8, 13, 6, 1539 - squarenote 4, 12, 6, 1537 - squarenote 12, 12, 3, 1409 - squarenote 8, 11, 3, 1411 - squarenote 4, 11, 2, 1410 - squarenote 8, 10, 1, 1393 - endchannel +SFX_Cry04_3_Ch6: + duty_cycle_pattern 90 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret -SFX_Cry04_3_Ch7: - noisenote 7, 13, 6, 92 - noisenote 8, 14, 6, 76 - noisenote 4, 13, 4, 92 - noisenote 4, 13, 4, 76 - noisenote 7, 12, 3, 76 - noisenote 8, 10, 1, 92 - endchannel +SFX_Cry04_3_Ch8: + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 525fdc2d..8db2db6a 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,19 +1,19 @@ -SFX_Cry05_1_Ch4: - dutycycle 10 - squarenote 6, 14, 2, 1280 - squarenote 6, 14, 3, 1408 - squarenote 6, 13, 3, 1392 - squarenote 8, 10, 1, 1376 - endchannel +SFX_Cry05_1_Ch5: + duty_cycle_pattern 10 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret -SFX_Cry05_1_Ch5: - dutycycle 245 - squarenote 6, 14, 2, 1154 - squarenote 6, 13, 3, 1281 - squarenote 6, 11, 2, 1250 - squarenote 8, 8, 1, 1217 +SFX_Cry05_1_Ch6: + duty_cycle_pattern 245 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 -SFX_Cry05_1_Ch7: - endchannel +SFX_Cry05_1_Ch8: + sound_ret diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index 44e8fb21..d9fe5208 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,19 +1,19 @@ -SFX_Cry05_2_Ch4: - dutycycle 10 - squarenote 6, 14, 2, 1280 - squarenote 6, 14, 3, 1408 - squarenote 6, 13, 3, 1392 - squarenote 8, 10, 1, 1376 - endchannel +SFX_Cry05_2_Ch5: + duty_cycle_pattern 10 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret -SFX_Cry05_2_Ch5: - dutycycle 245 - squarenote 6, 14, 2, 1154 - squarenote 6, 13, 3, 1281 - squarenote 6, 11, 2, 1250 - squarenote 8, 8, 1, 1217 +SFX_Cry05_2_Ch6: + duty_cycle_pattern 245 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 -SFX_Cry05_2_Ch7: - endchannel +SFX_Cry05_2_Ch8: + sound_ret diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index 2fcb4e1f..57479f06 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,19 +1,19 @@ -SFX_Cry05_3_Ch4: - dutycycle 10 - squarenote 6, 14, 2, 1280 - squarenote 6, 14, 3, 1408 - squarenote 6, 13, 3, 1392 - squarenote 8, 10, 1, 1376 - endchannel +SFX_Cry05_3_Ch5: + duty_cycle_pattern 10 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret -SFX_Cry05_3_Ch5: - dutycycle 245 - squarenote 6, 14, 2, 1154 - squarenote 6, 13, 3, 1281 - squarenote 6, 11, 2, 1250 - squarenote 8, 8, 1, 1217 +SFX_Cry05_3_Ch6: + duty_cycle_pattern 245 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 -SFX_Cry05_3_Ch7: - endchannel +SFX_Cry05_3_Ch8: + sound_ret diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index 09099504..5b184121 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,22 +1,22 @@ -SFX_Cry06_1_Ch4: - dutycycle 250 - squarenote 6, 8, 3, 583 - squarenote 15, 6, 2, 550 - squarenote 4, 5, 2, 581 - squarenote 9, 6, 3, 518 - squarenote 15, 8, 2, 549 - squarenote 15, 4, 2, 519 +SFX_Cry06_1_Ch5: + duty_cycle_pattern 250 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 -SFX_Cry06_1_Ch5: - endchannel +SFX_Cry06_1_Ch6: + sound_ret -SFX_Cry06_1_Ch7: - noisenote 8, 13, 4, 140 - noisenote 4, 14, 2, 156 - noisenote 15, 12, 6, 140 - noisenote 8, 14, 4, 172 - noisenote 15, 13, 7, 156 - noisenote 15, 15, 2, 172 - endchannel +SFX_Cry06_1_Ch8: + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 75ca8228..3d32921b 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,22 +1,22 @@ -SFX_Cry06_2_Ch4: - dutycycle 250 - squarenote 6, 8, 3, 583 - squarenote 15, 6, 2, 550 - squarenote 4, 5, 2, 581 - squarenote 9, 6, 3, 518 - squarenote 15, 8, 2, 549 - squarenote 15, 4, 2, 519 +SFX_Cry06_2_Ch5: + duty_cycle_pattern 250 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 -SFX_Cry06_2_Ch5: - endchannel +SFX_Cry06_2_Ch6: + sound_ret -SFX_Cry06_2_Ch7: - noisenote 8, 13, 4, 140 - noisenote 4, 14, 2, 156 - noisenote 15, 12, 6, 140 - noisenote 8, 14, 4, 172 - noisenote 15, 13, 7, 156 - noisenote 15, 15, 2, 172 - endchannel +SFX_Cry06_2_Ch8: + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index 760ca4f1..c847b1ab 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,22 +1,22 @@ -SFX_Cry06_3_Ch4: - dutycycle 250 - squarenote 6, 8, 3, 583 - squarenote 15, 6, 2, 550 - squarenote 4, 5, 2, 581 - squarenote 9, 6, 3, 518 - squarenote 15, 8, 2, 549 - squarenote 15, 4, 2, 519 +SFX_Cry06_3_Ch5: + duty_cycle_pattern 250 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 -SFX_Cry06_3_Ch5: - endchannel +SFX_Cry06_3_Ch6: + sound_ret -SFX_Cry06_3_Ch7: - noisenote 8, 13, 4, 140 - noisenote 4, 14, 2, 156 - noisenote 15, 12, 6, 140 - noisenote 8, 14, 4, 172 - noisenote 15, 13, 7, 156 - noisenote 15, 15, 2, 172 - endchannel +SFX_Cry06_3_Ch8: + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index 8a736136..5918d4d8 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,21 +1,21 @@ -SFX_Cry07_1_Ch4: - dutycycle 240 - squarenote 4, 15, 3, 1760 - squarenote 15, 14, 4, 1600 - squarenote 8, 12, 1, 1568 - endchannel +SFX_Cry07_1_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry07_1_Ch5: - dutycycle 10 - squarenote 3, 12, 3, 1667 - squarenote 14, 11, 4, 1538 - squarenote 8, 10, 1, 1537 - endchannel +SFX_Cry07_1_Ch6: + duty_cycle_pattern 10 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret -SFX_Cry07_1_Ch7: - noisenote 4, 13, 3, 92 - noisenote 15, 14, 6, 76 - noisenote 8, 11, 1, 92 - endchannel +SFX_Cry07_1_Ch8: + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index 8ccba10c..fcd82c8d 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,21 +1,21 @@ -SFX_Cry07_2_Ch4: - dutycycle 240 - squarenote 4, 15, 3, 1760 - squarenote 15, 14, 4, 1600 - squarenote 8, 12, 1, 1568 - endchannel +SFX_Cry07_2_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry07_2_Ch5: - dutycycle 10 - squarenote 3, 12, 3, 1667 - squarenote 14, 11, 4, 1538 - squarenote 8, 10, 1, 1537 - endchannel +SFX_Cry07_2_Ch6: + duty_cycle_pattern 10 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret -SFX_Cry07_2_Ch7: - noisenote 4, 13, 3, 92 - noisenote 15, 14, 6, 76 - noisenote 8, 11, 1, 92 - endchannel +SFX_Cry07_2_Ch8: + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index bb90a016..a92dd02b 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,21 +1,21 @@ -SFX_Cry07_3_Ch4: - dutycycle 240 - squarenote 4, 15, 3, 1760 - squarenote 15, 14, 4, 1600 - squarenote 8, 12, 1, 1568 - endchannel +SFX_Cry07_3_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry07_3_Ch5: - dutycycle 10 - squarenote 3, 12, 3, 1667 - squarenote 14, 11, 4, 1538 - squarenote 8, 10, 1, 1537 - endchannel +SFX_Cry07_3_Ch6: + duty_cycle_pattern 10 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret -SFX_Cry07_3_Ch7: - noisenote 4, 13, 3, 92 - noisenote 15, 14, 6, 76 - noisenote 8, 11, 1, 92 - endchannel +SFX_Cry07_3_Ch8: + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 18d324f4..044f4add 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,23 +1,23 @@ -SFX_Cry08_1_Ch4: - dutycycle 240 - squarenote 15, 15, 6, 1381 - squarenote 10, 14, 4, 1404 - squarenote 3, 12, 2, 1372 - squarenote 15, 11, 2, 1340 - endchannel +SFX_Cry08_1_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret -SFX_Cry08_1_Ch5: - dutycycle 90 - squarenote 14, 13, 6, 1283 - squarenote 9, 11, 4, 1307 - squarenote 4, 9, 2, 1274 - squarenote 15, 10, 2, 1243 - endchannel +SFX_Cry08_1_Ch6: + duty_cycle_pattern 90 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret -SFX_Cry08_1_Ch7: - noisenote 12, 14, 6, 76 - noisenote 11, 13, 7, 92 - noisenote 15, 12, 2, 76 - endchannel +SFX_Cry08_1_Ch8: + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 809ab706..50da09d9 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,23 +1,23 @@ -SFX_Cry08_2_Ch4: - dutycycle 240 - squarenote 15, 15, 6, 1381 - squarenote 10, 14, 4, 1404 - squarenote 3, 12, 2, 1372 - squarenote 15, 11, 2, 1340 - endchannel +SFX_Cry08_2_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret -SFX_Cry08_2_Ch5: - dutycycle 90 - squarenote 14, 13, 6, 1283 - squarenote 9, 11, 4, 1307 - squarenote 4, 9, 2, 1274 - squarenote 15, 10, 2, 1243 - endchannel +SFX_Cry08_2_Ch6: + duty_cycle_pattern 90 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret -SFX_Cry08_2_Ch7: - noisenote 12, 14, 6, 76 - noisenote 11, 13, 7, 92 - noisenote 15, 12, 2, 76 - endchannel +SFX_Cry08_2_Ch8: + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index 37e83796..b18c8b75 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,23 +1,23 @@ -SFX_Cry08_3_Ch4: - dutycycle 240 - squarenote 15, 15, 6, 1381 - squarenote 10, 14, 4, 1404 - squarenote 3, 12, 2, 1372 - squarenote 15, 11, 2, 1340 - endchannel +SFX_Cry08_3_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret -SFX_Cry08_3_Ch5: - dutycycle 90 - squarenote 14, 13, 6, 1283 - squarenote 9, 11, 4, 1307 - squarenote 4, 9, 2, 1274 - squarenote 15, 10, 2, 1243 - endchannel +SFX_Cry08_3_Ch6: + duty_cycle_pattern 90 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret -SFX_Cry08_3_Ch7: - noisenote 12, 14, 6, 76 - noisenote 11, 13, 7, 92 - noisenote 15, 12, 2, 76 - endchannel +SFX_Cry08_3_Ch8: + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index 8b0178d6..02206052 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,35 +1,35 @@ -SFX_Cry09_1_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1952 - squarenote 6, 14, 6, 1955 - squarenote 10, 15, 4, 1952 - dutycycle 165 - squarenote 10, 15, 6, 2008 - squarenote 4, 14, 3, 2007 - squarenote 15, 15, 2, 2008 - endchannel +SFX_Cry09_1_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 165 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret -SFX_Cry09_1_Ch5: - dutycycle 5 - squarenote 2, 0, 8, 0 - squarenote 15, 10, 7, 1697 - squarenote 6, 8, 6, 1698 - squarenote 10, 7, 4, 1697 - dutycycle 95 - squarenote 10, 7, 6, 1750 - squarenote 4, 8, 3, 1753 - squarenote 15, 10, 2, 1751 - endchannel +SFX_Cry09_1_Ch6: + duty_cycle_pattern 5 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 95 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret -SFX_Cry09_1_Ch7: - noisenote 2, 15, 2, 60 - noisenote 8, 14, 4, 62 - noisenote 15, 13, 7, 60 - noisenote 6, 12, 5, 59 - noisenote 6, 14, 4, 61 - noisenote 8, 11, 6, 60 - noisenote 6, 13, 4, 61 - noisenote 8, 12, 1, 59 - endchannel +SFX_Cry09_1_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index 378c07bd..545a77cc 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,35 +1,35 @@ -SFX_Cry09_2_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1952 - squarenote 6, 14, 6, 1955 - squarenote 10, 15, 4, 1952 - dutycycle 165 - squarenote 10, 15, 6, 2008 - squarenote 4, 14, 3, 2007 - squarenote 15, 15, 2, 2008 - endchannel +SFX_Cry09_2_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 165 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret -SFX_Cry09_2_Ch5: - dutycycle 5 - squarenote 2, 0, 8, 0 - squarenote 15, 10, 7, 1697 - squarenote 6, 8, 6, 1698 - squarenote 10, 7, 4, 1697 - dutycycle 95 - squarenote 10, 7, 6, 1750 - squarenote 4, 8, 3, 1753 - squarenote 15, 10, 2, 1751 - endchannel +SFX_Cry09_2_Ch6: + duty_cycle_pattern 5 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 95 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret -SFX_Cry09_2_Ch7: - noisenote 2, 15, 2, 60 - noisenote 8, 14, 4, 62 - noisenote 15, 13, 7, 60 - noisenote 6, 12, 5, 59 - noisenote 6, 14, 4, 61 - noisenote 8, 11, 6, 60 - noisenote 6, 13, 4, 61 - noisenote 8, 12, 1, 59 - endchannel +SFX_Cry09_2_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index 7bf098b1..d842066c 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,35 +1,35 @@ -SFX_Cry09_3_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1952 - squarenote 6, 14, 6, 1955 - squarenote 10, 15, 4, 1952 - dutycycle 165 - squarenote 10, 15, 6, 2008 - squarenote 4, 14, 3, 2007 - squarenote 15, 15, 2, 2008 - endchannel +SFX_Cry09_3_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 165 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret -SFX_Cry09_3_Ch5: - dutycycle 5 - squarenote 2, 0, 8, 0 - squarenote 15, 10, 7, 1697 - squarenote 6, 8, 6, 1698 - squarenote 10, 7, 4, 1697 - dutycycle 95 - squarenote 10, 7, 6, 1750 - squarenote 4, 8, 3, 1753 - squarenote 15, 10, 2, 1751 - endchannel +SFX_Cry09_3_Ch6: + duty_cycle_pattern 5 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 95 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret -SFX_Cry09_3_Ch7: - noisenote 2, 15, 2, 60 - noisenote 8, 14, 4, 62 - noisenote 15, 13, 7, 60 - noisenote 6, 12, 5, 59 - noisenote 6, 14, 4, 61 - noisenote 8, 11, 6, 60 - noisenote 6, 13, 4, 61 - noisenote 8, 12, 1, 59 - endchannel +SFX_Cry09_3_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index 45b293ca..fa1a0c31 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,35 +1,35 @@ -SFX_Cry0A_1_Ch4: - dutycycle 240 - squarenote 8, 15, 7, 1760 - squarenote 6, 14, 6, 1765 - squarenote 3, 15, 4, 1760 - squarenote 3, 15, 6, 1744 - squarenote 3, 14, 3, 1728 - squarenote 4, 15, 2, 1712 - squarenote 15, 10, 2, 1736 - endchannel +SFX_Cry0A_1_Ch5: + duty_cycle_pattern 240 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret -SFX_Cry0A_1_Ch5: - dutycycle 5 - squarenote 3, 0, 8, 0 - squarenote 8, 10, 7, 1697 - squarenote 6, 8, 6, 1699 - squarenote 3, 7, 4, 1697 - squarenote 3, 7, 6, 1681 - squarenote 3, 8, 3, 1666 - squarenote 4, 10, 2, 1649 - squarenote 15, 7, 2, 1673 - endchannel +SFX_Cry0A_1_Ch6: + duty_cycle_pattern 5 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret -SFX_Cry0A_1_Ch7: - noisenote 2, 15, 2, 60 - noisenote 8, 14, 4, 62 - noisenote 8, 13, 7, 60 - noisenote 5, 12, 5, 59 - noisenote 3, 13, 4, 44 - noisenote 2, 11, 6, 60 - noisenote 3, 10, 4, 44 - noisenote 8, 9, 1, 60 - endchannel +SFX_Cry0A_1_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index a4d3b839..af07ff25 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,35 +1,35 @@ -SFX_Cry0A_2_Ch4: - dutycycle 240 - squarenote 8, 15, 7, 1760 - squarenote 6, 14, 6, 1765 - squarenote 3, 15, 4, 1760 - squarenote 3, 15, 6, 1744 - squarenote 3, 14, 3, 1728 - squarenote 4, 15, 2, 1712 - squarenote 15, 10, 2, 1736 - endchannel +SFX_Cry0A_2_Ch5: + duty_cycle_pattern 240 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret -SFX_Cry0A_2_Ch5: - dutycycle 5 - squarenote 3, 0, 8, 0 - squarenote 8, 10, 7, 1697 - squarenote 6, 8, 6, 1699 - squarenote 3, 7, 4, 1697 - squarenote 3, 7, 6, 1681 - squarenote 3, 8, 3, 1666 - squarenote 4, 10, 2, 1649 - squarenote 15, 7, 2, 1673 - endchannel +SFX_Cry0A_2_Ch6: + duty_cycle_pattern 5 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret -SFX_Cry0A_2_Ch7: - noisenote 2, 15, 2, 60 - noisenote 8, 14, 4, 62 - noisenote 8, 13, 7, 60 - noisenote 5, 12, 5, 59 - noisenote 3, 13, 4, 44 - noisenote 2, 11, 6, 60 - noisenote 3, 10, 4, 44 - noisenote 8, 9, 1, 60 - endchannel +SFX_Cry0A_2_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index 5c6617fb..f0bb527a 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,35 +1,35 @@ -SFX_Cry0A_3_Ch4: - dutycycle 240 - squarenote 8, 15, 7, 1760 - squarenote 6, 14, 6, 1765 - squarenote 3, 15, 4, 1760 - squarenote 3, 15, 6, 1744 - squarenote 3, 14, 3, 1728 - squarenote 4, 15, 2, 1712 - squarenote 15, 10, 2, 1736 - endchannel +SFX_Cry0A_3_Ch5: + duty_cycle_pattern 240 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret -SFX_Cry0A_3_Ch5: - dutycycle 5 - squarenote 3, 0, 8, 0 - squarenote 8, 10, 7, 1697 - squarenote 6, 8, 6, 1699 - squarenote 3, 7, 4, 1697 - squarenote 3, 7, 6, 1681 - squarenote 3, 8, 3, 1666 - squarenote 4, 10, 2, 1649 - squarenote 15, 7, 2, 1673 - endchannel +SFX_Cry0A_3_Ch6: + duty_cycle_pattern 5 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret -SFX_Cry0A_3_Ch7: - noisenote 2, 15, 2, 60 - noisenote 8, 14, 4, 62 - noisenote 8, 13, 7, 60 - noisenote 5, 12, 5, 59 - noisenote 3, 13, 4, 44 - noisenote 2, 11, 6, 60 - noisenote 3, 10, 4, 44 - noisenote 8, 9, 1, 60 - endchannel +SFX_Cry0A_3_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index ba8e1e1b..9b2104aa 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,37 +1,37 @@ -SFX_Cry0B_1_Ch4: - dutycycle 204 - squarenote 4, 15, 1, 1792 - squarenote 4, 14, 1, 1920 - squarenote 4, 13, 1, 1856 - squarenote 4, 14, 1, 1856 - squarenote 4, 15, 1, 1920 - squarenote 4, 13, 1, 1792 - squarenote 4, 15, 1, 1793 - squarenote 4, 13, 1, 1922 - squarenote 4, 12, 1, 1858 - squarenote 8, 11, 1, 1857 - endchannel +SFX_Cry0B_1_Ch5: + duty_cycle_pattern 204 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret -SFX_Cry0B_1_Ch5: - dutycycle 68 - squarenote 12, 0, 8, 0 - squarenote 4, 15, 1, 1793 - squarenote 4, 14, 1, 1922 - squarenote 4, 13, 1, 1857 - squarenote 4, 14, 1, 1857 - squarenote 4, 15, 1, 1922 - squarenote 8, 13, 1, 1793 - endchannel +SFX_Cry0B_1_Ch6: + duty_cycle_pattern 68 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret -SFX_Cry0B_1_Ch7: - noisenote 15, 0, 8, 0 - noisenote 4, 0, 8, 0 - noisenote 4, 13, 1, 76 - noisenote 4, 11, 1, 44 - noisenote 4, 13, 1, 60 - noisenote 4, 11, 1, 60 - noisenote 4, 12, 1, 44 - noisenote 8, 10, 1, 76 - endchannel +SFX_Cry0B_1_Ch8: + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 9cbf1ee5..37e17243 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,37 +1,37 @@ -SFX_Cry0B_2_Ch4: - dutycycle 204 - squarenote 4, 15, 1, 1792 - squarenote 4, 14, 1, 1920 - squarenote 4, 13, 1, 1856 - squarenote 4, 14, 1, 1856 - squarenote 4, 15, 1, 1920 - squarenote 4, 13, 1, 1792 - squarenote 4, 15, 1, 1793 - squarenote 4, 13, 1, 1922 - squarenote 4, 12, 1, 1858 - squarenote 8, 11, 1, 1857 - endchannel +SFX_Cry0B_2_Ch5: + duty_cycle_pattern 204 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret -SFX_Cry0B_2_Ch5: - dutycycle 68 - squarenote 12, 0, 8, 0 - squarenote 4, 15, 1, 1793 - squarenote 4, 14, 1, 1922 - squarenote 4, 13, 1, 1857 - squarenote 4, 14, 1, 1857 - squarenote 4, 15, 1, 1922 - squarenote 8, 13, 1, 1793 - endchannel +SFX_Cry0B_2_Ch6: + duty_cycle_pattern 68 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret -SFX_Cry0B_2_Ch7: - noisenote 15, 0, 8, 0 - noisenote 4, 0, 8, 0 - noisenote 4, 13, 1, 76 - noisenote 4, 11, 1, 44 - noisenote 4, 13, 1, 60 - noisenote 4, 11, 1, 60 - noisenote 4, 12, 1, 44 - noisenote 8, 10, 1, 76 - endchannel +SFX_Cry0B_2_Ch8: + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index 559fbbe0..9e788f53 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,37 +1,37 @@ -SFX_Cry0B_3_Ch4: - dutycycle 204 - squarenote 4, 15, 1, 1792 - squarenote 4, 14, 1, 1920 - squarenote 4, 13, 1, 1856 - squarenote 4, 14, 1, 1856 - squarenote 4, 15, 1, 1920 - squarenote 4, 13, 1, 1792 - squarenote 4, 15, 1, 1793 - squarenote 4, 13, 1, 1922 - squarenote 4, 12, 1, 1858 - squarenote 8, 11, 1, 1857 - endchannel +SFX_Cry0B_3_Ch5: + duty_cycle_pattern 204 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret -SFX_Cry0B_3_Ch5: - dutycycle 68 - squarenote 12, 0, 8, 0 - squarenote 4, 15, 1, 1793 - squarenote 4, 14, 1, 1922 - squarenote 4, 13, 1, 1857 - squarenote 4, 14, 1, 1857 - squarenote 4, 15, 1, 1922 - squarenote 8, 13, 1, 1793 - endchannel +SFX_Cry0B_3_Ch6: + duty_cycle_pattern 68 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret -SFX_Cry0B_3_Ch7: - noisenote 15, 0, 8, 0 - noisenote 4, 0, 8, 0 - noisenote 4, 13, 1, 76 - noisenote 4, 11, 1, 44 - noisenote 4, 13, 1, 60 - noisenote 4, 11, 1, 60 - noisenote 4, 12, 1, 44 - noisenote 8, 10, 1, 76 - endchannel +SFX_Cry0B_3_Ch8: + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index 25246488..67f30936 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,29 +1,29 @@ -SFX_Cry0C_1_Ch4: - dutycycle 204 - squarenote 8, 15, 5, 1536 - squarenote 2, 13, 2, 1592 - squarenote 2, 12, 2, 1584 - squarenote 2, 12, 2, 1576 - squarenote 2, 11, 2, 1568 - squarenote 2, 11, 2, 1552 - squarenote 2, 10, 2, 1560 - squarenote 2, 11, 2, 1552 - squarenote 8, 12, 1, 1568 - endchannel +SFX_Cry0C_1_Ch5: + duty_cycle_pattern 204 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry0C_1_Ch5: - dutycycle 68 - squarenote 12, 12, 3, 1472 - squarenote 3, 11, 1, 1529 - squarenote 2, 10, 1, 1521 - squarenote 2, 10, 1, 1513 - squarenote 2, 9, 1, 1505 - squarenote 2, 9, 1, 1497 - squarenote 2, 8, 1, 1489 - squarenote 2, 9, 1, 1497 - squarenote 8, 9, 1, 1505 +SFX_Cry0C_1_Ch6: + duty_cycle_pattern 68 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 -SFX_Cry0C_1_Ch7: - endchannel +SFX_Cry0C_1_Ch8: + sound_ret diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index e94609c9..dd1a90c1 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,29 +1,29 @@ -SFX_Cry0C_2_Ch4: - dutycycle 204 - squarenote 8, 15, 5, 1536 - squarenote 2, 13, 2, 1592 - squarenote 2, 12, 2, 1584 - squarenote 2, 12, 2, 1576 - squarenote 2, 11, 2, 1568 - squarenote 2, 11, 2, 1552 - squarenote 2, 10, 2, 1560 - squarenote 2, 11, 2, 1552 - squarenote 8, 12, 1, 1568 - endchannel +SFX_Cry0C_2_Ch5: + duty_cycle_pattern 204 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry0C_2_Ch5: - dutycycle 68 - squarenote 12, 12, 3, 1472 - squarenote 3, 11, 1, 1529 - squarenote 2, 10, 1, 1521 - squarenote 2, 10, 1, 1513 - squarenote 2, 9, 1, 1505 - squarenote 2, 9, 1, 1497 - squarenote 2, 8, 1, 1489 - squarenote 2, 9, 1, 1497 - squarenote 8, 9, 1, 1505 +SFX_Cry0C_2_Ch6: + duty_cycle_pattern 68 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 -SFX_Cry0C_2_Ch7: - endchannel +SFX_Cry0C_2_Ch8: + sound_ret diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index ac5296c6..024bab85 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,29 +1,29 @@ -SFX_Cry0C_3_Ch4: - dutycycle 204 - squarenote 8, 15, 5, 1536 - squarenote 2, 13, 2, 1592 - squarenote 2, 12, 2, 1584 - squarenote 2, 12, 2, 1576 - squarenote 2, 11, 2, 1568 - squarenote 2, 11, 2, 1552 - squarenote 2, 10, 2, 1560 - squarenote 2, 11, 2, 1552 - squarenote 8, 12, 1, 1568 - endchannel +SFX_Cry0C_3_Ch5: + duty_cycle_pattern 204 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret -SFX_Cry0C_3_Ch5: - dutycycle 68 - squarenote 12, 12, 3, 1472 - squarenote 3, 11, 1, 1529 - squarenote 2, 10, 1, 1521 - squarenote 2, 10, 1, 1513 - squarenote 2, 9, 1, 1505 - squarenote 2, 9, 1, 1497 - squarenote 2, 8, 1, 1489 - squarenote 2, 9, 1, 1497 - squarenote 8, 9, 1, 1505 +SFX_Cry0C_3_Ch6: + duty_cycle_pattern 68 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 -SFX_Cry0C_3_Ch7: - endchannel +SFX_Cry0C_3_Ch8: + sound_ret diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index 9403af3a..ac9963f2 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,40 +1,40 @@ -SFX_Cry0D_1_Ch4: - dutycycle 136 - squarenote 5, 15, 2, 1616 - squarenote 9, 13, 1, 1632 - squarenote 5, 14, 2, 1554 - squarenote 9, 12, 1, 1570 - squarenote 5, 15, 2, 1552 - squarenote 6, 13, 1, 1568 - loopchannel 2, SFX_Cry0D_1_Ch4 - endchannel +SFX_Cry0D_1_Ch5: + duty_cycle_pattern 136 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, SFX_Cry0D_1_Ch5 + sound_ret -SFX_Cry0D_1_Ch5: - dutycycle 64 - squarenote 4, 0, 8, 0 - squarenote 5, 15, 2, 1617 - squarenote 9, 13, 1, 1633 - squarenote 5, 14, 2, 1556 - squarenote 8, 12, 1, 1572 - squarenote 5, 15, 2, 1553 - squarenote 12, 13, 1, 1569 - squarenote 5, 14, 2, 1556 - squarenote 8, 12, 1, 1572 - squarenote 5, 15, 2, 1553 - squarenote 4, 13, 1, 1569 - endchannel +SFX_Cry0D_1_Ch6: + duty_cycle_pattern 64 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret -SFX_Cry0D_1_Ch7: - noisenote 6, 13, 2, 28 - noisenote 9, 11, 1, 44 - noisenote 8, 12, 2, 44 - noisenote 9, 11, 1, 60 - noisenote 6, 12, 2, 44 - noisenote 9, 10, 2, 60 - noisenote 7, 12, 2, 44 - noisenote 5, 10, 1, 60 - noisenote 9, 12, 2, 44 - noisenote 4, 10, 1, 60 - endchannel +SFX_Cry0D_1_Ch8: + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index 9d570892..8c6dd050 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,40 +1,40 @@ -SFX_Cry0D_2_Ch4: - dutycycle 136 - squarenote 5, 15, 2, 1616 - squarenote 9, 13, 1, 1632 - squarenote 5, 14, 2, 1554 - squarenote 9, 12, 1, 1570 - squarenote 5, 15, 2, 1552 - squarenote 6, 13, 1, 1568 - loopchannel 2, SFX_Cry0D_2_Ch4 - endchannel +SFX_Cry0D_2_Ch5: + duty_cycle_pattern 136 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, SFX_Cry0D_2_Ch5 + sound_ret -SFX_Cry0D_2_Ch5: - dutycycle 64 - squarenote 4, 0, 8, 0 - squarenote 5, 15, 2, 1617 - squarenote 9, 13, 1, 1633 - squarenote 5, 14, 2, 1556 - squarenote 8, 12, 1, 1572 - squarenote 5, 15, 2, 1553 - squarenote 12, 13, 1, 1569 - squarenote 5, 14, 2, 1556 - squarenote 8, 12, 1, 1572 - squarenote 5, 15, 2, 1553 - squarenote 4, 13, 1, 1569 - endchannel +SFX_Cry0D_2_Ch6: + duty_cycle_pattern 64 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret -SFX_Cry0D_2_Ch7: - noisenote 6, 13, 2, 28 - noisenote 9, 11, 1, 44 - noisenote 8, 12, 2, 44 - noisenote 9, 11, 1, 60 - noisenote 6, 12, 2, 44 - noisenote 9, 10, 2, 60 - noisenote 7, 12, 2, 44 - noisenote 5, 10, 1, 60 - noisenote 9, 12, 2, 44 - noisenote 4, 10, 1, 60 - endchannel +SFX_Cry0D_2_Ch8: + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index 18125238..487faa53 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,40 +1,40 @@ -SFX_Cry0D_3_Ch4: - dutycycle 136 - squarenote 5, 15, 2, 1616 - squarenote 9, 13, 1, 1632 - squarenote 5, 14, 2, 1554 - squarenote 9, 12, 1, 1570 - squarenote 5, 15, 2, 1552 - squarenote 6, 13, 1, 1568 - loopchannel 2, SFX_Cry0D_3_Ch4 - endchannel +SFX_Cry0D_3_Ch5: + duty_cycle_pattern 136 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, SFX_Cry0D_3_Ch5 + sound_ret -SFX_Cry0D_3_Ch5: - dutycycle 64 - squarenote 4, 0, 8, 0 - squarenote 5, 15, 2, 1617 - squarenote 9, 13, 1, 1633 - squarenote 5, 14, 2, 1556 - squarenote 8, 12, 1, 1572 - squarenote 5, 15, 2, 1553 - squarenote 12, 13, 1, 1569 - squarenote 5, 14, 2, 1556 - squarenote 8, 12, 1, 1572 - squarenote 5, 15, 2, 1553 - squarenote 4, 13, 1, 1569 - endchannel +SFX_Cry0D_3_Ch6: + duty_cycle_pattern 64 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret -SFX_Cry0D_3_Ch7: - noisenote 6, 13, 2, 28 - noisenote 9, 11, 1, 44 - noisenote 8, 12, 2, 44 - noisenote 9, 11, 1, 60 - noisenote 6, 12, 2, 44 - noisenote 9, 10, 2, 60 - noisenote 7, 12, 2, 44 - noisenote 5, 10, 1, 60 - noisenote 9, 12, 2, 44 - noisenote 4, 10, 1, 60 - endchannel +SFX_Cry0D_3_Ch8: + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index c5a166b7..3067b15a 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,23 +1,23 @@ -SFX_Cry0E_1_Ch4: - dutycycle 165 - squarenote 4, 14, 1, 1792 - squarenote 4, 15, 2, 1920 - squarenote 2, 9, 2, 1856 - squarenote 8, 14, 1, 1536 - endchannel +SFX_Cry0E_1_Ch5: + duty_cycle_pattern 165 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret -SFX_Cry0E_1_Ch5: - dutycycle 10 - squarenote 4, 11, 1, 1761 - squarenote 3, 12, 2, 1761 - squarenote 3, 6, 2, 1665 - squarenote 8, 11, 1, 1505 - endchannel +SFX_Cry0E_1_Ch6: + duty_cycle_pattern 10 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret -SFX_Cry0E_1_Ch7: - noisenote 2, 6, 1, 50 - noisenote 2, 6, 1, 33 - noisenote 8, 6, 1, 17 - endchannel +SFX_Cry0E_1_Ch8: + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index 943b12f4..b3849fc5 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,23 +1,23 @@ -SFX_Cry0E_2_Ch4: - dutycycle 165 - squarenote 4, 14, 1, 1792 - squarenote 4, 15, 2, 1920 - squarenote 2, 9, 2, 1856 - squarenote 8, 14, 1, 1536 - endchannel +SFX_Cry0E_2_Ch5: + duty_cycle_pattern 165 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret -SFX_Cry0E_2_Ch5: - dutycycle 10 - squarenote 4, 11, 1, 1761 - squarenote 3, 12, 2, 1761 - squarenote 3, 6, 2, 1665 - squarenote 8, 11, 1, 1505 - endchannel +SFX_Cry0E_2_Ch6: + duty_cycle_pattern 10 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret -SFX_Cry0E_2_Ch7: - noisenote 2, 6, 1, 50 - noisenote 2, 6, 1, 33 - noisenote 8, 6, 1, 17 - endchannel +SFX_Cry0E_2_Ch8: + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index c500b326..493f91e2 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,23 +1,23 @@ -SFX_Cry0E_3_Ch4: - dutycycle 165 - squarenote 4, 14, 1, 1792 - squarenote 4, 15, 2, 1920 - squarenote 2, 9, 2, 1856 - squarenote 8, 14, 1, 1536 - endchannel +SFX_Cry0E_3_Ch5: + duty_cycle_pattern 165 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret -SFX_Cry0E_3_Ch5: - dutycycle 10 - squarenote 4, 11, 1, 1761 - squarenote 3, 12, 2, 1761 - squarenote 3, 6, 2, 1665 - squarenote 8, 11, 1, 1505 - endchannel +SFX_Cry0E_3_Ch6: + duty_cycle_pattern 10 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret -SFX_Cry0E_3_Ch7: - noisenote 2, 6, 1, 50 - noisenote 2, 6, 1, 33 - noisenote 8, 6, 1, 17 - endchannel +SFX_Cry0E_3_Ch8: + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index e959205e..9dbef1fb 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,29 +1,29 @@ -SFX_Cry0F_1_Ch4: - dutycycle 241 - squarenote 4, 15, 7, 1984 - squarenote 12, 14, 6, 1986 - squarenote 6, 11, 5, 1664 - squarenote 4, 12, 4, 1648 - squarenote 4, 11, 5, 1632 - squarenote 8, 12, 1, 1600 - endchannel +SFX_Cry0F_1_Ch5: + duty_cycle_pattern 241 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry0F_1_Ch5: - dutycycle 204 - squarenote 3, 12, 7, 1921 - squarenote 12, 11, 6, 1920 - squarenote 6, 10, 5, 1601 - squarenote 4, 12, 4, 1586 - squarenote 6, 11, 5, 1569 - squarenote 8, 10, 1, 1538 - endchannel +SFX_Cry0F_1_Ch6: + duty_cycle_pattern 204 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret -SFX_Cry0F_1_Ch7: - noisenote 3, 14, 4, 60 - noisenote 12, 13, 6, 44 - noisenote 4, 14, 4, 60 - noisenote 8, 11, 7, 92 - noisenote 15, 12, 2, 93 - endchannel +SFX_Cry0F_1_Ch8: + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index dc052645..7de545a4 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,29 +1,29 @@ -SFX_Cry0F_2_Ch4: - dutycycle 241 - squarenote 4, 15, 7, 1984 - squarenote 12, 14, 6, 1986 - squarenote 6, 11, 5, 1664 - squarenote 4, 12, 4, 1648 - squarenote 4, 11, 5, 1632 - squarenote 8, 12, 1, 1600 - endchannel +SFX_Cry0F_2_Ch5: + duty_cycle_pattern 241 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry0F_2_Ch5: - dutycycle 204 - squarenote 3, 12, 7, 1921 - squarenote 12, 11, 6, 1920 - squarenote 6, 10, 5, 1601 - squarenote 4, 12, 4, 1586 - squarenote 6, 11, 5, 1569 - squarenote 8, 10, 1, 1538 - endchannel +SFX_Cry0F_2_Ch6: + duty_cycle_pattern 204 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret -SFX_Cry0F_2_Ch7: - noisenote 3, 14, 4, 60 - noisenote 12, 13, 6, 44 - noisenote 4, 14, 4, 60 - noisenote 8, 11, 7, 92 - noisenote 15, 12, 2, 93 - endchannel +SFX_Cry0F_2_Ch8: + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 2705d73d..0d3d68b0 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,29 +1,29 @@ -SFX_Cry0F_3_Ch4: - dutycycle 241 - squarenote 4, 15, 7, 1984 - squarenote 12, 14, 6, 1986 - squarenote 6, 11, 5, 1664 - squarenote 4, 12, 4, 1648 - squarenote 4, 11, 5, 1632 - squarenote 8, 12, 1, 1600 - endchannel +SFX_Cry0F_3_Ch5: + duty_cycle_pattern 241 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry0F_3_Ch5: - dutycycle 204 - squarenote 3, 12, 7, 1921 - squarenote 12, 11, 6, 1920 - squarenote 6, 10, 5, 1601 - squarenote 4, 12, 4, 1586 - squarenote 6, 11, 5, 1569 - squarenote 8, 10, 1, 1538 - endchannel +SFX_Cry0F_3_Ch6: + duty_cycle_pattern 204 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret -SFX_Cry0F_3_Ch7: - noisenote 3, 14, 4, 60 - noisenote 12, 13, 6, 44 - noisenote 4, 14, 4, 60 - noisenote 8, 11, 7, 92 - noisenote 15, 12, 2, 93 - endchannel +SFX_Cry0F_3_Ch8: + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index 95c72f8a..bcaa75ac 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,31 +1,31 @@ -SFX_Cry10_1_Ch4: - dutycycle 201 - squarenote 8, 15, 7, 1664 - squarenote 2, 15, 7, 1632 - squarenote 1, 14, 7, 1600 - squarenote 1, 14, 7, 1568 - squarenote 15, 13, 1, 1536 - squarenote 4, 12, 7, 1856 - squarenote 4, 10, 7, 1840 - squarenote 15, 9, 1, 1824 - endchannel +SFX_Cry10_1_Ch5: + duty_cycle_pattern 201 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret -SFX_Cry10_1_Ch5: - dutycycle 121 - squarenote 10, 14, 7, 1666 - squarenote 2, 14, 7, 1634 - squarenote 1, 13, 7, 1602 - squarenote 1, 13, 7, 1570 - squarenote 15, 12, 1, 1538 - squarenote 4, 11, 7, 1858 - squarenote 2, 9, 7, 1842 - squarenote 15, 8, 1, 1826 - endchannel +SFX_Cry10_1_Ch6: + duty_cycle_pattern 121 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret -SFX_Cry10_1_Ch7: - noisenote 4, 7, 4, 33 - noisenote 4, 7, 4, 16 - noisenote 4, 7, 1, 32 - endchannel +SFX_Cry10_1_Ch8: + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index 569e50e2..12c8322e 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,31 +1,31 @@ -SFX_Cry10_2_Ch4: - dutycycle 201 - squarenote 8, 15, 7, 1664 - squarenote 2, 15, 7, 1632 - squarenote 1, 14, 7, 1600 - squarenote 1, 14, 7, 1568 - squarenote 15, 13, 1, 1536 - squarenote 4, 12, 7, 1856 - squarenote 4, 10, 7, 1840 - squarenote 15, 9, 1, 1824 - endchannel +SFX_Cry10_2_Ch5: + duty_cycle_pattern 201 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret -SFX_Cry10_2_Ch5: - dutycycle 121 - squarenote 10, 14, 7, 1666 - squarenote 2, 14, 7, 1634 - squarenote 1, 13, 7, 1602 - squarenote 1, 13, 7, 1570 - squarenote 15, 12, 1, 1538 - squarenote 4, 11, 7, 1858 - squarenote 2, 9, 7, 1842 - squarenote 15, 8, 1, 1826 - endchannel +SFX_Cry10_2_Ch6: + duty_cycle_pattern 121 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret -SFX_Cry10_2_Ch7: - noisenote 4, 7, 4, 33 - noisenote 4, 7, 4, 16 - noisenote 4, 7, 1, 32 - endchannel +SFX_Cry10_2_Ch8: + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index 1ac5776b..ac7b4655 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,31 +1,31 @@ -SFX_Cry10_3_Ch4: - dutycycle 201 - squarenote 8, 15, 7, 1664 - squarenote 2, 15, 7, 1632 - squarenote 1, 14, 7, 1600 - squarenote 1, 14, 7, 1568 - squarenote 15, 13, 1, 1536 - squarenote 4, 12, 7, 1856 - squarenote 4, 10, 7, 1840 - squarenote 15, 9, 1, 1824 - endchannel +SFX_Cry10_3_Ch5: + duty_cycle_pattern 201 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret -SFX_Cry10_3_Ch5: - dutycycle 121 - squarenote 10, 14, 7, 1666 - squarenote 2, 14, 7, 1634 - squarenote 1, 13, 7, 1602 - squarenote 1, 13, 7, 1570 - squarenote 15, 12, 1, 1538 - squarenote 4, 11, 7, 1858 - squarenote 2, 9, 7, 1842 - squarenote 15, 8, 1, 1826 - endchannel +SFX_Cry10_3_Ch6: + duty_cycle_pattern 121 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret -SFX_Cry10_3_Ch7: - noisenote 4, 7, 4, 33 - noisenote 4, 7, 4, 16 - noisenote 4, 7, 1, 32 - endchannel +SFX_Cry10_3_Ch8: + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index 5af0fef3..5616317e 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,34 +1,34 @@ -SFX_Cry11_1_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1952 - squarenote 8, 14, 6, 1956 - squarenote 4, 13, 6, 1952 - squarenote 15, 13, 3, 1824 - squarenote 8, 12, 3, 1827 - squarenote 2, 12, 2, 1832 - squarenote 8, 11, 1, 1840 - endchannel +SFX_Cry11_1_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret -SFX_Cry11_1_Ch5: - dutycycle 10 - squarenote 4, 0, 8, 0 - squarenote 6, 10, 7, 1857 - squarenote 8, 8, 6, 1859 - squarenote 4, 7, 6, 1857 - squarenote 13, 8, 3, 1730 - squarenote 7, 7, 3, 1729 - squarenote 3, 8, 2, 1740 - squarenote 8, 7, 1, 1752 - endchannel +SFX_Cry11_1_Ch6: + duty_cycle_pattern 10 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret -SFX_Cry11_1_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 6, 58 - noisenote 4, 13, 7, 58 - noisenote 6, 13, 6, 44 - noisenote 8, 14, 5, 60 - noisenote 12, 13, 2, 61 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry11_1_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index 6000549a..9ff4396d 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,34 +1,34 @@ -SFX_Cry11_2_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1952 - squarenote 8, 14, 6, 1956 - squarenote 4, 13, 6, 1952 - squarenote 15, 13, 3, 1824 - squarenote 8, 12, 3, 1827 - squarenote 2, 12, 2, 1832 - squarenote 8, 11, 1, 1840 - endchannel +SFX_Cry11_2_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret -SFX_Cry11_2_Ch5: - dutycycle 10 - squarenote 4, 0, 8, 0 - squarenote 6, 10, 7, 1857 - squarenote 8, 8, 6, 1859 - squarenote 4, 7, 6, 1857 - squarenote 13, 8, 3, 1730 - squarenote 7, 7, 3, 1729 - squarenote 3, 8, 2, 1740 - squarenote 8, 7, 1, 1752 - endchannel +SFX_Cry11_2_Ch6: + duty_cycle_pattern 10 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret -SFX_Cry11_2_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 6, 58 - noisenote 4, 13, 7, 58 - noisenote 6, 13, 6, 44 - noisenote 8, 14, 5, 60 - noisenote 12, 13, 2, 61 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry11_2_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index c877f28a..43b95fe8 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,34 +1,34 @@ -SFX_Cry11_3_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1952 - squarenote 8, 14, 6, 1956 - squarenote 4, 13, 6, 1952 - squarenote 15, 13, 3, 1824 - squarenote 8, 12, 3, 1827 - squarenote 2, 12, 2, 1832 - squarenote 8, 11, 1, 1840 - endchannel +SFX_Cry11_3_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret -SFX_Cry11_3_Ch5: - dutycycle 10 - squarenote 4, 0, 8, 0 - squarenote 6, 10, 7, 1857 - squarenote 8, 8, 6, 1859 - squarenote 4, 7, 6, 1857 - squarenote 13, 8, 3, 1730 - squarenote 7, 7, 3, 1729 - squarenote 3, 8, 2, 1740 - squarenote 8, 7, 1, 1752 - endchannel +SFX_Cry11_3_Ch6: + duty_cycle_pattern 10 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret -SFX_Cry11_3_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 6, 58 - noisenote 4, 13, 7, 58 - noisenote 6, 13, 6, 44 - noisenote 8, 14, 5, 60 - noisenote 12, 13, 2, 61 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry11_3_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index a453a110..c87d178d 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,24 +1,24 @@ -SFX_Cry12_1_Ch4: - dutycycle 165 - squarenote 12, 15, 2, 1088 - squarenote 15, 14, 3, 1184 - squarenote 4, 13, 2, 1168 - squarenote 8, 13, 1, 1152 - endchannel +SFX_Cry12_1_Ch5: + duty_cycle_pattern 165 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret -SFX_Cry12_1_Ch5: - dutycycle 238 - squarenote 11, 13, 2, 1080 - squarenote 14, 12, 6, 1176 - squarenote 3, 11, 2, 1160 - squarenote 8, 11, 1, 1144 - endchannel +SFX_Cry12_1_Ch6: + duty_cycle_pattern 238 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret -SFX_Cry12_1_Ch7: - noisenote 10, 14, 6, 108 - noisenote 15, 13, 2, 92 - noisenote 3, 12, 2, 108 - noisenote 8, 13, 1, 92 - endchannel +SFX_Cry12_1_Ch8: + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index 4f3d39e4..921b27be 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,24 +1,24 @@ -SFX_Cry12_2_Ch4: - dutycycle 165 - squarenote 12, 15, 2, 1088 - squarenote 15, 14, 3, 1184 - squarenote 4, 13, 2, 1168 - squarenote 8, 13, 1, 1152 - endchannel +SFX_Cry12_2_Ch5: + duty_cycle_pattern 165 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret -SFX_Cry12_2_Ch5: - dutycycle 238 - squarenote 11, 13, 2, 1080 - squarenote 14, 12, 6, 1176 - squarenote 3, 11, 2, 1160 - squarenote 8, 11, 1, 1144 - endchannel +SFX_Cry12_2_Ch6: + duty_cycle_pattern 238 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret -SFX_Cry12_2_Ch7: - noisenote 10, 14, 6, 108 - noisenote 15, 13, 2, 92 - noisenote 3, 12, 2, 108 - noisenote 8, 13, 1, 92 - endchannel +SFX_Cry12_2_Ch8: + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index 033b02bb..98569ea8 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,24 +1,24 @@ -SFX_Cry12_3_Ch4: - dutycycle 165 - squarenote 12, 15, 2, 1088 - squarenote 15, 14, 3, 1184 - squarenote 4, 13, 2, 1168 - squarenote 8, 13, 1, 1152 - endchannel +SFX_Cry12_3_Ch5: + duty_cycle_pattern 165 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret -SFX_Cry12_3_Ch5: - dutycycle 238 - squarenote 11, 13, 2, 1080 - squarenote 14, 12, 6, 1176 - squarenote 3, 11, 2, 1160 - squarenote 8, 11, 1, 1144 - endchannel +SFX_Cry12_3_Ch6: + duty_cycle_pattern 238 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret -SFX_Cry12_3_Ch7: - noisenote 10, 14, 6, 108 - noisenote 15, 13, 2, 92 - noisenote 3, 12, 2, 108 - noisenote 8, 13, 1, 92 - endchannel +SFX_Cry12_3_Ch8: + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index 67db31fe..6392f327 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,30 +1,30 @@ -SFX_Cry13_1_Ch4: - dutycycle 51 - squarenote 15, 15, 6, 1472 - squarenote 8, 14, 3, 1468 - squarenote 6, 13, 2, 1488 - squarenote 6, 11, 2, 1504 - squarenote 6, 12, 2, 1520 - squarenote 8, 11, 1, 1536 - endchannel +SFX_Cry13_1_Ch5: + duty_cycle_pattern 51 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret -SFX_Cry13_1_Ch5: - dutycycle 153 - squarenote 14, 12, 6, 1201 - squarenote 7, 12, 3, 1197 - squarenote 5, 11, 2, 1217 - squarenote 8, 9, 2, 1233 - squarenote 6, 10, 2, 1249 - squarenote 8, 9, 1, 1265 - endchannel +SFX_Cry13_1_Ch6: + duty_cycle_pattern 153 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret -SFX_Cry13_1_Ch7: - noisenote 10, 14, 6, 92 - noisenote 10, 13, 6, 108 - noisenote 4, 12, 2, 76 - noisenote 6, 13, 3, 92 - noisenote 8, 11, 3, 76 - noisenote 8, 10, 1, 92 - endchannel +SFX_Cry13_1_Ch8: + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index f1262bdc..0247bc39 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,30 +1,30 @@ -SFX_Cry13_2_Ch4: - dutycycle 51 - squarenote 15, 15, 6, 1472 - squarenote 8, 14, 3, 1468 - squarenote 6, 13, 2, 1488 - squarenote 6, 11, 2, 1504 - squarenote 6, 12, 2, 1520 - squarenote 8, 11, 1, 1536 - endchannel +SFX_Cry13_2_Ch5: + duty_cycle_pattern 51 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret -SFX_Cry13_2_Ch5: - dutycycle 153 - squarenote 14, 12, 6, 1201 - squarenote 7, 12, 3, 1197 - squarenote 5, 11, 2, 1217 - squarenote 8, 9, 2, 1233 - squarenote 6, 10, 2, 1249 - squarenote 8, 9, 1, 1265 - endchannel +SFX_Cry13_2_Ch6: + duty_cycle_pattern 153 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret -SFX_Cry13_2_Ch7: - noisenote 10, 14, 6, 92 - noisenote 10, 13, 6, 108 - noisenote 4, 12, 2, 76 - noisenote 6, 13, 3, 92 - noisenote 8, 11, 3, 76 - noisenote 8, 10, 1, 92 - endchannel +SFX_Cry13_2_Ch8: + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index f81dbe29..99871861 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,30 +1,30 @@ -SFX_Cry13_3_Ch4: - dutycycle 51 - squarenote 15, 15, 6, 1472 - squarenote 8, 14, 3, 1468 - squarenote 6, 13, 2, 1488 - squarenote 6, 11, 2, 1504 - squarenote 6, 12, 2, 1520 - squarenote 8, 11, 1, 1536 - endchannel +SFX_Cry13_3_Ch5: + duty_cycle_pattern 51 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret -SFX_Cry13_3_Ch5: - dutycycle 153 - squarenote 14, 12, 6, 1201 - squarenote 7, 12, 3, 1197 - squarenote 5, 11, 2, 1217 - squarenote 8, 9, 2, 1233 - squarenote 6, 10, 2, 1249 - squarenote 8, 9, 1, 1265 - endchannel +SFX_Cry13_3_Ch6: + duty_cycle_pattern 153 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret -SFX_Cry13_3_Ch7: - noisenote 10, 14, 6, 92 - noisenote 10, 13, 6, 108 - noisenote 4, 12, 2, 76 - noisenote 6, 13, 3, 92 - noisenote 8, 11, 3, 76 - noisenote 8, 10, 1, 92 - endchannel +SFX_Cry13_3_Ch8: + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index b066f5fc..99d8d8d3 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,21 +1,21 @@ -SFX_Cry14_1_Ch4: - dutycycle 240 - squarenote 8, 14, 4, 1936 - squarenote 15, 15, 5, 1984 - squarenote 8, 13, 1, 2008 - endchannel +SFX_Cry14_1_Ch5: + duty_cycle_pattern 240 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret -SFX_Cry14_1_Ch5: - dutycycle 165 - squarenote 10, 12, 4, 1905 - squarenote 15, 11, 6, 1954 - squarenote 8, 10, 1, 1975 - endchannel +SFX_Cry14_1_Ch6: + duty_cycle_pattern 165 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret -SFX_Cry14_1_Ch7: - noisenote 8, 14, 4, 76 - noisenote 14, 12, 4, 60 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry14_1_Ch8: + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index 36c8e5aa..28062bc7 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,21 +1,21 @@ -SFX_Cry14_2_Ch4: - dutycycle 240 - squarenote 8, 14, 4, 1936 - squarenote 15, 15, 5, 1984 - squarenote 8, 13, 1, 2008 - endchannel +SFX_Cry14_2_Ch5: + duty_cycle_pattern 240 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret -SFX_Cry14_2_Ch5: - dutycycle 165 - squarenote 10, 12, 4, 1905 - squarenote 15, 11, 6, 1954 - squarenote 8, 10, 1, 1975 - endchannel +SFX_Cry14_2_Ch6: + duty_cycle_pattern 165 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret -SFX_Cry14_2_Ch7: - noisenote 8, 14, 4, 76 - noisenote 14, 12, 4, 60 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry14_2_Ch8: + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index ce4a27b9..81bd63ca 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,21 +1,21 @@ -SFX_Cry14_3_Ch4: - dutycycle 240 - squarenote 8, 14, 4, 1936 - squarenote 15, 15, 5, 1984 - squarenote 8, 13, 1, 2008 - endchannel +SFX_Cry14_3_Ch5: + duty_cycle_pattern 240 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret -SFX_Cry14_3_Ch5: - dutycycle 165 - squarenote 10, 12, 4, 1905 - squarenote 15, 11, 6, 1954 - squarenote 8, 10, 1, 1975 - endchannel +SFX_Cry14_3_Ch6: + duty_cycle_pattern 165 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret -SFX_Cry14_3_Ch7: - noisenote 8, 14, 4, 76 - noisenote 14, 12, 4, 60 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry14_3_Ch8: + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index d9966782..aaa6656e 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,30 +1,30 @@ -SFX_Cry15_1_Ch4: - dutycycle 240 - squarenote 4, 15, 3, 1920 - squarenote 15, 14, 7, 1792 - squarenote 8, 13, 3, 1808 - squarenote 4, 12, 2, 1792 - squarenote 4, 13, 2, 1776 - squarenote 8, 12, 1, 1760 - endchannel +SFX_Cry15_1_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret -SFX_Cry15_1_Ch5: - dutycycle 90 - squarenote 6, 12, 3, 1793 - squarenote 14, 11, 7, 1665 - squarenote 7, 11, 3, 1682 - squarenote 3, 10, 2, 1665 - squarenote 4, 11, 2, 1650 - squarenote 8, 10, 1, 1633 - endchannel +SFX_Cry15_1_Ch6: + duty_cycle_pattern 90 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret -SFX_Cry15_1_Ch7: - noisenote 6, 14, 3, 92 - noisenote 14, 13, 6, 76 - noisenote 6, 12, 6, 60 - noisenote 3, 11, 3, 76 - noisenote 3, 10, 2, 92 - noisenote 8, 11, 1, 108 - endchannel +SFX_Cry15_1_Ch8: + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 0fa8daf0..77ac9ffb 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,30 +1,30 @@ -SFX_Cry15_2_Ch4: - dutycycle 240 - squarenote 4, 15, 3, 1920 - squarenote 15, 14, 7, 1792 - squarenote 8, 13, 3, 1808 - squarenote 4, 12, 2, 1792 - squarenote 4, 13, 2, 1776 - squarenote 8, 12, 1, 1760 - endchannel +SFX_Cry15_2_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret -SFX_Cry15_2_Ch5: - dutycycle 90 - squarenote 6, 12, 3, 1793 - squarenote 14, 11, 7, 1665 - squarenote 7, 11, 3, 1682 - squarenote 3, 10, 2, 1665 - squarenote 4, 11, 2, 1650 - squarenote 8, 10, 1, 1633 - endchannel +SFX_Cry15_2_Ch6: + duty_cycle_pattern 90 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret -SFX_Cry15_2_Ch7: - noisenote 6, 14, 3, 92 - noisenote 14, 13, 6, 76 - noisenote 6, 12, 6, 60 - noisenote 3, 11, 3, 76 - noisenote 3, 10, 2, 92 - noisenote 8, 11, 1, 108 - endchannel +SFX_Cry15_2_Ch8: + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 5c4fe877..2e6a9d71 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,30 +1,30 @@ -SFX_Cry15_3_Ch4: - dutycycle 240 - squarenote 4, 15, 3, 1920 - squarenote 15, 14, 7, 1792 - squarenote 8, 13, 3, 1808 - squarenote 4, 12, 2, 1792 - squarenote 4, 13, 2, 1776 - squarenote 8, 12, 1, 1760 - endchannel +SFX_Cry15_3_Ch5: + duty_cycle_pattern 240 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret -SFX_Cry15_3_Ch5: - dutycycle 90 - squarenote 6, 12, 3, 1793 - squarenote 14, 11, 7, 1665 - squarenote 7, 11, 3, 1682 - squarenote 3, 10, 2, 1665 - squarenote 4, 11, 2, 1650 - squarenote 8, 10, 1, 1633 - endchannel +SFX_Cry15_3_Ch6: + duty_cycle_pattern 90 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret -SFX_Cry15_3_Ch7: - noisenote 6, 14, 3, 92 - noisenote 14, 13, 6, 76 - noisenote 6, 12, 6, 60 - noisenote 3, 11, 3, 76 - noisenote 3, 10, 2, 92 - noisenote 8, 11, 1, 108 - endchannel +SFX_Cry15_3_Ch8: + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index c6dcac1b..e0bf7c61 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,21 +1,21 @@ -SFX_Cry16_1_Ch4: - dutycycle 240 - squarenote 15, 13, 7, 1920 - squarenote 4, 14, 6, 1952 - squarenote 15, 13, 2, 1856 - endchannel +SFX_Cry16_1_Ch5: + duty_cycle_pattern 240 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret -SFX_Cry16_1_Ch5: - dutycycle 90 - squarenote 15, 12, 7, 1875 - squarenote 5, 11, 6, 1906 - squarenote 15, 12, 2, 1809 - endchannel +SFX_Cry16_1_Ch6: + duty_cycle_pattern 90 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret -SFX_Cry16_1_Ch7: - noisenote 13, 15, 6, 76 - noisenote 4, 14, 6, 60 - noisenote 15, 15, 2, 76 - endchannel +SFX_Cry16_1_Ch8: + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 1946c8f1..da03950f 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,21 +1,21 @@ -SFX_Cry16_2_Ch4: - dutycycle 240 - squarenote 15, 13, 7, 1920 - squarenote 4, 14, 6, 1952 - squarenote 15, 13, 2, 1856 - endchannel +SFX_Cry16_2_Ch5: + duty_cycle_pattern 240 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret -SFX_Cry16_2_Ch5: - dutycycle 90 - squarenote 15, 12, 7, 1875 - squarenote 5, 11, 6, 1906 - squarenote 15, 12, 2, 1809 - endchannel +SFX_Cry16_2_Ch6: + duty_cycle_pattern 90 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret -SFX_Cry16_2_Ch7: - noisenote 13, 15, 6, 76 - noisenote 4, 14, 6, 60 - noisenote 15, 15, 2, 76 - endchannel +SFX_Cry16_2_Ch8: + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index bc8ff2ba..248163fe 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,21 +1,21 @@ -SFX_Cry16_3_Ch4: - dutycycle 240 - squarenote 15, 13, 7, 1920 - squarenote 4, 14, 6, 1952 - squarenote 15, 13, 2, 1856 - endchannel +SFX_Cry16_3_Ch5: + duty_cycle_pattern 240 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret -SFX_Cry16_3_Ch5: - dutycycle 90 - squarenote 15, 12, 7, 1875 - squarenote 5, 11, 6, 1906 - squarenote 15, 12, 2, 1809 - endchannel +SFX_Cry16_3_Ch6: + duty_cycle_pattern 90 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret -SFX_Cry16_3_Ch7: - noisenote 13, 15, 6, 76 - noisenote 4, 14, 6, 60 - noisenote 15, 15, 2, 76 - endchannel +SFX_Cry16_3_Ch8: + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index 29b6fff2..699de068 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,24 +1,24 @@ -SFX_Cry17_1_Ch4: - dutycycle 15 - squarenote 15, 15, 7, 1280 - squarenote 15, 14, 7, 1288 - squarenote 8, 11, 4, 1152 - squarenote 15, 10, 2, 1120 - endchannel +SFX_Cry17_1_Ch5: + duty_cycle_pattern 15 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret -SFX_Cry17_1_Ch5: - dutycycle 68 - squarenote 14, 13, 7, 1153 - squarenote 14, 12, 7, 1161 - squarenote 10, 11, 4, 1025 - squarenote 15, 12, 2, 993 - endchannel +SFX_Cry17_1_Ch6: + duty_cycle_pattern 68 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret -SFX_Cry17_1_Ch7: - noisenote 14, 15, 7, 124 - noisenote 12, 15, 6, 108 - noisenote 9, 14, 4, 124 - noisenote 15, 14, 2, 108 - endchannel +SFX_Cry17_1_Ch8: + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index 4a42db48..2f143097 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,24 +1,24 @@ -SFX_Cry17_2_Ch4: - dutycycle 15 - squarenote 15, 15, 7, 1280 - squarenote 15, 14, 7, 1288 - squarenote 8, 11, 4, 1152 - squarenote 15, 10, 2, 1120 - endchannel +SFX_Cry17_2_Ch5: + duty_cycle_pattern 15 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret -SFX_Cry17_2_Ch5: - dutycycle 68 - squarenote 14, 13, 7, 1153 - squarenote 14, 12, 7, 1161 - squarenote 10, 11, 4, 1025 - squarenote 15, 12, 2, 993 - endchannel +SFX_Cry17_2_Ch6: + duty_cycle_pattern 68 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret -SFX_Cry17_2_Ch7: - noisenote 14, 15, 7, 124 - noisenote 12, 15, 6, 108 - noisenote 9, 14, 4, 124 - noisenote 15, 14, 2, 108 - endchannel +SFX_Cry17_2_Ch8: + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index 4340c97f..32bee883 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,24 +1,24 @@ -SFX_Cry17_3_Ch4: - dutycycle 15 - squarenote 15, 15, 7, 1280 - squarenote 15, 14, 7, 1288 - squarenote 8, 11, 4, 1152 - squarenote 15, 10, 2, 1120 - endchannel +SFX_Cry17_3_Ch5: + duty_cycle_pattern 15 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret -SFX_Cry17_3_Ch5: - dutycycle 68 - squarenote 14, 13, 7, 1153 - squarenote 14, 12, 7, 1161 - squarenote 10, 11, 4, 1025 - squarenote 15, 12, 2, 993 - endchannel +SFX_Cry17_3_Ch6: + duty_cycle_pattern 68 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret -SFX_Cry17_3_Ch7: - noisenote 14, 15, 7, 124 - noisenote 12, 15, 6, 108 - noisenote 9, 14, 4, 124 - noisenote 15, 14, 2, 108 - endchannel +SFX_Cry17_3_Ch8: + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index 8249731a..d326c2c3 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,34 +1,34 @@ -SFX_Cry18_1_Ch4: - dutycycle 80 - squarenote 10, 15, 5, 1664 - squarenote 3, 14, 2, 1696 - squarenote 3, 15, 2, 1728 - squarenote 3, 14, 2, 1760 - squarenote 3, 13, 2, 1792 - squarenote 3, 12, 2, 1760 - squarenote 3, 13, 2, 1728 - squarenote 8, 12, 1, 1696 - endchannel +SFX_Cry18_1_Ch5: + duty_cycle_pattern 80 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret -SFX_Cry18_1_Ch5: - dutycycle 15 - squarenote 9, 13, 5, 1585 - squarenote 3, 13, 2, 1618 - squarenote 3, 14, 2, 1649 - squarenote 3, 11, 2, 1681 - squarenote 3, 12, 2, 1714 - squarenote 3, 11, 2, 1681 - squarenote 3, 12, 2, 1649 - squarenote 8, 11, 1, 1617 - endchannel +SFX_Cry18_1_Ch6: + duty_cycle_pattern 15 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret -SFX_Cry18_1_Ch7: - noisenote 6, 14, 3, 76 - noisenote 4, 12, 3, 60 - noisenote 5, 13, 4, 60 - noisenote 4, 12, 4, 44 - noisenote 6, 11, 4, 60 - noisenote 8, 12, 1, 44 - endchannel +SFX_Cry18_1_Ch8: + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 39f85b8f..1a81e1d3 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,34 +1,34 @@ -SFX_Cry18_2_Ch4: - dutycycle 80 - squarenote 10, 15, 5, 1664 - squarenote 3, 14, 2, 1696 - squarenote 3, 15, 2, 1728 - squarenote 3, 14, 2, 1760 - squarenote 3, 13, 2, 1792 - squarenote 3, 12, 2, 1760 - squarenote 3, 13, 2, 1728 - squarenote 8, 12, 1, 1696 - endchannel +SFX_Cry18_2_Ch5: + duty_cycle_pattern 80 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret -SFX_Cry18_2_Ch5: - dutycycle 15 - squarenote 9, 13, 5, 1585 - squarenote 3, 13, 2, 1618 - squarenote 3, 14, 2, 1649 - squarenote 3, 11, 2, 1681 - squarenote 3, 12, 2, 1714 - squarenote 3, 11, 2, 1681 - squarenote 3, 12, 2, 1649 - squarenote 8, 11, 1, 1617 - endchannel +SFX_Cry18_2_Ch6: + duty_cycle_pattern 15 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret -SFX_Cry18_2_Ch7: - noisenote 6, 14, 3, 76 - noisenote 4, 12, 3, 60 - noisenote 5, 13, 4, 60 - noisenote 4, 12, 4, 44 - noisenote 6, 11, 4, 60 - noisenote 8, 12, 1, 44 - endchannel +SFX_Cry18_2_Ch8: + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index 4bcf5b6d..7ca9f2c6 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,34 +1,34 @@ -SFX_Cry18_3_Ch4: - dutycycle 80 - squarenote 10, 15, 5, 1664 - squarenote 3, 14, 2, 1696 - squarenote 3, 15, 2, 1728 - squarenote 3, 14, 2, 1760 - squarenote 3, 13, 2, 1792 - squarenote 3, 12, 2, 1760 - squarenote 3, 13, 2, 1728 - squarenote 8, 12, 1, 1696 - endchannel +SFX_Cry18_3_Ch5: + duty_cycle_pattern 80 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret -SFX_Cry18_3_Ch5: - dutycycle 15 - squarenote 9, 13, 5, 1585 - squarenote 3, 13, 2, 1618 - squarenote 3, 14, 2, 1649 - squarenote 3, 11, 2, 1681 - squarenote 3, 12, 2, 1714 - squarenote 3, 11, 2, 1681 - squarenote 3, 12, 2, 1649 - squarenote 8, 11, 1, 1617 - endchannel +SFX_Cry18_3_Ch6: + duty_cycle_pattern 15 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret -SFX_Cry18_3_Ch7: - noisenote 6, 14, 3, 76 - noisenote 4, 12, 3, 60 - noisenote 5, 13, 4, 60 - noisenote 4, 12, 4, 44 - noisenote 6, 11, 4, 60 - noisenote 8, 12, 1, 44 - endchannel +SFX_Cry18_3_Ch8: + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index d0435941..6309f902 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,18 +1,18 @@ -SFX_Cry19_1_Ch4: - dutycycle 27 - squarenote 7, 13, 2, 1856 - squarenote 15, 14, 5, 1888 - squarenote 15, 12, 1, 1840 - endchannel +SFX_Cry19_1_Ch5: + duty_cycle_pattern 27 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 15, 12, 1, 1840 + sound_ret -SFX_Cry19_1_Ch5: - dutycycle 129 - squarenote 2, 12, 2, 1793 - squarenote 4, 12, 2, 1800 - squarenote 15, 13, 7, 1857 - squarenote 15, 10, 2, 1793 +SFX_Cry19_1_Ch6: + duty_cycle_pattern 129 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 15, 10, 2, 1793 -SFX_Cry19_1_Ch7: - endchannel +SFX_Cry19_1_Ch8: + sound_ret diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index b088c0de..e838612b 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,18 +1,18 @@ -SFX_Cry19_2_Ch4: - dutycycle 27 - squarenote 7, 13, 2, 1856 - squarenote 15, 14, 5, 1888 - squarenote 15, 12, 1, 1840 - endchannel +SFX_Cry19_2_Ch5: + duty_cycle_pattern 27 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 15, 12, 1, 1840 + sound_ret -SFX_Cry19_2_Ch5: - dutycycle 129 - squarenote 2, 12, 2, 1793 - squarenote 4, 12, 2, 1800 - squarenote 15, 13, 7, 1857 - squarenote 15, 10, 2, 1793 +SFX_Cry19_2_Ch6: + duty_cycle_pattern 129 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 15, 10, 2, 1793 -SFX_Cry19_2_Ch7: - endchannel +SFX_Cry19_2_Ch8: + sound_ret diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index e42489c4..51c113b6 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,18 +1,18 @@ -SFX_Cry19_3_Ch4: - dutycycle 27 - squarenote 7, 13, 2, 1856 - squarenote 15, 14, 5, 1888 - squarenote 15, 12, 1, 1840 - endchannel +SFX_Cry19_3_Ch5: + duty_cycle_pattern 27 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 15, 12, 1, 1840 + sound_ret -SFX_Cry19_3_Ch5: - dutycycle 129 - squarenote 2, 12, 2, 1793 - squarenote 4, 12, 2, 1800 - squarenote 15, 13, 7, 1857 - squarenote 15, 10, 2, 1793 +SFX_Cry19_3_Ch6: + duty_cycle_pattern 129 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 15, 10, 2, 1793 -SFX_Cry19_3_Ch7: - endchannel +SFX_Cry19_3_Ch8: + sound_ret diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index 8bbf8288..3209263a 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,30 +1,30 @@ -SFX_Cry1A_1_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1856 - squarenote 12, 14, 6, 1860 - squarenote 6, 13, 5, 1872 - squarenote 4, 12, 3, 1888 - squarenote 3, 12, 3, 1920 - squarenote 8, 13, 1, 1952 - endchannel +SFX_Cry1A_1_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret -SFX_Cry1A_1_Ch5: - dutycycle 10 - squarenote 6, 12, 7, 1793 - squarenote 11, 11, 6, 1794 - squarenote 6, 10, 5, 1809 - squarenote 4, 9, 3, 1825 - squarenote 3, 10, 3, 1857 - squarenote 8, 9, 1, 1890 - endchannel +SFX_Cry1A_1_Ch6: + duty_cycle_pattern 10 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret -SFX_Cry1A_1_Ch7: - noisenote 3, 14, 2, 60 - noisenote 8, 13, 6, 76 - noisenote 5, 13, 4, 60 - noisenote 12, 12, 7, 76 - noisenote 2, 14, 2, 60 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry1A_1_Ch8: + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index b6ed820b..a8dca4fc 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,30 +1,30 @@ -SFX_Cry1A_2_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1856 - squarenote 12, 14, 6, 1860 - squarenote 6, 13, 5, 1872 - squarenote 4, 12, 3, 1888 - squarenote 3, 12, 3, 1920 - squarenote 8, 13, 1, 1952 - endchannel +SFX_Cry1A_2_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret -SFX_Cry1A_2_Ch5: - dutycycle 10 - squarenote 6, 12, 7, 1793 - squarenote 11, 11, 6, 1794 - squarenote 6, 10, 5, 1809 - squarenote 4, 9, 3, 1825 - squarenote 3, 10, 3, 1857 - squarenote 8, 9, 1, 1890 - endchannel +SFX_Cry1A_2_Ch6: + duty_cycle_pattern 10 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret -SFX_Cry1A_2_Ch7: - noisenote 3, 14, 2, 60 - noisenote 8, 13, 6, 76 - noisenote 5, 13, 4, 60 - noisenote 12, 12, 7, 76 - noisenote 2, 14, 2, 60 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry1A_2_Ch8: + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index aee947cd..0fc9574d 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,30 +1,30 @@ -SFX_Cry1A_3_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1856 - squarenote 12, 14, 6, 1860 - squarenote 6, 13, 5, 1872 - squarenote 4, 12, 3, 1888 - squarenote 3, 12, 3, 1920 - squarenote 8, 13, 1, 1952 - endchannel +SFX_Cry1A_3_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret -SFX_Cry1A_3_Ch5: - dutycycle 10 - squarenote 6, 12, 7, 1793 - squarenote 11, 11, 6, 1794 - squarenote 6, 10, 5, 1809 - squarenote 4, 9, 3, 1825 - squarenote 3, 10, 3, 1857 - squarenote 8, 9, 1, 1890 - endchannel +SFX_Cry1A_3_Ch6: + duty_cycle_pattern 10 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret -SFX_Cry1A_3_Ch7: - noisenote 3, 14, 2, 60 - noisenote 8, 13, 6, 76 - noisenote 5, 13, 4, 60 - noisenote 12, 12, 7, 76 - noisenote 2, 14, 2, 60 - noisenote 8, 13, 1, 44 - endchannel +SFX_Cry1A_3_Ch8: + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index 86f3d421..8a228ec3 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,26 +1,26 @@ -SFX_Cry1B_1_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1728 - squarenote 15, 14, 7, 1792 - squarenote 4, 15, 4, 1776 - squarenote 4, 14, 4, 1760 - squarenote 8, 13, 1, 1744 - endchannel +SFX_Cry1B_1_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret -SFX_Cry1B_1_Ch5: - dutycycle 10 - squarenote 7, 14, 6, 1665 - squarenote 14, 13, 5, 1729 - squarenote 4, 12, 4, 1713 - squarenote 4, 13, 4, 1697 - squarenote 8, 12, 1, 1681 - endchannel +SFX_Cry1B_1_Ch6: + duty_cycle_pattern 10 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret -SFX_Cry1B_1_Ch7: - noisenote 10, 10, 6, 60 - noisenote 14, 9, 4, 44 - noisenote 5, 10, 3, 60 - noisenote 8, 9, 1, 44 - endchannel +SFX_Cry1B_1_Ch8: + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index 1faaf5bb..97f85337 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,26 +1,26 @@ -SFX_Cry1B_2_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1728 - squarenote 15, 14, 7, 1792 - squarenote 4, 15, 4, 1776 - squarenote 4, 14, 4, 1760 - squarenote 8, 13, 1, 1744 - endchannel +SFX_Cry1B_2_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret -SFX_Cry1B_2_Ch5: - dutycycle 10 - squarenote 7, 14, 6, 1665 - squarenote 14, 13, 5, 1729 - squarenote 4, 12, 4, 1713 - squarenote 4, 13, 4, 1697 - squarenote 8, 12, 1, 1681 - endchannel +SFX_Cry1B_2_Ch6: + duty_cycle_pattern 10 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret -SFX_Cry1B_2_Ch7: - noisenote 10, 10, 6, 60 - noisenote 14, 9, 4, 44 - noisenote 5, 10, 3, 60 - noisenote 8, 9, 1, 44 - endchannel +SFX_Cry1B_2_Ch8: + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index 09196c26..27b7f633 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,26 +1,26 @@ -SFX_Cry1B_3_Ch4: - dutycycle 240 - squarenote 6, 15, 7, 1728 - squarenote 15, 14, 7, 1792 - squarenote 4, 15, 4, 1776 - squarenote 4, 14, 4, 1760 - squarenote 8, 13, 1, 1744 - endchannel +SFX_Cry1B_3_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret -SFX_Cry1B_3_Ch5: - dutycycle 10 - squarenote 7, 14, 6, 1665 - squarenote 14, 13, 5, 1729 - squarenote 4, 12, 4, 1713 - squarenote 4, 13, 4, 1697 - squarenote 8, 12, 1, 1681 - endchannel +SFX_Cry1B_3_Ch6: + duty_cycle_pattern 10 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret -SFX_Cry1B_3_Ch7: - noisenote 10, 10, 6, 60 - noisenote 14, 9, 4, 44 - noisenote 5, 10, 3, 60 - noisenote 8, 9, 1, 44 - endchannel +SFX_Cry1B_3_Ch8: + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index 2fd4f7b2..50e29a0e 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,31 +1,31 @@ -SFX_Cry1C_1_Ch4: - dutycycle 245 - squarenote 7, 13, 6, 2017 - squarenote 6, 12, 6, 2018 - squarenote 9, 13, 6, 2017 - squarenote 7, 12, 6, 2016 - squarenote 5, 11, 6, 2018 - squarenote 7, 12, 6, 2017 - squarenote 6, 11, 6, 2016 - squarenote 8, 10, 1, 2015 - endchannel +SFX_Cry1C_1_Ch5: + duty_cycle_pattern 245 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret -SFX_Cry1C_1_Ch5: - dutycycle 68 - squarenote 6, 12, 3, 1993 - squarenote 6, 11, 3, 1991 - squarenote 10, 12, 4, 1987 - squarenote 8, 11, 4, 1991 - squarenote 6, 12, 3, 1993 - squarenote 15, 10, 2, 1989 - endchannel +SFX_Cry1C_1_Ch6: + duty_cycle_pattern 68 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret -SFX_Cry1C_1_Ch7: - noisenote 13, 1, -1, 124 - noisenote 13, 15, 7, 140 - noisenote 12, 13, 6, 124 - noisenote 8, 12, 4, 108 - noisenote 15, 11, 3, 92 - endchannel +SFX_Cry1C_1_Ch8: + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index 69a08eef..e73f557c 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,31 +1,31 @@ -SFX_Cry1C_2_Ch4: - dutycycle 245 - squarenote 7, 13, 6, 2017 - squarenote 6, 12, 6, 2018 - squarenote 9, 13, 6, 2017 - squarenote 7, 12, 6, 2016 - squarenote 5, 11, 6, 2018 - squarenote 7, 12, 6, 2017 - squarenote 6, 11, 6, 2016 - squarenote 8, 10, 1, 2015 - endchannel +SFX_Cry1C_2_Ch5: + duty_cycle_pattern 245 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret -SFX_Cry1C_2_Ch5: - dutycycle 68 - squarenote 6, 12, 3, 1993 - squarenote 6, 11, 3, 1991 - squarenote 10, 12, 4, 1987 - squarenote 8, 11, 4, 1991 - squarenote 6, 12, 3, 1993 - squarenote 15, 10, 2, 1989 - endchannel +SFX_Cry1C_2_Ch6: + duty_cycle_pattern 68 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret -SFX_Cry1C_2_Ch7: - noisenote 13, 1, -1, 124 - noisenote 13, 15, 7, 140 - noisenote 12, 13, 6, 124 - noisenote 8, 12, 4, 108 - noisenote 15, 11, 3, 92 - endchannel +SFX_Cry1C_2_Ch8: + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 59f69402..282804b2 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,31 +1,31 @@ -SFX_Cry1C_3_Ch4: - dutycycle 245 - squarenote 7, 13, 6, 2017 - squarenote 6, 12, 6, 2018 - squarenote 9, 13, 6, 2017 - squarenote 7, 12, 6, 2016 - squarenote 5, 11, 6, 2018 - squarenote 7, 12, 6, 2017 - squarenote 6, 11, 6, 2016 - squarenote 8, 10, 1, 2015 - endchannel +SFX_Cry1C_3_Ch5: + duty_cycle_pattern 245 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret -SFX_Cry1C_3_Ch5: - dutycycle 68 - squarenote 6, 12, 3, 1993 - squarenote 6, 11, 3, 1991 - squarenote 10, 12, 4, 1987 - squarenote 8, 11, 4, 1991 - squarenote 6, 12, 3, 1993 - squarenote 15, 10, 2, 1989 - endchannel +SFX_Cry1C_3_Ch6: + duty_cycle_pattern 68 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret -SFX_Cry1C_3_Ch7: - noisenote 13, 1, -1, 124 - noisenote 13, 15, 7, 140 - noisenote 12, 13, 6, 124 - noisenote 8, 12, 4, 108 - noisenote 15, 11, 3, 92 - endchannel +SFX_Cry1C_3_Ch8: + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 4cef3bf0..97fd2d31 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,29 +1,29 @@ -SFX_Cry1D_1_Ch4: - dutycycle 244 - squarenote 15, 15, 0, 1797 - squarenote 10, 14, 0, 1792 - squarenote 6, 11, 4, 1808 - squarenote 4, 13, 3, 1792 - squarenote 6, 11, 2, 1568 - squarenote 8, 10, 1, 1572 - endchannel +SFX_Cry1D_1_Ch5: + duty_cycle_pattern 244 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret -SFX_Cry1D_1_Ch5: - dutycycle 34 - squarenote 15, 11, 0, 1731 - squarenote 10, 10, 0, 1729 - squarenote 6, 8, 4, 1746 - squarenote 4, 9, 3, 1729 - squarenote 6, 8, 2, 1505 - squarenote 8, 6, 1, 1512 - endchannel +SFX_Cry1D_1_Ch6: + duty_cycle_pattern 34 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret -SFX_Cry1D_1_Ch7: - noisenote 6, 14, 6, 76 - noisenote 15, 13, 6, 60 - noisenote 10, 12, 5, 74 - noisenote 1, 11, 2, 91 - noisenote 15, 12, 2, 76 - endchannel +SFX_Cry1D_1_Ch8: + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index 874be61e..5fc0a453 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,29 +1,29 @@ -SFX_Cry1D_2_Ch4: - dutycycle 244 - squarenote 15, 15, 0, 1797 - squarenote 10, 14, 0, 1792 - squarenote 6, 11, 4, 1808 - squarenote 4, 13, 3, 1792 - squarenote 6, 11, 2, 1568 - squarenote 8, 10, 1, 1572 - endchannel +SFX_Cry1D_2_Ch5: + duty_cycle_pattern 244 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret -SFX_Cry1D_2_Ch5: - dutycycle 34 - squarenote 15, 11, 0, 1731 - squarenote 10, 10, 0, 1729 - squarenote 6, 8, 4, 1746 - squarenote 4, 9, 3, 1729 - squarenote 6, 8, 2, 1505 - squarenote 8, 6, 1, 1512 - endchannel +SFX_Cry1D_2_Ch6: + duty_cycle_pattern 34 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret -SFX_Cry1D_2_Ch7: - noisenote 6, 14, 6, 76 - noisenote 15, 13, 6, 60 - noisenote 10, 12, 5, 74 - noisenote 1, 11, 2, 91 - noisenote 15, 12, 2, 76 - endchannel +SFX_Cry1D_2_Ch8: + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index 991e44bb..f86dd102 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,29 +1,29 @@ -SFX_Cry1D_3_Ch4: - dutycycle 244 - squarenote 15, 15, 0, 1797 - squarenote 10, 14, 0, 1792 - squarenote 6, 11, 4, 1808 - squarenote 4, 13, 3, 1792 - squarenote 6, 11, 2, 1568 - squarenote 8, 10, 1, 1572 - endchannel +SFX_Cry1D_3_Ch5: + duty_cycle_pattern 244 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret -SFX_Cry1D_3_Ch5: - dutycycle 34 - squarenote 15, 11, 0, 1731 - squarenote 10, 10, 0, 1729 - squarenote 6, 8, 4, 1746 - squarenote 4, 9, 3, 1729 - squarenote 6, 8, 2, 1505 - squarenote 8, 6, 1, 1512 - endchannel +SFX_Cry1D_3_Ch6: + duty_cycle_pattern 34 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret -SFX_Cry1D_3_Ch7: - noisenote 6, 14, 6, 76 - noisenote 15, 13, 6, 60 - noisenote 10, 12, 5, 74 - noisenote 1, 11, 2, 91 - noisenote 15, 12, 2, 76 - endchannel +SFX_Cry1D_3_Ch8: + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index b028e616..c3106e7b 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,38 +1,38 @@ -SFX_Cry1E_1_Ch4: - dutycycle 240 - squarenote 6, 15, 2, 1536 - squarenote 6, 14, 2, 1600 - squarenote 6, 13, 2, 1664 - squarenote 6, 14, 2, 1728 - squarenote 6, 13, 2, 1792 - squarenote 6, 12, 2, 1856 - squarenote 6, 11, 2, 1920 - squarenote 8, 10, 1, 1984 - endchannel +SFX_Cry1E_1_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret -SFX_Cry1E_1_Ch5: - dutycycle 17 - squarenote 3, 0, 8, 1 - squarenote 6, 12, 2, 1473 - squarenote 6, 11, 2, 1538 - squarenote 6, 10, 2, 1601 - squarenote 6, 11, 2, 1666 - squarenote 6, 10, 2, 1730 - squarenote 6, 9, 2, 1793 - squarenote 6, 10, 2, 1858 - squarenote 8, 8, 1, 1921 - endchannel +SFX_Cry1E_1_Ch6: + duty_cycle_pattern 17 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret -SFX_Cry1E_1_Ch7: - noisenote 6, 0, 8, 1 - noisenote 5, 14, 2, 92 - noisenote 5, 12, 2, 76 - noisenote 5, 13, 2, 60 - noisenote 5, 11, 2, 44 - noisenote 5, 12, 2, 28 - noisenote 5, 10, 2, 27 - noisenote 5, 9, 2, 26 - noisenote 8, 8, 1, 24 - endchannel +SFX_Cry1E_1_Ch8: + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index 783ee324..1c904ce4 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,38 +1,38 @@ -SFX_Cry1E_2_Ch4: - dutycycle 240 - squarenote 6, 15, 2, 1536 - squarenote 6, 14, 2, 1600 - squarenote 6, 13, 2, 1664 - squarenote 6, 14, 2, 1728 - squarenote 6, 13, 2, 1792 - squarenote 6, 12, 2, 1856 - squarenote 6, 11, 2, 1920 - squarenote 8, 10, 1, 1984 - endchannel +SFX_Cry1E_2_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret -SFX_Cry1E_2_Ch5: - dutycycle 17 - squarenote 3, 0, 8, 1 - squarenote 6, 12, 2, 1473 - squarenote 6, 11, 2, 1538 - squarenote 6, 10, 2, 1601 - squarenote 6, 11, 2, 1666 - squarenote 6, 10, 2, 1730 - squarenote 6, 9, 2, 1793 - squarenote 6, 10, 2, 1858 - squarenote 8, 8, 1, 1921 - endchannel +SFX_Cry1E_2_Ch6: + duty_cycle_pattern 17 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret -SFX_Cry1E_2_Ch7: - noisenote 6, 0, 8, 1 - noisenote 5, 14, 2, 92 - noisenote 5, 12, 2, 76 - noisenote 5, 13, 2, 60 - noisenote 5, 11, 2, 44 - noisenote 5, 12, 2, 28 - noisenote 5, 10, 2, 27 - noisenote 5, 9, 2, 26 - noisenote 8, 8, 1, 24 - endchannel +SFX_Cry1E_2_Ch8: + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index f78e6d0a..6fae812c 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,38 +1,38 @@ -SFX_Cry1E_3_Ch4: - dutycycle 240 - squarenote 6, 15, 2, 1536 - squarenote 6, 14, 2, 1600 - squarenote 6, 13, 2, 1664 - squarenote 6, 14, 2, 1728 - squarenote 6, 13, 2, 1792 - squarenote 6, 12, 2, 1856 - squarenote 6, 11, 2, 1920 - squarenote 8, 10, 1, 1984 - endchannel +SFX_Cry1E_3_Ch5: + duty_cycle_pattern 240 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret -SFX_Cry1E_3_Ch5: - dutycycle 17 - squarenote 3, 0, 8, 1 - squarenote 6, 12, 2, 1473 - squarenote 6, 11, 2, 1538 - squarenote 6, 10, 2, 1601 - squarenote 6, 11, 2, 1666 - squarenote 6, 10, 2, 1730 - squarenote 6, 9, 2, 1793 - squarenote 6, 10, 2, 1858 - squarenote 8, 8, 1, 1921 - endchannel +SFX_Cry1E_3_Ch6: + duty_cycle_pattern 17 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret -SFX_Cry1E_3_Ch7: - noisenote 6, 0, 8, 1 - noisenote 5, 14, 2, 92 - noisenote 5, 12, 2, 76 - noisenote 5, 13, 2, 60 - noisenote 5, 11, 2, 44 - noisenote 5, 12, 2, 28 - noisenote 5, 10, 2, 27 - noisenote 5, 9, 2, 26 - noisenote 8, 8, 1, 24 - endchannel +SFX_Cry1E_3_Ch8: + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index f4596492..63148b92 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,24 +1,24 @@ -SFX_Cry1F_1_Ch4: - dutycycle 165 - squarenote 3, 15, 4, 1601 - squarenote 13, 13, 6, 1825 - squarenote 8, 15, 4, 1817 - squarenote 8, 12, 1, 1818 - endchannel +SFX_Cry1F_1_Ch5: + duty_cycle_pattern 165 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret -SFX_Cry1F_1_Ch5: - dutycycle 204 - squarenote 4, 15, 4, 1408 - squarenote 14, 14, 6, 1760 - squarenote 8, 13, 5, 1752 - squarenote 8, 13, 1, 1756 - endchannel +SFX_Cry1F_1_Ch6: + duty_cycle_pattern 204 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret -SFX_Cry1F_1_Ch7: - noisenote 5, 12, 4, 70 - noisenote 13, 10, 5, 68 - noisenote 8, 12, 4, 69 - noisenote 8, 11, 1, 68 - endchannel +SFX_Cry1F_1_Ch8: + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index dc46f49a..868975f8 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,24 +1,24 @@ -SFX_Cry1F_2_Ch4: - dutycycle 165 - squarenote 3, 15, 4, 1601 - squarenote 13, 13, 6, 1825 - squarenote 8, 15, 4, 1817 - squarenote 8, 12, 1, 1818 - endchannel +SFX_Cry1F_2_Ch5: + duty_cycle_pattern 165 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret -SFX_Cry1F_2_Ch5: - dutycycle 204 - squarenote 4, 15, 4, 1408 - squarenote 14, 14, 6, 1760 - squarenote 8, 13, 5, 1752 - squarenote 8, 13, 1, 1756 - endchannel +SFX_Cry1F_2_Ch6: + duty_cycle_pattern 204 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret -SFX_Cry1F_2_Ch7: - noisenote 5, 12, 4, 70 - noisenote 13, 10, 5, 68 - noisenote 8, 12, 4, 69 - noisenote 8, 11, 1, 68 - endchannel +SFX_Cry1F_2_Ch8: + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index 41c3b766..cc5a6192 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,24 +1,24 @@ -SFX_Cry1F_3_Ch4: - dutycycle 165 - squarenote 3, 15, 4, 1601 - squarenote 13, 13, 6, 1825 - squarenote 8, 15, 4, 1817 - squarenote 8, 12, 1, 1818 - endchannel +SFX_Cry1F_3_Ch5: + duty_cycle_pattern 165 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret -SFX_Cry1F_3_Ch5: - dutycycle 204 - squarenote 4, 15, 4, 1408 - squarenote 14, 14, 6, 1760 - squarenote 8, 13, 5, 1752 - squarenote 8, 13, 1, 1756 - endchannel +SFX_Cry1F_3_Ch6: + duty_cycle_pattern 204 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret -SFX_Cry1F_3_Ch7: - noisenote 5, 12, 4, 70 - noisenote 13, 10, 5, 68 - noisenote 8, 12, 4, 69 - noisenote 8, 11, 1, 68 - endchannel +SFX_Cry1F_3_Ch8: + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index cd0b85ec..888aeb61 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,24 +1,24 @@ -SFX_Cry20_1_Ch4: - dutycycle 240 - squarenote 13, 15, 1, 1297 - squarenote 13, 14, 1, 1301 - squarenote 13, 14, 1, 1297 - squarenote 8, 13, 1, 1297 - endchannel +SFX_Cry20_1_Ch5: + duty_cycle_pattern 240 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret -SFX_Cry20_1_Ch5: - dutycycle 21 - squarenote 12, 14, 1, 1292 - squarenote 12, 13, 1, 1296 - squarenote 14, 12, 1, 1292 - squarenote 8, 12, 1, 1290 - endchannel +SFX_Cry20_1_Ch6: + duty_cycle_pattern 21 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret -SFX_Cry20_1_Ch7: - noisenote 14, 15, 2, 101 - noisenote 13, 14, 2, 85 - noisenote 14, 13, 2, 86 - noisenote 8, 13, 1, 102 - endchannel +SFX_Cry20_1_Ch8: + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index 7bd21c47..ed22a3f0 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,24 +1,24 @@ -SFX_Cry20_2_Ch4: - dutycycle 240 - squarenote 13, 15, 1, 1297 - squarenote 13, 14, 1, 1301 - squarenote 13, 14, 1, 1297 - squarenote 8, 13, 1, 1297 - endchannel +SFX_Cry20_2_Ch5: + duty_cycle_pattern 240 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret -SFX_Cry20_2_Ch5: - dutycycle 21 - squarenote 12, 14, 1, 1292 - squarenote 12, 13, 1, 1296 - squarenote 14, 12, 1, 1292 - squarenote 8, 12, 1, 1290 - endchannel +SFX_Cry20_2_Ch6: + duty_cycle_pattern 21 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret -SFX_Cry20_2_Ch7: - noisenote 14, 15, 2, 101 - noisenote 13, 14, 2, 85 - noisenote 14, 13, 2, 86 - noisenote 8, 13, 1, 102 - endchannel +SFX_Cry20_2_Ch8: + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 89013d69..6295e936 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,24 +1,24 @@ -SFX_Cry20_3_Ch4: - dutycycle 240 - squarenote 13, 15, 1, 1297 - squarenote 13, 14, 1, 1301 - squarenote 13, 14, 1, 1297 - squarenote 8, 13, 1, 1297 - endchannel +SFX_Cry20_3_Ch5: + duty_cycle_pattern 240 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret -SFX_Cry20_3_Ch5: - dutycycle 21 - squarenote 12, 14, 1, 1292 - squarenote 12, 13, 1, 1296 - squarenote 14, 12, 1, 1292 - squarenote 8, 12, 1, 1290 - endchannel +SFX_Cry20_3_Ch6: + duty_cycle_pattern 21 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret -SFX_Cry20_3_Ch7: - noisenote 14, 15, 2, 101 - noisenote 13, 14, 2, 85 - noisenote 14, 13, 2, 86 - noisenote 8, 13, 1, 102 - endchannel +SFX_Cry20_3_Ch8: + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index 7cfad5d5..d9df1eca 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,27 +1,27 @@ -SFX_Cry21_1_Ch4: - dutycycle 27 - squarenote 3, 15, 3, 1380 - squarenote 2, 14, 2, 1348 - squarenote 5, 13, 1, 1314 - squarenote 2, 11, 2, 1156 - squarenote 8, 13, 1, 1186 - squarenote 3, 15, 3, 1316 - squarenote 4, 14, 4, 1252 - squarenote 8, 13, 1, 1282 - endchannel +SFX_Cry21_1_Ch5: + duty_cycle_pattern 27 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret -SFX_Cry21_1_Ch5: - dutycycle 204 - squarenote 3, 13, 3, 1376 - squarenote 2, 12, 2, 1344 - squarenote 5, 12, 1, 1312 - squarenote 2, 9, 2, 1152 - squarenote 8, 12, 1, 1184 - squarenote 3, 13, 3, 1312 - squarenote 3, 12, 4, 1248 - squarenote 8, 12, 1, 1280 +SFX_Cry21_1_Ch6: + duty_cycle_pattern 204 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 -SFX_Cry21_1_Ch7: - endchannel +SFX_Cry21_1_Ch8: + sound_ret diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index cb4b80d3..f506e124 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,27 +1,27 @@ -SFX_Cry21_2_Ch4: - dutycycle 27 - squarenote 3, 15, 3, 1380 - squarenote 2, 14, 2, 1348 - squarenote 5, 13, 1, 1314 - squarenote 2, 11, 2, 1156 - squarenote 8, 13, 1, 1186 - squarenote 3, 15, 3, 1316 - squarenote 4, 14, 4, 1252 - squarenote 8, 13, 1, 1282 - endchannel +SFX_Cry21_2_Ch5: + duty_cycle_pattern 27 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret -SFX_Cry21_2_Ch5: - dutycycle 204 - squarenote 3, 13, 3, 1376 - squarenote 2, 12, 2, 1344 - squarenote 5, 12, 1, 1312 - squarenote 2, 9, 2, 1152 - squarenote 8, 12, 1, 1184 - squarenote 3, 13, 3, 1312 - squarenote 3, 12, 4, 1248 - squarenote 8, 12, 1, 1280 +SFX_Cry21_2_Ch6: + duty_cycle_pattern 204 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 -SFX_Cry21_2_Ch7: - endchannel +SFX_Cry21_2_Ch8: + sound_ret diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index 971a85dc..c93a4784 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,27 +1,27 @@ -SFX_Cry21_3_Ch4: - dutycycle 27 - squarenote 3, 15, 3, 1380 - squarenote 2, 14, 2, 1348 - squarenote 5, 13, 1, 1314 - squarenote 2, 11, 2, 1156 - squarenote 8, 13, 1, 1186 - squarenote 3, 15, 3, 1316 - squarenote 4, 14, 4, 1252 - squarenote 8, 13, 1, 1282 - endchannel +SFX_Cry21_3_Ch5: + duty_cycle_pattern 27 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret -SFX_Cry21_3_Ch5: - dutycycle 204 - squarenote 3, 13, 3, 1376 - squarenote 2, 12, 2, 1344 - squarenote 5, 12, 1, 1312 - squarenote 2, 9, 2, 1152 - squarenote 8, 12, 1, 1184 - squarenote 3, 13, 3, 1312 - squarenote 3, 12, 4, 1248 - squarenote 8, 12, 1, 1280 +SFX_Cry21_3_Ch6: + duty_cycle_pattern 204 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 -SFX_Cry21_3_Ch7: - endchannel +SFX_Cry21_3_Ch8: + sound_ret diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index 77ba4679..72ea2db3 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,24 +1,24 @@ -SFX_Cry22_1_Ch4: - dutycycle 17 - squarenote 2, 3, -5, 897 - squarenote 7, 15, 5, 1537 - squarenote 1, 12, 2, 1153 - squarenote 8, 9, 1, 897 - endchannel +SFX_Cry22_1_Ch5: + duty_cycle_pattern 17 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret -SFX_Cry22_1_Ch5: - dutycycle 238 - squarenote 2, 3, -6, 1456 - squarenote 7, 13, 5, 1885 - squarenote 1, 11, 2, 1712 - squarenote 8, 6, 1, 1456 - endchannel +SFX_Cry22_1_Ch6: + duty_cycle_pattern 238 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret -SFX_Cry22_1_Ch7: - noisenote 2, 9, 2, 73 - noisenote 7, 11, 5, 41 - noisenote 1, 10, 2, 57 - noisenote 8, 9, 1, 73 - endchannel +SFX_Cry22_1_Ch8: + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index 05eb17a1..9492f818 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,24 +1,24 @@ -SFX_Cry22_2_Ch4: - dutycycle 17 - squarenote 2, 3, -5, 897 - squarenote 7, 15, 5, 1537 - squarenote 1, 12, 2, 1153 - squarenote 8, 9, 1, 897 - endchannel +SFX_Cry22_2_Ch5: + duty_cycle_pattern 17 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret -SFX_Cry22_2_Ch5: - dutycycle 238 - squarenote 2, 3, -6, 1456 - squarenote 7, 13, 5, 1885 - squarenote 1, 11, 2, 1712 - squarenote 8, 6, 1, 1456 - endchannel +SFX_Cry22_2_Ch6: + duty_cycle_pattern 238 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret -SFX_Cry22_2_Ch7: - noisenote 2, 9, 2, 73 - noisenote 7, 11, 5, 41 - noisenote 1, 10, 2, 57 - noisenote 8, 9, 1, 73 - endchannel +SFX_Cry22_2_Ch8: + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 01cc5b28..55cce857 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,24 +1,24 @@ -SFX_Cry22_3_Ch4: - dutycycle 17 - squarenote 2, 3, -5, 897 - squarenote 7, 15, 5, 1537 - squarenote 1, 12, 2, 1153 - squarenote 8, 9, 1, 897 - endchannel +SFX_Cry22_3_Ch5: + duty_cycle_pattern 17 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret -SFX_Cry22_3_Ch5: - dutycycle 238 - squarenote 2, 3, -6, 1456 - squarenote 7, 13, 5, 1885 - squarenote 1, 11, 2, 1712 - squarenote 8, 6, 1, 1456 - endchannel +SFX_Cry22_3_Ch6: + duty_cycle_pattern 238 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret -SFX_Cry22_3_Ch7: - noisenote 2, 9, 2, 73 - noisenote 7, 11, 5, 41 - noisenote 1, 10, 2, 57 - noisenote 8, 9, 1, 73 - endchannel +SFX_Cry22_3_Ch8: + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index e87e2b41..bd93eb67 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,25 +1,25 @@ -SFX_Cry23_1_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1984 - squarenote 6, 14, 4, 1985 - squarenote 10, 15, 6, 1984 - squarenote 4, 13, 3, 1986 - squarenote 8, 12, 1, 1984 - endchannel +SFX_Cry23_1_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret -SFX_Cry23_1_Ch5: - dutycycle 95 - squarenote 15, 9, 7, 1921 - squarenote 6, 8, 4, 1920 - squarenote 10, 9, 6, 1921 - squarenote 15, 8, 3, 1921 - endchannel +SFX_Cry23_1_Ch6: + duty_cycle_pattern 95 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret -SFX_Cry23_1_Ch7: - noisenote 3, 15, 2, 60 - noisenote 13, 14, 6, 44 - noisenote 15, 13, 7, 60 - noisenote 8, 12, 1, 44 - endchannel +SFX_Cry23_1_Ch8: + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 24dba11c..78932fd9 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,25 +1,25 @@ -SFX_Cry23_2_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1984 - squarenote 6, 14, 4, 1985 - squarenote 10, 15, 6, 1984 - squarenote 4, 13, 3, 1986 - squarenote 8, 12, 1, 1984 - endchannel +SFX_Cry23_2_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret -SFX_Cry23_2_Ch5: - dutycycle 95 - squarenote 15, 9, 7, 1921 - squarenote 6, 8, 4, 1920 - squarenote 10, 9, 6, 1921 - squarenote 15, 8, 3, 1921 - endchannel +SFX_Cry23_2_Ch6: + duty_cycle_pattern 95 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret -SFX_Cry23_2_Ch7: - noisenote 3, 15, 2, 60 - noisenote 13, 14, 6, 44 - noisenote 15, 13, 7, 60 - noisenote 8, 12, 1, 44 - endchannel +SFX_Cry23_2_Ch8: + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index e3c62be5..14b52850 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,25 +1,25 @@ -SFX_Cry23_3_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1984 - squarenote 6, 14, 4, 1985 - squarenote 10, 15, 6, 1984 - squarenote 4, 13, 3, 1986 - squarenote 8, 12, 1, 1984 - endchannel +SFX_Cry23_3_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret -SFX_Cry23_3_Ch5: - dutycycle 95 - squarenote 15, 9, 7, 1921 - squarenote 6, 8, 4, 1920 - squarenote 10, 9, 6, 1921 - squarenote 15, 8, 3, 1921 - endchannel +SFX_Cry23_3_Ch6: + duty_cycle_pattern 95 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret -SFX_Cry23_3_Ch7: - noisenote 3, 15, 2, 60 - noisenote 13, 14, 6, 44 - noisenote 15, 13, 7, 60 - noisenote 8, 12, 1, 44 - endchannel +SFX_Cry23_3_Ch8: + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index 99218856..36654731 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,33 +1,33 @@ -SFX_Cry24_1_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1664 - squarenote 10, 14, 6, 1668 - squarenote 15, 13, 7, 1680 - squarenote 8, 13, 5, 1680 - squarenote 6, 12, 4, 1672 - squarenote 5, 13, 3, 1648 - squarenote 4, 13, 3, 1632 - squarenote 8, 12, 1, 1600 - endchannel +SFX_Cry24_1_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry24_1_Ch5: - dutycycle 5 - squarenote 15, 11, 7, 1601 - squarenote 10, 9, 6, 1602 - squarenote 15, 10, 7, 1617 - squarenote 8, 10, 5, 1617 - squarenote 6, 9, 4, 1607 - squarenote 5, 10, 3, 1585 - squarenote 4, 9, 3, 1570 - squarenote 8, 7, 1, 1537 - endchannel +SFX_Cry24_1_Ch6: + duty_cycle_pattern 5 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret -SFX_Cry24_1_Ch7: - noisenote 15, 14, 4, 60 - noisenote 10, 12, 7, 76 - noisenote 10, 12, 7, 60 - noisenote 12, 11, 7, 76 - noisenote 15, 10, 2, 92 - endchannel +SFX_Cry24_1_Ch8: + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index 9773793c..b23a020e 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,33 +1,33 @@ -SFX_Cry24_2_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1664 - squarenote 10, 14, 6, 1668 - squarenote 15, 13, 7, 1680 - squarenote 8, 13, 5, 1680 - squarenote 6, 12, 4, 1672 - squarenote 5, 13, 3, 1648 - squarenote 4, 13, 3, 1632 - squarenote 8, 12, 1, 1600 - endchannel +SFX_Cry24_2_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry24_2_Ch5: - dutycycle 5 - squarenote 15, 11, 7, 1601 - squarenote 10, 9, 6, 1602 - squarenote 15, 10, 7, 1617 - squarenote 8, 10, 5, 1617 - squarenote 6, 9, 4, 1607 - squarenote 5, 10, 3, 1585 - squarenote 4, 9, 3, 1570 - squarenote 8, 7, 1, 1537 - endchannel +SFX_Cry24_2_Ch6: + duty_cycle_pattern 5 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret -SFX_Cry24_2_Ch7: - noisenote 15, 14, 4, 60 - noisenote 10, 12, 7, 76 - noisenote 10, 12, 7, 60 - noisenote 12, 11, 7, 76 - noisenote 15, 10, 2, 92 - endchannel +SFX_Cry24_2_Ch8: + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index 785f6e9b..6a9d5bf6 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,33 +1,33 @@ -SFX_Cry24_3_Ch4: - dutycycle 240 - squarenote 15, 15, 7, 1664 - squarenote 10, 14, 6, 1668 - squarenote 15, 13, 7, 1680 - squarenote 8, 13, 5, 1680 - squarenote 6, 12, 4, 1672 - squarenote 5, 13, 3, 1648 - squarenote 4, 13, 3, 1632 - squarenote 8, 12, 1, 1600 - endchannel +SFX_Cry24_3_Ch5: + duty_cycle_pattern 240 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret -SFX_Cry24_3_Ch5: - dutycycle 5 - squarenote 15, 11, 7, 1601 - squarenote 10, 9, 6, 1602 - squarenote 15, 10, 7, 1617 - squarenote 8, 10, 5, 1617 - squarenote 6, 9, 4, 1607 - squarenote 5, 10, 3, 1585 - squarenote 4, 9, 3, 1570 - squarenote 8, 7, 1, 1537 - endchannel +SFX_Cry24_3_Ch6: + duty_cycle_pattern 5 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret -SFX_Cry24_3_Ch7: - noisenote 15, 14, 4, 60 - noisenote 10, 12, 7, 76 - noisenote 10, 12, 7, 60 - noisenote 12, 11, 7, 76 - noisenote 15, 10, 2, 92 - endchannel +SFX_Cry24_3_Ch8: + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index 9733b0f5..670cbaae 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,26 +1,26 @@ -SFX_Cry25_1_Ch4: - dutycycle 165 - squarenote 6, 15, 4, 1856 - squarenote 15, 14, 3, 1840 - squarenote 4, 15, 4, 1856 - squarenote 5, 11, 3, 1864 - squarenote 8, 13, 1, 1872 - endchannel +SFX_Cry25_1_Ch5: + duty_cycle_pattern 165 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret -SFX_Cry25_1_Ch5: - dutycycle 119 - squarenote 6, 12, 3, 1810 - squarenote 15, 11, 3, 1796 - squarenote 3, 12, 3, 1810 - squarenote 4, 12, 3, 1825 - squarenote 8, 11, 1, 1842 - endchannel +SFX_Cry25_1_Ch6: + duty_cycle_pattern 119 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret -SFX_Cry25_1_Ch7: - noisenote 8, 13, 6, 44 - noisenote 12, 12, 6, 60 - noisenote 10, 11, 6, 44 - noisenote 8, 9, 1, 28 - endchannel +SFX_Cry25_1_Ch8: + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index c38fa988..6b52d9bf 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,26 +1,26 @@ -SFX_Cry25_2_Ch4: - dutycycle 165 - squarenote 6, 15, 4, 1856 - squarenote 15, 14, 3, 1840 - squarenote 4, 15, 4, 1856 - squarenote 5, 11, 3, 1864 - squarenote 8, 13, 1, 1872 - endchannel +SFX_Cry25_2_Ch5: + duty_cycle_pattern 165 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret -SFX_Cry25_2_Ch5: - dutycycle 119 - squarenote 6, 12, 3, 1810 - squarenote 15, 11, 3, 1796 - squarenote 3, 12, 3, 1810 - squarenote 4, 12, 3, 1825 - squarenote 8, 11, 1, 1842 - endchannel +SFX_Cry25_2_Ch6: + duty_cycle_pattern 119 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret -SFX_Cry25_2_Ch7: - noisenote 8, 13, 6, 44 - noisenote 12, 12, 6, 60 - noisenote 10, 11, 6, 44 - noisenote 8, 9, 1, 28 - endchannel +SFX_Cry25_2_Ch8: + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index 610fa04b..22ce220d 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,26 +1,26 @@ -SFX_Cry25_3_Ch4: - dutycycle 165 - squarenote 6, 15, 4, 1856 - squarenote 15, 14, 3, 1840 - squarenote 4, 15, 4, 1856 - squarenote 5, 11, 3, 1864 - squarenote 8, 13, 1, 1872 - endchannel +SFX_Cry25_3_Ch5: + duty_cycle_pattern 165 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret -SFX_Cry25_3_Ch5: - dutycycle 119 - squarenote 6, 12, 3, 1810 - squarenote 15, 11, 3, 1796 - squarenote 3, 12, 3, 1810 - squarenote 4, 12, 3, 1825 - squarenote 8, 11, 1, 1842 - endchannel +SFX_Cry25_3_Ch6: + duty_cycle_pattern 119 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret -SFX_Cry25_3_Ch7: - noisenote 8, 13, 6, 44 - noisenote 12, 12, 6, 60 - noisenote 10, 11, 6, 44 - noisenote 8, 9, 1, 28 - endchannel +SFX_Cry25_3_Ch8: + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index b4466ca7..fd53e240 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,7 +1,7 @@ -SFX_Cut_1_Ch7: - noisenote 2, 15, 7, 36 - noisenote 2, 15, 7, 52 - noisenote 4, 15, 7, 68 - noisenote 8, 15, 4, 85 - noisenote 8, 15, 1, 68 - endchannel +SFX_Cut_1_Ch8: + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index ff7a0c4d..b223b99b 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,7 +1,7 @@ -SFX_Cut_3_Ch7: - noisenote 2, 15, 7, 36 - noisenote 2, 15, 7, 52 - noisenote 4, 15, 7, 68 - noisenote 8, 15, 4, 85 - noisenote 8, 15, 1, 68 - endchannel +SFX_Cut_3_Ch8: + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm index 81351836..693bb0c5 100644 --- a/audio/sfx/cymbal1_1.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_1_Ch7: - noisenote 0, 10, 1, 16 - endchannel +SFX_Cymbal1_1_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm index abae0e01..206d44ae 100644 --- a/audio/sfx/cymbal1_2.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_2_Ch7: - noisenote 0, 10, 1, 16 - endchannel +SFX_Cymbal1_2_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm index f76df305..9389cc6f 100644 --- a/audio/sfx/cymbal1_3.asm +++ b/audio/sfx/cymbal1_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_3_Ch7: - noisenote 0, 10, 1, 16 - endchannel +SFX_Cymbal1_3_Ch8: + noise_note 0, 10, 1, 16 + sound_ret diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm index da3ba376..3f050d96 100644 --- a/audio/sfx/cymbal2_1.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_1_Ch7: - noisenote 0, 10, 2, 17 - endchannel +SFX_Cymbal2_1_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm index c8fb1241..ab0a2edd 100644 --- a/audio/sfx/cymbal2_2.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_2_Ch7: - noisenote 0, 10, 2, 17 - endchannel +SFX_Cymbal2_2_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm index b34236d0..26f7048a 100644 --- a/audio/sfx/cymbal2_3.asm +++ b/audio/sfx/cymbal2_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_3_Ch7: - noisenote 0, 10, 2, 17 - endchannel +SFX_Cymbal2_3_Ch8: + noise_note 0, 10, 2, 17 + sound_ret diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm index f9b8733e..179de2f0 100644 --- a/audio/sfx/cymbal3_1.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_1_Ch7: - noisenote 0, 10, 2, 80 - endchannel +SFX_Cymbal3_1_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm index d80395a4..09e3b6e1 100644 --- a/audio/sfx/cymbal3_2.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_2_Ch7: - noisenote 0, 10, 2, 80 - endchannel +SFX_Cymbal3_2_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm index 1a9a07e2..a7af3bb0 100644 --- a/audio/sfx/cymbal3_3.asm +++ b/audio/sfx/cymbal3_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_3_Ch7: - noisenote 0, 10, 2, 80 - endchannel +SFX_Cymbal3_3_Ch8: + noise_note 0, 10, 2, 80 + sound_ret diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index c96300fe..5e0665f6 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,5 +1,5 @@ -SFX_Damage_Ch7: - noisenote 2, 15, 4, 68 - noisenote 2, 15, 4, 20 - noisenote 15, 15, 1, 50 - endchannel +SFX_Damage_Ch8: + noise_note 2, 15, 4, 68 + noise_note 2, 15, 4, 20 + noise_note 15, 15, 1, 50 + sound_ret diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index b8dabd64..fe822270 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,18 +1,18 @@ -SFX_Denied_1_Ch4: - duty 3 - pitchenvelope 5, -2 - squarenote 4, 15, 0, 1280 - pitchenvelope 0, 0 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1280 - squarenote 1, 0, 0, 0 - endchannel +SFX_Denied_1_Ch5: + duty_cycle 3 + pitch_sweep 5, -2 + square_note 4, 15, 0, 1280 + pitch_sweep 0, 0 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 1, 0, 0, 0 + sound_ret -SFX_Denied_1_Ch5: - duty 3 - squarenote 4, 15, 0, 1025 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1025 - squarenote 1, 0, 0, 0 - endchannel +SFX_Denied_1_Ch6: + duty_cycle 3 + square_note 4, 15, 0, 1025 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1025 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index 0deb99eb..51b98de4 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,18 +1,18 @@ -SFX_Denied_3_Ch4: - duty 3 - pitchenvelope 5, -2 - squarenote 4, 15, 0, 1280 - pitchenvelope 0, 0 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1280 - squarenote 1, 0, 0, 0 - endchannel +SFX_Denied_3_Ch5: + duty_cycle 3 + pitch_sweep 5, -2 + square_note 4, 15, 0, 1280 + pitch_sweep 0, 0 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 1, 0, 0, 0 + sound_ret -SFX_Denied_3_Ch5: - duty 3 - squarenote 4, 15, 0, 1025 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1025 - squarenote 1, 0, 0, 0 - endchannel +SFX_Denied_3_Ch6: + duty_cycle 3 + square_note 4, 15, 0, 1025 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1025 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 46039163..147c3eb7 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,15 +1,15 @@ -SFX_Dex_Page_Added_Ch4: - duty 2 - pitchenvelope 4, 4 - squarenote 15, 15, 0, 1264 - pitchenvelope 1, 7 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Dex_Page_Added_Ch5: + duty_cycle 2 + pitch_sweep 4, 4 + square_note 15, 15, 0, 1264 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 0 + sound_ret -SFX_Dex_Page_Added_Ch5: - duty 2 - squarenote 15, 9, 2, 1536 - squarenote 15, 9, 2, 1922 - endchannel +SFX_Dex_Page_Added_Ch6: + duty_cycle 2 + square_note 15, 9, 2, 1536 + square_note 15, 9, 2, 1922 + sound_ret diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 82262b2e..14638602 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ -SFX_Doubleslap_Ch7: - noisenote 8, 15, 1, 50 - noisenote 8, 15, 1, 51 - endchannel +SFX_Doubleslap_Ch8: + noise_note 8, 15, 1, 50 + noise_note 8, 15, 1, 51 + sound_ret diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index dfae7edd..30c3ecd1 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,7 +1,7 @@ -SFX_Enter_PC_1_Ch4: - duty 2 - squarenote 6, 15, 0, 1792 - squarenote 4, 0, 0, 0 - squarenote 6, 15, 0, 1792 - squarenote 1, 0, 0, 0 - endchannel +SFX_Enter_PC_1_Ch5: + duty_cycle 2 + square_note 6, 15, 0, 1792 + square_note 4, 0, 0, 0 + square_note 6, 15, 0, 1792 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index e4372af9..9c741798 100644 --- a/audio/sfx/enter_pc_3.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,7 +1,7 @@ -SFX_Enter_PC_3_Ch4: - duty 2 - squarenote 4, 15, 0, 1792 - squarenote 4, 0, 0, 0 - squarenote 4, 15, 0, 1792 - squarenote 1, 0, 0, 0 - endchannel +SFX_Enter_PC_3_Ch5: + duty_cycle 2 + square_note 4, 15, 0, 1792 + square_note 4, 0, 0, 0 + square_note 4, 15, 0, 1792 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index 00e9c255..6ce363e0 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,6 +1,6 @@ -SFX_Faint_Fall_Ch4: - duty 1 - pitchenvelope 10, -7 - squarenote 15, 15, 2, 1920 - pitchenvelope 0, 0 - endchannel +SFX_Faint_Fall_Ch5: + duty_cycle 1 + pitch_sweep 10, -7 + square_note 15, 15, 2, 1920 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index d866b588..d7449c84 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,11 +1,11 @@ -SFX_Faint_Thud_Ch4: - squarenote 15, 13, 1, 512 - pitchenvelope 0, 0 - endchannel +SFX_Faint_Thud_Ch5: + square_note 15, 13, 1, 512 + pitch_sweep 0, 0 + sound_ret -SFX_Faint_Thud_Ch7: - noisenote 4, 15, 5, 51 - noisenote 8, 15, 4, 34 - noisenote 15, 15, 2, 33 - endchannel +SFX_Faint_Thud_Ch8: + noise_note 4, 15, 5, 51 + noise_note 8, 15, 4, 34 + noise_note 15, 15, 2, 33 + sound_ret diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index 567485a5..40ebb966 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,18 +1,18 @@ -SFX_Fly_1_Ch7: - noisenote 2, 15, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 10, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 13, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 8, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 11, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 6, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 9, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 4, 1, 18 - noisenote 2, 0, 0, 0 - endchannel +SFX_Fly_1_Ch8: + noise_note 2, 15, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 10, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 13, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 8, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 11, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 6, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 9, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 4, 1, 18 + noise_note 2, 0, 0, 0 + sound_ret diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index 30076475..e29b5654 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,18 +1,18 @@ -SFX_Fly_3_Ch7: - noisenote 2, 15, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 10, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 13, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 8, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 11, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 6, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 9, 1, 18 - noisenote 2, 0, 0, 0 - noisenote 2, 4, 1, 18 - noisenote 2, 0, 0, 0 - endchannel +SFX_Fly_3_Ch8: + noise_note 2, 15, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 10, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 13, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 8, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 11, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 6, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 9, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 4, 1, 18 + noise_note 2, 0, 0, 0 + sound_ret diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm index 2cf5e8c9..09f76c70 100644 --- a/audio/sfx/get_item1_1.asm +++ b/audio/sfx/get_item1_1.asm @@ -1,47 +1,47 @@ -SFX_Get_Item1_1_Ch4: - executemusic +SFX_Get_Item1_1_Ch5: + execute_music tempo 256 volume 7, 7 vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 4, 11, 1 octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 + note G#, 2 + note G#, 2 + note G#, 2 + note_type 12, 11, 3 octave 4 - E_ 4 - endchannel + note E_, 4 + sound_ret -SFX_Get_Item1_1_Ch5: - executemusic +SFX_Get_Item1_1_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 + duty_cycle 2 + note_type 4, 12, 1 octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel + note E_, 2 + note E_, 2 + note E_, 2 + note_type 12, 12, 3 + note B_, 4 + sound_ret -SFX_Get_Item1_1_Ch6: - executemusic - notetype 4, 1, 0 +SFX_Get_Item1_1_Ch7: + execute_music + note_type 4, 1, 0 octave 4 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - B_ 2 + note B_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm index 6c4c01b5..dfc1848f 100644 --- a/audio/sfx/get_item1_3.asm +++ b/audio/sfx/get_item1_3.asm @@ -1,47 +1,47 @@ -SFX_Get_Item1_3_Ch4: - executemusic +SFX_Get_Item1_3_Ch5: + execute_music tempo 256 volume 7, 7 vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 4, 11, 1 octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 + note G#, 2 + note G#, 2 + note G#, 2 + note_type 12, 11, 3 octave 4 - E_ 4 - endchannel + note E_, 4 + sound_ret -SFX_Get_Item1_3_Ch5: - executemusic +SFX_Get_Item1_3_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 + duty_cycle 2 + note_type 4, 12, 1 octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel + note E_, 2 + note E_, 2 + note E_, 2 + note_type 12, 12, 3 + note B_, 4 + sound_ret -SFX_Get_Item1_3_Ch6: - executemusic - notetype 4, 1, 0 +SFX_Get_Item1_3_Ch7: + execute_music + note_type 4, 1, 0 octave 4 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 12, 1, 0 + note_type 12, 1, 0 octave 4 - B_ 2 + note B_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm index 01e66269..04bbdae2 100644 --- a/audio/sfx/get_item2_1.asm +++ b/audio/sfx/get_item2_1.asm @@ -1,69 +1,69 @@ -SFX_Get_Item2_1_Ch4: - executemusic +SFX_Get_Item2_1_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 11, 4 octave 4 - D_ 4 - C_ 4 + note D_, 4 + note C_, 4 octave 3 - A_ 8 - notetype 5, 11, 2 + note A_, 8 + note_type 5, 11, 2 octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 octave 3 - A# 2 - notetype 5, 11, 4 + note A#, 2 + note_type 5, 11, 4 octave 4 - C_ 8 - endchannel + note C_, 8 + sound_ret -SFX_Get_Item2_1_Ch5: - executemusic +SFX_Get_Item2_1_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 + duty_cycle 2 + note_type 5, 12, 5 octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel + note A_, 4 + note F_, 4 + note C_, 8 + note_type 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + note_type 5, 12, 4 + note A_, 8 + sound_ret -SFX_Get_Item2_1_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Get_Item2_1_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm index 27c5864d..f05e0728 100644 --- a/audio/sfx/get_item2_2.asm +++ b/audio/sfx/get_item2_2.asm @@ -1,69 +1,69 @@ -SFX_Get_Item2_2_Ch4: - executemusic +SFX_Get_Item2_2_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 11, 4 octave 4 - D_ 4 - C_ 4 + note D_, 4 + note C_, 4 octave 3 - A_ 8 - notetype 5, 11, 2 + note A_, 8 + note_type 5, 11, 2 octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 octave 3 - A# 2 - notetype 5, 11, 4 + note A#, 2 + note_type 5, 11, 4 octave 4 - C_ 8 - endchannel + note C_, 8 + sound_ret -SFX_Get_Item2_2_Ch5: - executemusic +SFX_Get_Item2_2_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 + duty_cycle 2 + note_type 5, 12, 5 octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel + note A_, 4 + note F_, 4 + note C_, 8 + note_type 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + note_type 5, 12, 4 + note A_, 8 + sound_ret -SFX_Get_Item2_2_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Get_Item2_2_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm index 42d74e8e..036d375b 100644 --- a/audio/sfx/get_item2_3.asm +++ b/audio/sfx/get_item2_3.asm @@ -1,69 +1,69 @@ -SFX_Get_Item2_3_Ch4: - executemusic +SFX_Get_Item2_3_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 11, 4 octave 4 - D_ 4 - C_ 4 + note D_, 4 + note C_, 4 octave 3 - A_ 8 - notetype 5, 11, 2 + note A_, 8 + note_type 5, 11, 2 octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 octave 3 - A# 2 - notetype 5, 11, 4 + note A#, 2 + note_type 5, 11, 4 octave 4 - C_ 8 - endchannel + note C_, 8 + sound_ret -SFX_Get_Item2_3_Ch5: - executemusic +SFX_Get_Item2_3_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 + duty_cycle 2 + note_type 5, 12, 5 octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel + note A_, 4 + note F_, 4 + note C_, 8 + note_type 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + note_type 5, 12, 4 + note A_, 8 + sound_ret -SFX_Get_Item2_3_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Get_Item2_3_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 rest 1 - D# 1 + note D#, 1 rest 1 - E_ 1 + note E_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm index b2ae3d57..a19f1143 100644 --- a/audio/sfx/get_key_item_1.asm +++ b/audio/sfx/get_key_item_1.asm @@ -1,59 +1,59 @@ -SFX_Get_Key_Item_1_Ch4: - executemusic +SFX_Get_Key_Item_1_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 10, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 10, 4 octave 3 - A# 4 - notetype 5, 11, 1 + note A#, 4 + note_type 5, 11, 1 octave 4 - C_ 2 - C_ 1 - C_ 1 - notetype 5, 10, 4 - D# 4 - notetype 5, 11, 1 - F_ 2 - F_ 1 - F_ 1 - notetype 5, 11, 4 - A# 8 - endchannel + note C_, 2 + note C_, 1 + note C_, 1 + note_type 5, 10, 4 + note D#, 4 + note_type 5, 11, 1 + note F_, 2 + note F_, 1 + note F_, 1 + note_type 5, 11, 4 + note A#, 8 + sound_ret -SFX_Get_Key_Item_1_Ch5: - executemusic +SFX_Get_Key_Item_1_Ch6: + execute_music vibrato 4, 2, 3 - duty 2 - notetype 5, 13, 1 + duty_cycle 2 + note_type 5, 13, 1 octave 4 - G_ 2 - G_ 1 - G_ 1 - notetype 5, 12, 4 - D# 4 - notetype 5, 13, 1 - G# 2 - G# 1 - G# 1 - A# 2 - A# 1 - A# 1 - notetype 5, 12, 4 + note G_, 2 + note G_, 1 + note G_, 1 + note_type 5, 12, 4 + note D#, 4 + note_type 5, 13, 1 + note G#, 2 + note G#, 1 + note G#, 1 + note A#, 2 + note A#, 1 + note A#, 1 + note_type 5, 12, 4 octave 5 - D# 8 - endchannel + note D#, 8 + sound_ret -SFX_Get_Key_Item_1_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Get_Key_Item_1_Ch7: + execute_music + note_type 5, 1, 0 octave 4 - D# 4 - G# 4 - G_ 4 - F_ 4 - D# 8 - endchannel + note D#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + note D#, 8 + sound_ret diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm index aebae361..c1063a7f 100644 --- a/audio/sfx/get_key_item_3.asm +++ b/audio/sfx/get_key_item_3.asm @@ -1,59 +1,59 @@ -SFX_Get_Key_Item_3_Ch4: - executemusic +SFX_Get_Key_Item_3_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 10, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 5, 10, 4 octave 3 - A# 4 - notetype 5, 11, 1 + note A#, 4 + note_type 5, 11, 1 octave 4 - C_ 2 - C_ 1 - C_ 1 - notetype 5, 10, 4 - D# 4 - notetype 5, 11, 1 - F_ 2 - F_ 1 - F_ 1 - notetype 5, 11, 4 - A# 8 - endchannel + note C_, 2 + note C_, 1 + note C_, 1 + note_type 5, 10, 4 + note D#, 4 + note_type 5, 11, 1 + note F_, 2 + note F_, 1 + note F_, 1 + note_type 5, 11, 4 + note A#, 8 + sound_ret -SFX_Get_Key_Item_3_Ch5: - executemusic +SFX_Get_Key_Item_3_Ch6: + execute_music vibrato 4, 2, 3 - duty 2 - notetype 5, 13, 1 + duty_cycle 2 + note_type 5, 13, 1 octave 4 - G_ 2 - G_ 1 - G_ 1 - notetype 5, 12, 4 - D# 4 - notetype 5, 13, 1 - G# 2 - G# 1 - G# 1 - A# 2 - A# 1 - A# 1 - notetype 5, 12, 4 + note G_, 2 + note G_, 1 + note G_, 1 + note_type 5, 12, 4 + note D#, 4 + note_type 5, 13, 1 + note G#, 2 + note G#, 1 + note G#, 1 + note A#, 2 + note A#, 1 + note A#, 1 + note_type 5, 12, 4 octave 5 - D# 8 - endchannel + note D#, 8 + sound_ret -SFX_Get_Key_Item_3_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Get_Key_Item_3_Ch7: + execute_music + note_type 5, 1, 0 octave 4 - D# 4 - G# 4 - G_ 4 - F_ 4 - D# 8 - endchannel + note D#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + note D#, 8 + sound_ret diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index f45c8399..b41dc94d 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_1_Ch7: - noisenote 9, 15, 1, 68 - noisenote 8, 13, 1, 67 - endchannel +SFX_Go_Inside_1_Ch8: + noise_note 9, 15, 1, 68 + noise_note 8, 13, 1, 67 + sound_ret diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm index cf69e4b7..5aab6564 100644 --- a/audio/sfx/go_inside_3.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_3_Ch7: - noisenote 9, 15, 1, 68 - noisenote 8, 13, 1, 67 - endchannel +SFX_Go_Inside_3_Ch8: + noise_note 9, 15, 1, 68 + noise_note 8, 13, 1, 67 + sound_ret diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index 3156eba7..2ac3542b 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,7 +1,7 @@ -SFX_Go_Outside_1_Ch7: - noisenote 2, 15, 1, 84 - noisenote 12, 7, 1, 35 - noisenote 2, 11, 1, 84 - noisenote 12, 6, 1, 35 - noisenote 6, 4, 1, 84 - endchannel +SFX_Go_Outside_1_Ch8: + noise_note 2, 15, 1, 84 + noise_note 12, 7, 1, 35 + noise_note 2, 11, 1, 84 + noise_note 12, 6, 1, 35 + noise_note 6, 4, 1, 84 + sound_ret diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index 37952248..cd3543f2 100644 --- a/audio/sfx/go_outside_3.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,7 +1,7 @@ -SFX_Go_Outside_3_Ch7: - noisenote 2, 15, 1, 84 - noisenote 12, 7, 1, 35 - noisenote 2, 11, 1, 84 - noisenote 12, 6, 1, 35 - noisenote 6, 4, 1, 84 - endchannel +SFX_Go_Outside_3_Ch8: + noise_note 2, 15, 1, 84 + noise_note 12, 7, 1, 35 + noise_note 2, 11, 1, 84 + noise_note 12, 6, 1, 35 + noise_note 6, 4, 1, 84 + sound_ret diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 656babad..a14afe1a 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,9 +1,9 @@ -SFX_Heal_Ailment_1_Ch4: - duty 2 - pitchenvelope 1, 4 - squarenote 4, 15, 2, 1536 - squarenote 4, 15, 2, 1536 - pitchenvelope 1, 7 - squarenote 15, 15, 2, 1536 - pitchenvelope 0, 0 - endchannel +SFX_Heal_Ailment_1_Ch5: + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index bb06b360..81171c12 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,9 +1,9 @@ -SFX_Heal_Ailment_2_Ch4: - duty 2 - pitchenvelope 1, 4 - squarenote 4, 15, 2, 1536 - squarenote 4, 15, 2, 1536 - pitchenvelope 1, 7 - squarenote 15, 15, 2, 1536 - pitchenvelope 0, 0 - endchannel +SFX_Heal_Ailment_2_Ch5: + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index ff1b1304..b1a0a570 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,9 +1,9 @@ -SFX_Heal_Ailment_3_Ch4: - duty 2 - pitchenvelope 1, 4 - squarenote 4, 15, 2, 1536 - squarenote 4, 15, 2, 1536 - pitchenvelope 1, 7 - squarenote 15, 15, 2, 1536 - pitchenvelope 0, 0 - endchannel +SFX_Heal_Ailment_3_Ch5: + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index 1fdbdfea..f6413962 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,7 +1,7 @@ -SFX_Heal_HP_1_Ch4: - duty 2 - pitchenvelope 1, 7 - squarenote 15, 15, 0, 1264 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Heal_HP_1_Ch5: + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index befb3f01..c784c174 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,7 +1,7 @@ -SFX_Heal_HP_2_Ch4: - duty 2 - pitchenvelope 1, 7 - squarenote 15, 15, 0, 1264 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Heal_HP_2_Ch5: + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index ba4d6739..7ca9d73b 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,7 +1,7 @@ -SFX_Heal_HP_3_Ch4: - duty 2 - pitchenvelope 1, 7 - squarenote 15, 15, 0, 1264 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Heal_HP_3_Ch5: + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index 095f7b7a..59d3f21a 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,9 +1,9 @@ -SFX_Healing_Machine_1_Ch4: - duty 2 - pitchenvelope 2, -4 - squarenote 4, 15, 2, 1280 - pitchenvelope 2, 2 - squarenote 2, 15, 1, 1280 - pitchenvelope 0, 0 - squarenote 1, 0, 0, 0 - endchannel +SFX_Healing_Machine_1_Ch5: + duty_cycle 2 + pitch_sweep 2, -4 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 2, 15, 1, 1280 + pitch_sweep 0, 0 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index a0501d8f..3078dba5 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,9 +1,9 @@ -SFX_Healing_Machine_3_Ch4: - duty 2 - pitchenvelope 2, -4 - squarenote 4, 15, 2, 1280 - pitchenvelope 2, 2 - squarenote 2, 15, 1, 1280 - pitchenvelope 0, 0 - squarenote 1, 0, 0, 0 - endchannel +SFX_Healing_Machine_3_Ch5: + duty_cycle 2 + pitch_sweep 2, -4 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 2, 15, 1, 1280 + pitch_sweep 0, 0 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index 6f126626..32541241 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,6 +1,6 @@ -SFX_Horn_Drill_Ch7: - noisenote 3, 9, 2, 49 - noisenote 3, 11, 2, 50 - noisenote 3, 12, 2, 51 - noisenote 8, 15, 1, 84 - endchannel +SFX_Horn_Drill_Ch8: + noise_note 3, 9, 2, 49 + noise_note 3, 11, 2, 50 + noise_note 3, 12, 2, 51 + noise_note 8, 15, 1, 84 + sound_ret diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 41a4db84..703edf41 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ -SFX_Intro_Crash_Ch7: - noisenote 2, 13, 2, 50 - noisenote 15, 15, 2, 67 - endchannel +SFX_Intro_Crash_Ch8: + noise_note 2, 13, 2, 50 + noise_note 15, 15, 2, 67 + sound_ret diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 09af056f..47e37c21 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,6 +1,6 @@ -SFX_Intro_Hip_Ch4: - duty 2 - pitchenvelope 2, 6 - squarenote 12, 12, 2, 1856 - pitchenvelope 0, 0 - endchannel +SFX_Intro_Hip_Ch5: + duty_cycle 2 + pitch_sweep 2, 6 + square_note 12, 12, 2, 1856 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 7dec29ae..1bee7a5c 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,6 +1,6 @@ -SFX_Intro_Hop_Ch4: - duty 2 - pitchenvelope 2, 6 - squarenote 12, 12, 2, 1664 - pitchenvelope 0, 0 - endchannel +SFX_Intro_Hop_Ch5: + duty_cycle 2 + pitch_sweep 2, 6 + square_note 12, 12, 2, 1664 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index ecdd9428..ee41e37c 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,10 +1,10 @@ -SFX_Intro_Lunge_Ch7: - noisenote 6, 2, 0, 16 - noisenote 6, 2, -7, 64 - noisenote 6, 4, -7, 65 - noisenote 6, 8, -7, 65 - noisenote 6, 12, -7, 66 - noisenote 8, 13, 7, 66 - noisenote 15, 14, 7, 67 - noisenote 15, 15, 2, 67 - endchannel +SFX_Intro_Lunge_Ch8: + noise_note 6, 2, 0, 16 + noise_note 6, 2, -7, 64 + noise_note 6, 4, -7, 65 + noise_note 6, 8, -7, 65 + noise_note 6, 12, -7, 66 + noise_note 8, 13, 7, 66 + noise_note 15, 14, 7, 67 + noise_note 15, 15, 2, 67 + sound_ret diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index c972283d..1985878b 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,5 +1,5 @@ -SFX_Intro_Raise_Ch7: - noisenote 2, 6, -7, 33 - noisenote 2, 10, -7, 49 - noisenote 15, 15, 2, 65 - endchannel +SFX_Intro_Raise_Ch8: + noise_note 2, 6, -7, 33 + noise_note 2, 10, -7, 49 + noise_note 15, 15, 2, 65 + sound_ret diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index 647fcbd2..68ba128a 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,7 +1,7 @@ -SFX_Intro_Whoosh_Ch7: - noisenote 4, 2, -4, 32 - noisenote 3, 10, 0, 32 - noisenote 3, 11, 0, 33 - noisenote 3, 12, 0, 34 - noisenote 15, 13, 2, 36 - endchannel +SFX_Intro_Whoosh_Ch8: + noise_note 4, 2, -4, 32 + noise_note 3, 10, 0, 32 + noise_note 3, 11, 0, 33 + noise_note 3, 12, 0, 34 + noise_note 15, 13, 2, 36 + sound_ret diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index 0b2b478f..6cfb4d26 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,6 +1,6 @@ -SFX_Ledge_1_Ch4: - duty 2 - pitchenvelope 9, 5 - squarenote 15, 15, 2, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Ledge_1_Ch5: + duty_cycle 2 + pitch_sweep 9, 5 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index 29b055a9..97627116 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,6 +1,6 @@ -SFX_Ledge_3_Ch4: - duty 2 - pitchenvelope 9, 5 - squarenote 15, 15, 2, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Ledge_3_Ch5: + duty_cycle 2 + pitch_sweep 9, 5 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm index 5b3da83d..f1af4978 100644 --- a/audio/sfx/level_up.asm +++ b/audio/sfx/level_up.asm @@ -1,63 +1,63 @@ -SFX_Level_Up_Ch4: - executemusic +SFX_Level_Up_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - toggleperfectpitch - notetype 6, 11, 4 + duty_cycle 2 + toggle_perfect_pitch + note_type 6, 11, 4 octave 4 - F_ 4 - notetype 4, 11, 2 - C_ 2 - F_ 2 - C_ 2 - notetype 6, 11, 3 - D# 2 - D# 2 - E_ 2 - notetype 6, 11, 4 - F_ 8 - endchannel + note F_, 4 + note_type 4, 11, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note_type 6, 11, 3 + note D#, 2 + note D#, 2 + note E_, 2 + note_type 6, 11, 4 + note F_, 8 + sound_ret -SFX_Level_Up_Ch5: - executemusic +SFX_Level_Up_Ch6: + execute_music vibrato 4, 2, 2 - duty 2 - notetype 6, 12, 4 + duty_cycle 2 + note_type 6, 12, 4 octave 4 - A_ 4 - notetype 4, 12, 2 - A_ 2 - A_ 2 - A_ 2 - notetype 6, 12, 4 - A# 2 - A# 2 - A# 2 - notetype 6, 12, 4 - A_ 8 - endchannel + note A_, 4 + note_type 4, 12, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note_type 6, 12, 4 + note A#, 2 + note A#, 2 + note A#, 2 + note_type 6, 12, 4 + note A_, 8 + sound_ret -SFX_Level_Up_Ch6: - executemusic - notetype 6, 1, 0 +SFX_Level_Up_Ch7: + execute_music + note_type 6, 1, 0 octave 5 - A_ 4 - notetype 4, 1, 0 - F_ 1 + note A_, 4 + note_type 4, 1, 0 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - notetype 6, 1, 0 - G_ 1 + note_type 6, 1, 0 + note G_, 1 rest 1 - D# 1 + note D#, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - A_ 8 - endchannel + note A_, 8 + sound_ret diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm index aa7787ff..52eb96d7 100644 --- a/audio/sfx/muted_snare1_1.asm +++ b/audio/sfx/muted_snare1_1.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_1_Ch7: - noisenote 0, 10, 1, 24 - noisenote 0, 3, 1, 51 - endchannel +SFX_Muted_Snare1_1_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm index 8b0cbde3..c3e29c16 100644 --- a/audio/sfx/muted_snare1_2.asm +++ b/audio/sfx/muted_snare1_2.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_2_Ch7: - noisenote 0, 10, 1, 24 - noisenote 0, 3, 1, 51 - endchannel +SFX_Muted_Snare1_2_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm index 7487c98f..a83ecd94 100644 --- a/audio/sfx/muted_snare1_3.asm +++ b/audio/sfx/muted_snare1_3.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_3_Ch7: - noisenote 0, 10, 1, 24 - noisenote 0, 3, 1, 51 - endchannel +SFX_Muted_Snare1_3_Ch8: + noise_note 0, 10, 1, 24 + noise_note 0, 3, 1, 51 + sound_ret diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm index cca5a93e..a8066238 100644 --- a/audio/sfx/muted_snare2_1.asm +++ b/audio/sfx/muted_snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_1_Ch7: - noisenote 0, 9, 1, 34 - endchannel +SFX_Muted_Snare2_1_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm index e33c7837..32bb41f5 100644 --- a/audio/sfx/muted_snare2_2.asm +++ b/audio/sfx/muted_snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_2_Ch7: - noisenote 0, 9, 1, 34 - endchannel +SFX_Muted_Snare2_2_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm index d53965e4..5c3b743e 100644 --- a/audio/sfx/muted_snare2_3.asm +++ b/audio/sfx/muted_snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_3_Ch7: - noisenote 0, 9, 1, 34 - endchannel +SFX_Muted_Snare2_3_Ch8: + noise_note 0, 9, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm index 1140a92b..0538f8d5 100644 --- a/audio/sfx/muted_snare3_1.asm +++ b/audio/sfx/muted_snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_1_Ch7: - noisenote 0, 7, 1, 34 - endchannel +SFX_Muted_Snare3_1_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm index 4e5eff53..20c3772c 100644 --- a/audio/sfx/muted_snare3_2.asm +++ b/audio/sfx/muted_snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_2_Ch7: - noisenote 0, 7, 1, 34 - endchannel +SFX_Muted_Snare3_2_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm index d11099b5..2ac3f874 100644 --- a/audio/sfx/muted_snare3_3.asm +++ b/audio/sfx/muted_snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_3_Ch7: - noisenote 0, 7, 1, 34 - endchannel +SFX_Muted_Snare3_3_Ch8: + noise_note 0, 7, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm index aac775e4..575829ae 100644 --- a/audio/sfx/muted_snare4_1.asm +++ b/audio/sfx/muted_snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_1_Ch7: - noisenote 0, 6, 1, 34 - endchannel +SFX_Muted_Snare4_1_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm index 8cc7e02e..19744539 100644 --- a/audio/sfx/muted_snare4_2.asm +++ b/audio/sfx/muted_snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_2_Ch7: - noisenote 0, 6, 1, 34 - endchannel +SFX_Muted_Snare4_2_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm index fcc7455b..188f9bff 100644 --- a/audio/sfx/muted_snare4_3.asm +++ b/audio/sfx/muted_snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_3_Ch7: - noisenote 0, 6, 1, 34 - endchannel +SFX_Muted_Snare4_3_Ch8: + noise_note 0, 6, 1, 34 + sound_ret diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 2220bf03..c8dfe725 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,6 +1,6 @@ -SFX_Not_Very_Effective_Ch7: - noisenote 4, 8, -7, 85 - noisenote 2, 15, 4, 68 - noisenote 8, 15, 4, 34 - noisenote 15, 15, 2, 33 - endchannel +SFX_Not_Very_Effective_Ch8: + noise_note 4, 8, -7, 85 + noise_note 2, 15, 4, 68 + noise_note 8, 15, 4, 34 + noise_note 15, 15, 2, 33 + sound_ret diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index c52ce4d0..d478dff6 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ -SFX_Peck_Ch7: - noisenote 2, 10, 1, 18 - endchannel +SFX_Peck_Ch8: + noise_note 2, 10, 1, 18 + sound_ret diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index 8deaafe5..2c922df7 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_1_Ch4: - duty 0 - pitchenvelope 1, 4 - squarenote 4, 15, 2, 1536 - loopchannel 4, SFX_Poisoned_1_Ch4 - squarenote 15, 15, 3, 1536 - pitchenvelope 0, 0 - endchannel +SFX_Poisoned_1_Ch5: + duty_cycle 0 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + sound_loop 4, SFX_Poisoned_1_Ch5 + square_note 15, 15, 3, 1536 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index a66aaf7a..2c0b58cc 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,8 +1,8 @@ -SFX_Poisoned_3_Ch4: - duty 0 - pitchenvelope 1, 4 - squarenote 4, 15, 2, 1536 - loopchannel 4, SFX_Poisoned_3_Ch4 - squarenote 15, 15, 3, 1536 - pitchenvelope 0, 0 - endchannel +SFX_Poisoned_3_Ch5: + duty_cycle 0 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + sound_loop 4, SFX_Poisoned_3_Ch5 + square_note 15, 15, 3, 1536 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm index 1e0f95f5..0df1138f 100644 --- a/audio/sfx/pokedex_rating_1.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -1,77 +1,77 @@ -SFX_Pokedex_Rating_1_Ch4: - executemusic +SFX_Pokedex_Rating_1_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - notetype 5, 11, 1 + duty_cycle 2 + note_type 5, 11, 1 octave 3 - A_ 2 - A_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 2 - A_ 2 + note A_, 2 + note A_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note A_, 2 octave 4 - C_ 4 - E_ 4 + note C_, 4 + note E_, 4 octave 3 - F_ 4 - endchannel + note F_, 4 + sound_ret -SFX_Pokedex_Rating_1_Ch5: - executemusic - duty 2 - notetype 5, 12, 2 +SFX_Pokedex_Rating_1_Ch6: + execute_music + duty_cycle 2 + note_type 5, 12, 2 octave 5 - F_ 2 - E_ 1 + note F_, 2 + note E_, 1 rest 1 - D_ 2 - C_ 1 + note D_, 2 + note C_, 1 rest 1 octave 4 - A# 2 + note A#, 2 octave 5 - C_ 2 - D_ 2 - E_ 2 - F_ 4 - G_ 4 - F_ 4 - endchannel + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 4 + note G_, 4 + note F_, 4 + sound_ret -SFX_Pokedex_Rating_1_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Pokedex_Rating_1_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - A# 1 + note A#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 3 - C_ 1 + note C_, 1 rest 3 octave 4 - F_ 2 + note F_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm index 01ac0e1c..18dbcda2 100644 --- a/audio/sfx/pokedex_rating_3.asm +++ b/audio/sfx/pokedex_rating_3.asm @@ -1,77 +1,77 @@ -SFX_Pokedex_Rating_3_Ch4: - executemusic +SFX_Pokedex_Rating_3_Ch5: + execute_music tempo 256 volume 7, 7 - duty 2 - notetype 5, 11, 1 + duty_cycle 2 + note_type 5, 11, 1 octave 3 - A_ 2 - A_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 2 - A_ 2 + note A_, 2 + note A_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note A_, 2 octave 4 - C_ 4 - E_ 4 + note C_, 4 + note E_, 4 octave 3 - F_ 4 - endchannel + note F_, 4 + sound_ret -SFX_Pokedex_Rating_3_Ch5: - executemusic - duty 2 - notetype 5, 12, 2 +SFX_Pokedex_Rating_3_Ch6: + execute_music + duty_cycle 2 + note_type 5, 12, 2 octave 5 - F_ 2 - E_ 1 + note F_, 2 + note E_, 1 rest 1 - D_ 2 - C_ 1 + note D_, 2 + note C_, 1 rest 1 octave 4 - A# 2 + note A#, 2 octave 5 - C_ 2 - D_ 2 - E_ 2 - F_ 4 - G_ 4 - F_ 4 - endchannel + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 4 + note G_, 4 + note F_, 4 + sound_ret -SFX_Pokedex_Rating_3_Ch6: - executemusic - notetype 5, 1, 0 +SFX_Pokedex_Rating_3_Ch7: + execute_music + note_type 5, 1, 0 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 1 + note C_, 1 rest 1 octave 4 - A# 1 + note A#, 1 rest 1 - A_ 1 + note A_, 1 rest 1 - G_ 1 + note G_, 1 rest 1 - F_ 1 + note F_, 1 rest 1 - E_ 1 + note E_, 1 rest 1 octave 5 - F_ 1 + note F_, 1 rest 3 - C_ 1 + note C_, 1 rest 3 octave 4 - F_ 2 + note F_, 2 rest 2 - endchannel + sound_ret diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm index 272c114f..88f33d0b 100644 --- a/audio/sfx/pokeflute.asm +++ b/audio/sfx/pokeflute.asm @@ -1,21 +1,21 @@ -SFX_Pokeflute_Ch2: +SFX_Pokeflute_Ch3: vibrato 16, 1, 4 - notetype 12, 1, 0 + note_type 12, 1, 0 octave 5 - E_ 2 - F_ 2 - G_ 4 - A_ 2 - G_ 2 + note E_, 2 + note F_, 2 + note G_, 4 + note A_, 2 + note G_, 2 octave 6 - C_ 4 - C_ 2 - D_ 2 - C_ 2 + note C_, 4 + note C_, 2 + note D_, 2 + note C_, 2 octave 5 - G_ 2 - A_ 2 - F_ 2 - G_ 8 + note G_, 2 + note A_, 2 + note F_, 2 + note G_, 8 rest 12 - endchannel + sound_ret diff --git a/audio/sfx/pokeflute_ch4_ch5.asm b/audio/sfx/pokeflute_ch4_ch5.asm deleted file mode 100644 index 146488d8..00000000 --- a/audio/sfx/pokeflute_ch4_ch5.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_08_PokeFlute_Ch4: - tempo 256 - - -SFX_08_PokeFlute_Ch5: - executemusic - notetype 8, 0, 0 - rest 5 - rest 7 - rest 5 - rest 5 - rest 5 - rest 5 - endchannel diff --git a/audio/sfx/pokeflute_ch5_ch6.asm b/audio/sfx/pokeflute_ch5_ch6.asm new file mode 100644 index 00000000..4f0e96a8 --- /dev/null +++ b/audio/sfx/pokeflute_ch5_ch6.asm @@ -0,0 +1,14 @@ +SFX_Pokeflute_Ch5: + tempo 256 + + +SFX_Pokeflute_Ch6: + execute_music + note_type 8, 0, 0 + rest 5 + rest 7 + rest 5 + rest 5 + rest 5 + rest 5 + sound_ret diff --git a/audio/sfx/pokeflute_ch6.asm b/audio/sfx/pokeflute_ch6.asm deleted file mode 100644 index 4d4e5bae..00000000 --- a/audio/sfx/pokeflute_ch6.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_08_PokeFlute_Ch6: - executemusic - vibrato 16, 1, 4 - notetype 8, 1, 0 - octave 5 - E_ 3 - F_ 3 - G_ 7 - A_ 3 - G_ 3 - octave 6 - C_ 13 - endchannel diff --git a/audio/sfx/pokeflute_ch7.asm b/audio/sfx/pokeflute_ch7.asm new file mode 100644 index 00000000..4435c0fb --- /dev/null +++ b/audio/sfx/pokeflute_ch7.asm @@ -0,0 +1,13 @@ +SFX_Pokeflute_Ch7: + execute_music + vibrato 16, 1, 4 + note_type 8, 1, 0 + octave 5 + note E_, 3 + note F_, 3 + note G_, 7 + note A_, 3 + note G_, 3 + octave 6 + note C_, 13 + sound_ret diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index 3aee5836..d1891751 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ -SFX_Pound_Ch7: - noisenote 2, 10, 1, 34 - endchannel +SFX_Pound_Ch8: + noise_note 2, 10, 1, 34 + sound_ret diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index bfc9635b..7767547c 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,7 +1,7 @@ -SFX_Press_AB_1_Ch4: - duty 2 - squarenote 0, 9, 1, 1984 - squarenote 0, 8, 1, 2000 - squarenote 0, 9, 1, 1984 - squarenote 12, 10, 1, 2000 - endchannel +SFX_Press_AB_1_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index 9ad03c67..7e01bce5 100644 --- a/audio/sfx/press_ab_2.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,7 +1,7 @@ -SFX_Press_AB_2_Ch4: - duty 2 - squarenote 0, 9, 1, 1984 - squarenote 0, 8, 1, 2000 - squarenote 0, 9, 1, 1984 - squarenote 12, 10, 1, 2000 - endchannel +SFX_Press_AB_2_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 67306cbe..4b4c78b9 100644 --- a/audio/sfx/press_ab_3.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,7 +1,7 @@ -SFX_Press_AB_3_Ch4: - duty 2 - squarenote 0, 9, 1, 1984 - squarenote 0, 8, 1, 2000 - squarenote 0, 9, 1, 1984 - squarenote 12, 10, 1, 2000 - endchannel +SFX_Press_AB_3_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 71c7119b..3142fca5 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,25 +1,25 @@ -SFX_Psybeam_Ch4: - dutycycle 161 - squarenote 10, 15, 1, 1600 - squarenote 10, 15, 3, 1664 - squarenote 10, 15, 2, 1568 - loopchannel 4, SFX_Psybeam_Ch4 - squarenote 10, 15, 1, 1600 - endchannel +SFX_Psybeam_Ch5: + duty_cycle_pattern 161 + square_note 10, 15, 1, 1600 + square_note 10, 15, 3, 1664 + square_note 10, 15, 2, 1568 + sound_loop 4, SFX_Psybeam_Ch5 + square_note 10, 15, 1, 1600 + sound_ret -SFX_Psybeam_Ch5: - dutycycle 179 - squarenote 10, 15, 3, 1393 - squarenote 7, 14, 3, 1329 - squarenote 10, 15, 1, 1361 - loopchannel 4, SFX_Psybeam_Ch5 - squarenote 10, 15, 1, 1393 - endchannel +SFX_Psybeam_Ch6: + duty_cycle_pattern 179 + square_note 10, 15, 3, 1393 + square_note 7, 14, 3, 1329 + square_note 10, 15, 1, 1361 + sound_loop 4, SFX_Psybeam_Ch6 + square_note 10, 15, 1, 1393 + sound_ret -SFX_Psybeam_Ch7: - noisenote 2, 13, 1, 74 - noisenote 2, 13, 2, 42 - loopchannel 21, SFX_Psybeam_Ch7 - endchannel +SFX_Psybeam_Ch8: + noise_note 2, 13, 1, 74 + noise_note 2, 13, 2, 42 + sound_loop 21, SFX_Psybeam_Ch8 + sound_ret diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index a9cd5ec3..c6e11d42 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,32 +1,32 @@ -SFX_Psychic_M_Ch4: - duty 2 - pitchenvelope 15, 7 - squarenote 8, 12, 4, 1981 - squarenote 8, 12, 4, 1982 - squarenote 8, 12, 4, 1983 - squarenote 8, 12, 4, 1984 - squarenote 15, 12, 4, 1985 - squarenote 15, 15, 2, 1984 - pitchenvelope 0, 0 - endchannel +SFX_Psychic_M_Ch5: + duty_cycle 2 + pitch_sweep 15, 7 + square_note 8, 12, 4, 1981 + square_note 8, 12, 4, 1982 + square_note 8, 12, 4, 1983 + square_note 8, 12, 4, 1984 + square_note 15, 12, 4, 1985 + square_note 15, 15, 2, 1984 + pitch_sweep 0, 0 + sound_ret -SFX_Psychic_M_Ch5: - duty 2 - squarenote 8, 12, 4, 1904 - squarenote 8, 12, 4, 1889 - squarenote 8, 12, 4, 1890 - squarenote 8, 12, 4, 1891 - squarenote 15, 12, 4, 1892 - squarenote 15, 15, 2, 1892 - endchannel +SFX_Psychic_M_Ch6: + duty_cycle 2 + square_note 8, 12, 4, 1904 + square_note 8, 12, 4, 1889 + square_note 8, 12, 4, 1890 + square_note 8, 12, 4, 1891 + square_note 15, 12, 4, 1892 + square_note 15, 15, 2, 1892 + sound_ret -SFX_Psychic_M_Ch7: - noisenote 15, 3, -7, 20 - noisenote 15, 12, -7, 19 - noisenote 15, 12, -7, 18 - noisenote 15, 12, -7, 17 - noisenote 15, 12, -7, 16 - noisenote 15, 12, 2, 16 - endchannel +SFX_Psychic_M_Ch8: + noise_note 15, 3, -7, 20 + noise_note 15, 12, -7, 19 + noise_note 15, 12, -7, 18 + noise_note 15, 12, -7, 17 + noise_note 15, 12, -7, 16 + noise_note 15, 12, 2, 16 + sound_ret diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index bb8c3cce..9dc06f0b 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,13 +1,13 @@ -SFX_Purchase_1_Ch4: - duty 2 - squarenote 4, 14, 1, 1792 - squarenote 8, 15, 2, 2016 - endchannel +SFX_Purchase_1_Ch5: + duty_cycle 2 + square_note 4, 14, 1, 1792 + square_note 8, 15, 2, 2016 + sound_ret -SFX_Purchase_1_Ch5: - duty 2 - squarenote 1, 0, 8, 0 - squarenote 4, 9, 1, 1729 - squarenote 8, 10, 2, 1953 - endchannel +SFX_Purchase_1_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 9, 1, 1729 + square_note 8, 10, 2, 1953 + sound_ret diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index 454e6f83..eaa4bb60 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -1,13 +1,13 @@ -SFX_Purchase_3_Ch4: - duty 2 - squarenote 4, 14, 1, 1792 - squarenote 8, 15, 2, 2016 - endchannel +SFX_Purchase_3_Ch5: + duty_cycle 2 + square_note 4, 14, 1, 1792 + square_note 8, 15, 2, 2016 + sound_ret -SFX_Purchase_3_Ch5: - duty 2 - squarenote 1, 0, 8, 0 - squarenote 4, 9, 1, 1729 - squarenote 8, 10, 2, 1953 - endchannel +SFX_Purchase_3_Ch6: + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 9, 1, 1729 + square_note 8, 10, 2, 1953 + sound_ret diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index bf7bf116..c2155ca9 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,10 +1,10 @@ -SFX_Push_Boulder_1_Ch7: - noisenote 4, 10, 2, 35 - noisenote 8, 15, 1, 52 - noisenote 15, 0, 0, 0 - noisenote 2, 15, 7, 36 - noisenote 2, 15, 7, 52 - noisenote 4, 15, 7, 68 - noisenote 8, 15, 4, 85 - noisenote 8, 15, 1, 68 - endchannel +SFX_Push_Boulder_1_Ch8: + noise_note 4, 10, 2, 35 + noise_note 8, 15, 1, 52 + noise_note 15, 0, 0, 0 + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index f554da55..5f084139 100644 --- a/audio/sfx/push_boulder_3.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,10 +1,10 @@ -SFX_Push_Boulder_3_Ch7: - noisenote 4, 10, 2, 35 - noisenote 8, 15, 1, 52 - noisenote 15, 0, 0, 0 - noisenote 2, 15, 7, 36 - noisenote 2, 15, 7, 52 - noisenote 4, 15, 7, 68 - noisenote 8, 15, 4, 85 - noisenote 8, 15, 1, 68 - endchannel +SFX_Push_Boulder_3_Ch8: + noise_note 4, 10, 2, 35 + noise_note 8, 15, 1, 52 + noise_note 15, 0, 0, 0 + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index b59ceefa..b4ed791b 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,13 +1,13 @@ -SFX_Run_Ch7: - noisenote 2, 6, 1, 35 - noisenote 2, 10, 1, 51 - noisenote 2, 12, 1, 51 - noisenote 2, 5, 1, 17 - noisenote 2, 15, 1, 51 - noisenote 2, 4, 1, 17 - noisenote 2, 12, 1, 51 - noisenote 2, 3, 1, 17 - noisenote 2, 8, 1, 51 - noisenote 2, 3, 1, 17 - noisenote 8, 4, 1, 51 - endchannel +SFX_Run_Ch8: + noise_note 2, 6, 1, 35 + noise_note 2, 10, 1, 51 + noise_note 2, 12, 1, 51 + noise_note 2, 5, 1, 17 + noise_note 2, 15, 1, 51 + noise_note 2, 4, 1, 17 + noise_note 2, 12, 1, 51 + noise_note 2, 3, 1, 17 + noise_note 2, 8, 1, 51 + noise_note 2, 3, 1, 17 + noise_note 8, 4, 1, 51 + sound_ret diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index 5692b0d6..6ce7b7c3 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,9 +1,9 @@ -SFX_Safari_Zone_PA_Ch4: - duty 2 - squarenote 15, 15, 3, 1840 - squarenote 8, 6, 5, 1840 - squarenote 15, 15, 4, 1792 - squarenote 15, 7, 4, 1792 - squarenote 15, 4, 4, 1792 - squarenote 15, 2, 4, 1792 - endchannel +SFX_Safari_Zone_PA_Ch5: + duty_cycle 2 + square_note 15, 15, 3, 1840 + square_note 8, 6, 5, 1840 + square_note 15, 15, 4, 1792 + square_note 15, 7, 4, 1792 + square_note 15, 4, 4, 1792 + square_note 15, 2, 4, 1792 + sound_ret diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index 07702b4d..d0849ff5 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,23 +1,23 @@ -SFX_Save_1_Ch4: - duty 2 - squarenote 4, 15, 4, 1792 - squarenote 2, 14, 4, 1536 - squarenote 2, 14, 4, 1664 - squarenote 2, 14, 4, 1728 - squarenote 2, 14, 4, 1792 - squarenote 2, 14, 4, 1952 - squarenote 15, 15, 2, 2016 - endchannel +SFX_Save_1_Ch5: + duty_cycle 2 + square_note 4, 15, 4, 1792 + square_note 2, 14, 4, 1536 + square_note 2, 14, 4, 1664 + square_note 2, 14, 4, 1728 + square_note 2, 14, 4, 1792 + square_note 2, 14, 4, 1952 + square_note 15, 15, 2, 2016 + sound_ret -SFX_Save_1_Ch5: - duty 2 - squarenote 4, 0, 8, 0 - squarenote 2, 13, 4, 1793 - squarenote 2, 12, 4, 1537 - squarenote 2, 12, 4, 1665 - squarenote 2, 12, 4, 1729 - squarenote 2, 12, 4, 1793 - squarenote 2, 12, 4, 1953 - squarenote 15, 13, 2, 2017 - endchannel +SFX_Save_1_Ch6: + duty_cycle 2 + square_note 4, 0, 8, 0 + square_note 2, 13, 4, 1793 + square_note 2, 12, 4, 1537 + square_note 2, 12, 4, 1665 + square_note 2, 12, 4, 1729 + square_note 2, 12, 4, 1793 + square_note 2, 12, 4, 1953 + square_note 15, 13, 2, 2017 + sound_ret diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index eda54e9e..8db092b2 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,36 +1,36 @@ -SFX_Save_3_Ch4: - duty 2 +SFX_Save_3_Ch5: + duty_cycle 2 IF DEF(_RED) - squarenote 4, 15, 4, 1792 - squarenote 3, 14, 4, 1664 - squarenote 3, 14, 4, 1728 - squarenote 3, 14, 4, 1792 - squarenote 2, 14, 4, 1952 + square_note 4, 15, 4, 1792 + square_note 3, 14, 4, 1664 + square_note 3, 14, 4, 1728 + square_note 3, 14, 4, 1792 + square_note 2, 14, 4, 1952 ELSE - squarenote 3, 14, 4, 1536 - squarenote 3, 14, 4, 1664 - squarenote 3, 14, 4, 1728 - squarenote 3, 14, 4, 1792 - squarenote 15, 15, 2, 2016 + square_note 3, 14, 4, 1536 + square_note 3, 14, 4, 1664 + square_note 3, 14, 4, 1728 + square_note 3, 14, 4, 1792 + square_note 15, 15, 2, 2016 ENDC - endchannel + sound_ret -SFX_Save_3_Ch5: - duty 2 +SFX_Save_3_Ch6: + duty_cycle 2 IF DEF(_RED) - squarenote 4, 0, 8, 0 - squarenote 3, 13, 4, 1793 - squarenote 3, 12, 4, 1665 - squarenote 3, 12, 4, 1729 - squarenote 3, 12, 4, 1793 - squarenote 2, 12, 4, 1953 + square_note 4, 0, 8, 0 + square_note 3, 13, 4, 1793 + square_note 3, 12, 4, 1665 + square_note 3, 12, 4, 1729 + square_note 3, 12, 4, 1793 + square_note 2, 12, 4, 1953 ELSE - squarenote 3, 0, 8, 0 - squarenote 3, 12, 4, 1537 - squarenote 3, 12, 4, 1665 - squarenote 3, 12, 4, 1729 - squarenote 3, 12, 4, 1793 - squarenote 15, 13, 2, 2017 + square_note 3, 0, 8, 0 + square_note 3, 12, 4, 1537 + square_note 3, 12, 4, 1665 + square_note 3, 12, 4, 1729 + square_note 3, 12, 4, 1793 + square_note 15, 13, 2, 2017 ENDC - endchannel + sound_ret diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index fbd158fd..796400a4 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,14 +1,14 @@ -SFX_Shooting_Star_Ch4: - dutycycle 228 - pitchenvelope 2, -7 - squarenote 4, 4, 0, 2016 - squarenote 4, 6, 0, 2016 - squarenote 4, 8, 0, 2016 - squarenote 8, 10, 0, 2016 - squarenote 8, 10, 0, 2016 - squarenote 8, 8, 0, 2016 - squarenote 8, 6, 0, 2016 - squarenote 8, 3, 0, 2016 - squarenote 15, 1, 2, 2016 - pitchenvelope 0, 0 - endchannel +SFX_Shooting_Star_Ch5: + duty_cycle_pattern 228 + pitch_sweep 2, -7 + square_note 4, 4, 0, 2016 + square_note 4, 6, 0, 2016 + square_note 4, 8, 0, 2016 + square_note 8, 10, 0, 2016 + square_note 8, 10, 0, 2016 + square_note 8, 8, 0, 2016 + square_note 8, 6, 0, 2016 + square_note 8, 3, 0, 2016 + square_note 15, 1, 2, 2016 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index df1fb338..ae869564 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,10 +1,10 @@ -SFX_Shrink_1_Ch4: - duty 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1536 - squarenote 15, 11, 7, 1408 - squarenote 15, 8, 7, 1280 - squarenote 15, 4, 7, 1152 - squarenote 15, 1, 7, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Shrink_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1536 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1280 + square_note 15, 4, 7, 1152 + square_note 15, 1, 7, 1024 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index 37a8b572..b944680f 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,10 +1,10 @@ -SFX_Shrink_3_Ch4: - duty 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1536 - squarenote 15, 11, 7, 1408 - squarenote 15, 8, 7, 1280 - squarenote 15, 4, 7, 1152 - squarenote 15, 1, 7, 1024 - pitchenvelope 0, 0 - endchannel +SFX_Shrink_3_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1536 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1280 + square_note 15, 4, 7, 1152 + square_note 15, 1, 7, 1024 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index 94914320..4a565740 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,9 +1,9 @@ -SFX_Silph_Scope_Ch4: - duty 0 - squarenote 0, 13, 2, 1792 - squarenote 0, 13, 2, 1856 - squarenote 0, 13, 2, 1920 - squarenote 0, 13, 2, 1984 - squarenote 10, 14, 1, 2016 - squarenote 1, 0, 0, 0 - endchannel +SFX_Silph_Scope_Ch5: + duty_cycle 0 + square_note 0, 13, 2, 1792 + square_note 0, 13, 2, 1856 + square_note 0, 13, 2, 1920 + square_note 0, 13, 2, 1984 + square_note 10, 14, 1, 2016 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index df897225..a8b668b8 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,14 +1,14 @@ -SFX_Slots_New_Spin_Ch4: - duty 3 - squarenote 5, 14, 1, 1792 - squarenote 2, 14, 1, 1920 - squarenote 15, 15, 1, 1984 - endchannel +SFX_Slots_New_Spin_Ch5: + duty_cycle 3 + square_note 5, 14, 1, 1792 + square_note 2, 14, 1, 1920 + square_note 15, 15, 1, 1984 + sound_ret -SFX_Slots_New_Spin_Ch5: - duty 2 - squarenote 4, 12, 1, 1729 - squarenote 2, 12, 1, 1857 - squarenote 15, 13, 1, 1921 - endchannel +SFX_Slots_New_Spin_Ch6: + duty_cycle 2 + square_note 4, 12, 1, 1729 + square_note 2, 12, 1, 1857 + square_note 15, 13, 1, 1921 + sound_ret diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index b82db160..8f2d1829 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,5 +1,5 @@ -SFX_Slots_Reward_Ch4: - duty 2 - squarenote 2, 15, 1, 1792 - squarenote 8, 8, 1, 2016 - endchannel +SFX_Slots_Reward_Ch5: + duty_cycle 2 + square_note 2, 15, 1, 1792 + square_note 8, 8, 1, 2016 + sound_ret diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index 6c462c16..b9a69c19 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,6 +1,6 @@ -SFX_Slots_Stop_Wheel_Ch4: - duty 2 - squarenote 1, 15, 2, 1696 - squarenote 1, 15, 2, 1760 - squarenote 8, 15, 1, 1792 - endchannel +SFX_Slots_Stop_Wheel_Ch5: + duty_cycle 2 + square_note 1, 15, 2, 1696 + square_note 1, 15, 2, 1760 + square_note 8, 15, 1, 1792 + sound_ret diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm index 999b91dc..a6e569a5 100644 --- a/audio/sfx/snare1_1.asm +++ b/audio/sfx/snare1_1.asm @@ -1,3 +1,3 @@ -SFX_Snare1_1_Ch7: - noisenote 0, 12, 1, 51 - endchannel +SFX_Snare1_1_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm index 994ff3de..336c9f22 100644 --- a/audio/sfx/snare1_2.asm +++ b/audio/sfx/snare1_2.asm @@ -1,3 +1,3 @@ -SFX_Snare1_2_Ch7: - noisenote 0, 12, 1, 51 - endchannel +SFX_Snare1_2_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm index 87f4e817..84108aed 100644 --- a/audio/sfx/snare1_3.asm +++ b/audio/sfx/snare1_3.asm @@ -1,3 +1,3 @@ -SFX_Snare1_3_Ch7: - noisenote 0, 12, 1, 51 - endchannel +SFX_Snare1_3_Ch8: + noise_note 0, 12, 1, 51 + sound_ret diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm index 6a9e5cd9..fddcfe01 100644 --- a/audio/sfx/snare2_1.asm +++ b/audio/sfx/snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Snare2_1_Ch7: - noisenote 0, 11, 1, 51 - endchannel +SFX_Snare2_1_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm index e8f7c5f9..522abb40 100644 --- a/audio/sfx/snare2_2.asm +++ b/audio/sfx/snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Snare2_2_Ch7: - noisenote 0, 11, 1, 51 - endchannel +SFX_Snare2_2_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm index 9775a6e9..c41fadbb 100644 --- a/audio/sfx/snare2_3.asm +++ b/audio/sfx/snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Snare2_3_Ch7: - noisenote 0, 11, 1, 51 - endchannel +SFX_Snare2_3_Ch8: + noise_note 0, 11, 1, 51 + sound_ret diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm index 215eaec4..0c9cfbdb 100644 --- a/audio/sfx/snare3_1.asm +++ b/audio/sfx/snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Snare3_1_Ch7: - noisenote 0, 10, 1, 51 - endchannel +SFX_Snare3_1_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm index 18a301b5..d5990157 100644 --- a/audio/sfx/snare3_2.asm +++ b/audio/sfx/snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Snare3_2_Ch7: - noisenote 0, 10, 1, 51 - endchannel +SFX_Snare3_2_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm index decd3ab6..807cfd03 100644 --- a/audio/sfx/snare3_3.asm +++ b/audio/sfx/snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Snare3_3_Ch7: - noisenote 0, 10, 1, 51 - endchannel +SFX_Snare3_3_Ch8: + noise_note 0, 10, 1, 51 + sound_ret diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm index 3cf12af2..fe2552d9 100644 --- a/audio/sfx/snare4_1.asm +++ b/audio/sfx/snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Snare4_1_Ch7: - noisenote 0, 8, 1, 51 - endchannel +SFX_Snare4_1_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm index f97fab11..0913ba2b 100644 --- a/audio/sfx/snare4_2.asm +++ b/audio/sfx/snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Snare4_2_Ch7: - noisenote 0, 8, 1, 51 - endchannel +SFX_Snare4_2_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm index 57b70600..3aeeb49b 100644 --- a/audio/sfx/snare4_3.asm +++ b/audio/sfx/snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Snare4_3_Ch7: - noisenote 0, 8, 1, 51 - endchannel +SFX_Snare4_3_Ch8: + noise_note 0, 8, 1, 51 + sound_ret diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm index deb1bc43..21d4996d 100644 --- a/audio/sfx/snare5_1.asm +++ b/audio/sfx/snare5_1.asm @@ -1,8 +1,8 @@ -SFX_Snare5_1_Ch7: - noisenote 7, 8, 4, 55 - noisenote 6, 8, 4, 54 - noisenote 5, 8, 3, 53 - noisenote 4, 8, 3, 52 - noisenote 3, 8, 2, 51 - noisenote 2, 8, 1, 50 - endchannel +SFX_Snare5_1_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm index 5c45259b..c37865a0 100644 --- a/audio/sfx/snare5_2.asm +++ b/audio/sfx/snare5_2.asm @@ -1,8 +1,8 @@ -SFX_Snare5_2_Ch7: - noisenote 7, 8, 4, 55 - noisenote 6, 8, 4, 54 - noisenote 5, 8, 3, 53 - noisenote 4, 8, 3, 52 - noisenote 3, 8, 2, 51 - noisenote 2, 8, 1, 50 - endchannel +SFX_Snare5_2_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm index 22836d10..d49211d0 100644 --- a/audio/sfx/snare5_3.asm +++ b/audio/sfx/snare5_3.asm @@ -1,8 +1,8 @@ -SFX_Snare5_3_Ch7: - noisenote 7, 8, 4, 55 - noisenote 6, 8, 4, 54 - noisenote 5, 8, 3, 53 - noisenote 4, 8, 3, 52 - noisenote 3, 8, 2, 51 - noisenote 2, 8, 1, 50 - endchannel +SFX_Snare5_3_Ch8: + noise_note 7, 8, 4, 55 + noise_note 6, 8, 4, 54 + noise_note 5, 8, 3, 53 + noise_note 4, 8, 3, 52 + noise_note 3, 8, 2, 51 + noise_note 2, 8, 1, 50 + sound_ret diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm index 5ed7338f..03a63d40 100644 --- a/audio/sfx/snare6_1.asm +++ b/audio/sfx/snare6_1.asm @@ -1,3 +1,3 @@ -SFX_Snare6_1_Ch7: - noisenote 0, 8, 1, 16 - endchannel +SFX_Snare6_1_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm index dc7b6f34..7adad3fb 100644 --- a/audio/sfx/snare6_2.asm +++ b/audio/sfx/snare6_2.asm @@ -1,3 +1,3 @@ -SFX_Snare6_2_Ch7: - noisenote 0, 8, 1, 16 - endchannel +SFX_Snare6_2_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm index 4d061316..9a6b7be3 100644 --- a/audio/sfx/snare6_3.asm +++ b/audio/sfx/snare6_3.asm @@ -1,3 +1,3 @@ -SFX_Snare6_3_Ch7: - noisenote 0, 8, 1, 16 - endchannel +SFX_Snare6_3_Ch8: + noise_note 0, 8, 1, 16 + sound_ret diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm index 993a35de..1e216fea 100644 --- a/audio/sfx/snare7_1.asm +++ b/audio/sfx/snare7_1.asm @@ -1,3 +1,3 @@ -SFX_Snare7_1_Ch7: - noisenote 0, 8, 2, 35 - endchannel +SFX_Snare7_1_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm index 46ed89a5..11a13239 100644 --- a/audio/sfx/snare7_2.asm +++ b/audio/sfx/snare7_2.asm @@ -1,3 +1,3 @@ -SFX_Snare7_2_Ch7: - noisenote 0, 8, 2, 35 - endchannel +SFX_Snare7_2_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm index 663fdf0c..c9d96902 100644 --- a/audio/sfx/snare7_3.asm +++ b/audio/sfx/snare7_3.asm @@ -1,3 +1,3 @@ -SFX_Snare7_3_Ch7: - noisenote 0, 8, 2, 35 - endchannel +SFX_Snare7_3_Ch8: + noise_note 0, 8, 2, 35 + sound_ret diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm index 0c64b371..9dcc4381 100644 --- a/audio/sfx/snare8_1.asm +++ b/audio/sfx/snare8_1.asm @@ -1,3 +1,3 @@ -SFX_Snare8_1_Ch7: - noisenote 0, 8, 2, 37 - endchannel +SFX_Snare8_1_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm index 88ece7c2..020de92f 100644 --- a/audio/sfx/snare8_2.asm +++ b/audio/sfx/snare8_2.asm @@ -1,3 +1,3 @@ -SFX_Snare8_2_Ch7: - noisenote 0, 8, 2, 37 - endchannel +SFX_Snare8_2_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm index 9abaa56e..ecb6a9a7 100644 --- a/audio/sfx/snare8_3.asm +++ b/audio/sfx/snare8_3.asm @@ -1,3 +1,3 @@ -SFX_Snare8_3_Ch7: - noisenote 0, 8, 2, 37 - endchannel +SFX_Snare8_3_Ch8: + noise_note 0, 8, 2, 37 + sound_ret diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm index 58bfca9a..674efb12 100644 --- a/audio/sfx/snare9_1.asm +++ b/audio/sfx/snare9_1.asm @@ -1,3 +1,3 @@ -SFX_Snare9_1_Ch7: - noisenote 0, 8, 2, 38 - endchannel +SFX_Snare9_1_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm index b8f43254..9d8f307d 100644 --- a/audio/sfx/snare9_2.asm +++ b/audio/sfx/snare9_2.asm @@ -1,3 +1,3 @@ -SFX_Snare9_2_Ch7: - noisenote 0, 8, 2, 38 - endchannel +SFX_Snare9_2_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm index 001ed29f..6bfd1973 100644 --- a/audio/sfx/snare9_3.asm +++ b/audio/sfx/snare9_3.asm @@ -1,3 +1,3 @@ -SFX_Snare9_3_Ch7: - noisenote 0, 8, 2, 38 - endchannel +SFX_Snare9_3_Ch8: + noise_note 0, 8, 2, 38 + sound_ret diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index d2c57bc3..7f5094f4 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,22 +1,22 @@ -SFX_SS_Anne_Horn_1_Ch4: - duty 2 - squarenote 15, 15, 0, 1280 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 2, 1280 - endchannel +SFX_SS_Anne_Horn_1_Ch5: + duty_cycle 2 + square_note 15, 15, 0, 1280 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 2, 1280 + sound_ret -SFX_SS_Anne_Horn_1_Ch5: - duty 3 - squarenote 15, 15, 0, 1154 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 2, 1154 - endchannel +SFX_SS_Anne_Horn_1_Ch6: + duty_cycle 3 + square_note 15, 15, 0, 1154 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 2, 1154 + sound_ret diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index 3672d3d5..fda8e346 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,22 +1,22 @@ -SFX_SS_Anne_Horn_3_Ch4: - duty 2 - squarenote 15, 15, 0, 1280 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 0, 1280 - squarenote 15, 15, 2, 1280 - endchannel +SFX_SS_Anne_Horn_3_Ch5: + duty_cycle 2 + square_note 15, 15, 0, 1280 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 2, 1280 + sound_ret -SFX_SS_Anne_Horn_3_Ch5: - duty 3 - squarenote 15, 15, 0, 1154 - squarenote 4, 0, 0, 0 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 0, 1154 - squarenote 15, 15, 2, 1154 - endchannel +SFX_SS_Anne_Horn_3_Ch6: + duty_cycle 3 + square_note 15, 15, 0, 1154 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 2, 1154 + sound_ret diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index 84c28d8a..c82e97e1 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_1_Ch7: - noisenote 1, 14, 2, 51 - noisenote 8, 14, 1, 34 - endchannel +SFX_Start_Menu_1_Ch8: + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm index a9689acf..9860346d 100644 --- a/audio/sfx/start_menu_2.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_2_Ch7: - noisenote 1, 14, 2, 51 - noisenote 8, 14, 1, 34 - endchannel +SFX_Start_Menu_2_Ch8: + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm index f437a4c3..d114af51 100644 --- a/audio/sfx/start_menu_3.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_3_Ch7: - noisenote 1, 14, 2, 51 - noisenote 8, 14, 1, 34 - endchannel +SFX_Start_Menu_3_Ch8: + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index ebc1e0b7..c6e25dc9 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ -SFX_Super_Effective_Ch7: - noisenote 4, 15, 1, 52 - noisenote 15, 15, 2, 100 - endchannel +SFX_Super_Effective_Ch8: + noise_note 4, 15, 1, 52 + noise_note 15, 15, 2, 100 + sound_ret diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index d200f3b8..98bfff72 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,11 +1,11 @@ -SFX_Swap_1_Ch4: - duty 2 - squarenote 8, 14, 1, 1856 - endchannel +SFX_Swap_1_Ch5: + duty_cycle 2 + square_note 8, 14, 1, 1856 + sound_ret -SFX_Swap_1_Ch5: - duty 2 - squarenote 2, 0, 8, 0 - squarenote 8, 11, 1, 1857 - endchannel +SFX_Swap_1_Ch6: + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 8, 11, 1, 1857 + sound_ret diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 04d795b6..8e86ac7c 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -1,11 +1,11 @@ -SFX_Swap_3_Ch4: - duty 2 - squarenote 8, 14, 1, 1856 - endchannel +SFX_Swap_3_Ch5: + duty_cycle 2 + square_note 8, 14, 1, 1856 + sound_ret -SFX_Swap_3_Ch5: - duty 2 - squarenote 2, 0, 8, 0 - squarenote 8, 11, 1, 1857 - endchannel +SFX_Swap_3_Ch6: + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 8, 11, 1, 1857 + sound_ret diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index 76f64e04..145fd35a 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,8 +1,8 @@ -SFX_Switch_1_Ch4: - duty 2 - squarenote 4, 0, 0, 0 - squarenote 2, 15, 1, 1664 - squarenote 1, 0, 0, 0 - squarenote 4, 15, 1, 1920 - squarenote 4, 0, 0, 0 - endchannel +SFX_Switch_1_Ch5: + duty_cycle 2 + square_note 4, 0, 0, 0 + square_note 2, 15, 1, 1664 + square_note 1, 0, 0, 0 + square_note 4, 15, 1, 1920 + square_note 4, 0, 0, 0 + sound_ret diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index 0663b2ed..ce6f1f15 100644 --- a/audio/sfx/switch_3.asm +++ b/audio/sfx/switch_3.asm @@ -1,8 +1,8 @@ -SFX_Switch_3_Ch4: - duty 2 - squarenote 4, 0, 0, 0 - squarenote 2, 15, 1, 1664 - squarenote 1, 0, 0, 0 - squarenote 4, 15, 1, 1920 - squarenote 4, 0, 0, 0 - endchannel +SFX_Switch_3_Ch5: + duty_cycle 2 + square_note 4, 0, 0, 0 + square_note 2, 15, 1, 1664 + square_note 1, 0, 0, 0 + square_note 4, 15, 1, 1920 + square_note 4, 0, 0, 0 + sound_ret diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index fd94c086..4f99dae1 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Enter1_1_Ch4: - duty 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1792 - squarenote 15, 11, 7, 1664 - squarenote 15, 8, 7, 1536 - squarenote 15, 4, 7, 1408 - squarenote 15, 1, 7, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Enter1_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1792 + square_note 15, 11, 7, 1664 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1408 + square_note 15, 1, 7, 1280 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index d7f8f076..c6502a29 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Enter1_3_Ch4: - duty 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1792 - squarenote 15, 11, 7, 1664 - squarenote 15, 8, 7, 1536 - squarenote 15, 4, 7, 1408 - squarenote 15, 1, 7, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Enter1_3_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1792 + square_note 15, 11, 7, 1664 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1408 + square_note 15, 1, 7, 1280 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index b0d61646..c7901999 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Enter2_1_Ch7: - noisenote 2, 15, 1, 50 - noisenote 2, 0, 0, 0 - noisenote 2, 15, 1, 34 - noisenote 1, 0, 0, 0 - endchannel +SFX_Teleport_Enter2_1_Ch8: + noise_note 2, 15, 1, 50 + noise_note 2, 0, 0, 0 + noise_note 2, 15, 1, 34 + noise_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index cc883000..2c0414f3 100644 --- a/audio/sfx/teleport_enter2_3.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Enter2_3_Ch7: - noisenote 2, 15, 1, 50 - noisenote 2, 0, 0, 0 - noisenote 2, 15, 1, 34 - noisenote 1, 0, 0, 0 - endchannel +SFX_Teleport_Enter2_3_Ch8: + noise_note 2, 15, 1, 50 + noise_note 2, 0, 0, 0 + noise_note 2, 15, 1, 34 + noise_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index dd986dca..b2511b1f 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Exit1_1_Ch4: - duty 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1280 - squarenote 15, 11, 7, 1408 - squarenote 15, 8, 7, 1536 - squarenote 15, 4, 7, 1664 - squarenote 15, 1, 7, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Exit1_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1280 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1664 + square_note 15, 1, 7, 1792 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index e3460ad2..6a3b2d96 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,10 +1,10 @@ -SFX_Teleport_Exit1_3_Ch4: - duty 1 - pitchenvelope 1, 7 - squarenote 15, 13, 7, 1280 - squarenote 15, 11, 7, 1408 - squarenote 15, 8, 7, 1536 - squarenote 15, 4, 7, 1664 - squarenote 15, 1, 7, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Exit1_3_Ch5: + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1280 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1664 + square_note 15, 1, 7, 1792 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 47d7c88b..23a6ea85 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Exit2_1_Ch4: - duty 1 - pitchenvelope 1, 6 - squarenote 15, 13, 2, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Exit2_1_Ch5: + duty_cycle 1 + pitch_sweep 1, 6 + square_note 15, 13, 2, 1280 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index dccc1d3c..178a4d78 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,6 +1,6 @@ -SFX_Teleport_Exit2_3_Ch4: - duty 1 - pitchenvelope 1, 6 - squarenote 15, 13, 2, 1280 - pitchenvelope 0, 0 - endchannel +SFX_Teleport_Exit2_3_Ch5: + duty_cycle 1 + pitch_sweep 1, 6 + square_note 15, 13, 2, 1280 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index 8884a204..4e471fab 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,8 +1,8 @@ -SFX_Tink_1_Ch4: - duty 2 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 512 - pitchenvelope 2, 2 - squarenote 8, 14, 2, 512 - pitchenvelope 0, 0 - endchannel +SFX_Tink_1_Ch5: + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index f1cc705d..077d93be 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,8 +1,8 @@ -SFX_Tink_2_Ch4: - duty 2 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 512 - pitchenvelope 2, 2 - squarenote 8, 14, 2, 512 - pitchenvelope 0, 0 - endchannel +SFX_Tink_2_Ch5: + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index 43d32f5b..e06ed62e 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,8 +1,8 @@ -SFX_Tink_3_Ch4: - duty 2 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 512 - pitchenvelope 2, 2 - squarenote 8, 14, 2, 512 - pitchenvelope 0, 0 - endchannel +SFX_Tink_3_Ch5: + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 97c6d007..050182b7 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,7 +1,7 @@ -SFX_Trade_Machine_1_Ch4: - duty 2 - pitchenvelope 1, 5 - squarenote 15, 15, 0, 1264 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Trade_Machine_1_Ch5: + duty_cycle 2 + pitch_sweep 1, 5 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index 26e58263..d14fc4c1 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,7 +1,7 @@ -SFX_Trade_Machine_3_Ch4: - duty 2 - pitchenvelope 1, 5 - squarenote 15, 15, 0, 1264 - squarenote 15, 15, 2, 1616 - pitchenvelope 0, 0 - endchannel +SFX_Trade_Machine_3_Ch5: + duty_cycle 2 + pitch_sweep 1, 5 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm index f4d08545..df952676 100644 --- a/audio/sfx/triangle1_1.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_1_Ch7: - noisenote 0, 5, 1, 42 - endchannel +SFX_Triangle1_1_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm index 0517ba84..a90cec67 100644 --- a/audio/sfx/triangle1_2.asm +++ b/audio/sfx/triangle1_2.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_2_Ch7: - noisenote 0, 5, 1, 42 - endchannel +SFX_Triangle1_2_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm index 1979b3f9..e897dd61 100644 --- a/audio/sfx/triangle1_3.asm +++ b/audio/sfx/triangle1_3.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_3_Ch7: - noisenote 0, 5, 1, 42 - endchannel +SFX_Triangle1_3_Ch8: + noise_note 0, 5, 1, 42 + sound_ret diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm index aa6b472e..df7e39ed 100644 --- a/audio/sfx/triangle2_1.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_1_Ch7: - noisenote 1, 4, 1, 43 - noisenote 0, 6, 1, 42 - endchannel +SFX_Triangle2_1_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm index b9f31022..39934efa 100644 --- a/audio/sfx/triangle2_2.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_2_Ch7: - noisenote 1, 4, 1, 43 - noisenote 0, 6, 1, 42 - endchannel +SFX_Triangle2_2_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm index 61dcb880..370e13e7 100644 --- a/audio/sfx/triangle2_3.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_3_Ch7: - noisenote 1, 4, 1, 43 - noisenote 0, 6, 1, 42 - endchannel +SFX_Triangle2_3_Ch8: + noise_note 1, 4, 1, 43 + noise_note 0, 6, 1, 42 + sound_ret diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm index 13700a11..18b140e2 100644 --- a/audio/sfx/triangle3_1.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_1_Ch7: - noisenote 2, 9, 1, 40 - noisenote 0, 7, 1, 24 - endchannel +SFX_Triangle3_1_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm index 5555fc40..c03be804 100644 --- a/audio/sfx/triangle3_2.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_2_Ch7: - noisenote 2, 9, 1, 40 - noisenote 0, 7, 1, 24 - endchannel +SFX_Triangle3_2_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm index 1237c952..95a047ae 100644 --- a/audio/sfx/triangle3_3.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_3_Ch7: - noisenote 2, 9, 1, 40 - noisenote 0, 7, 1, 24 - endchannel +SFX_Triangle3_3_Ch8: + noise_note 2, 9, 1, 40 + noise_note 0, 7, 1, 24 + sound_ret diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index ad4ad076..429727b9 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,7 +1,7 @@ -SFX_Turn_Off_PC_1_Ch4: - duty 2 - squarenote 4, 15, 0, 1536 - squarenote 4, 15, 0, 1024 - squarenote 4, 15, 0, 512 - squarenote 1, 0, 0, 0 - endchannel +SFX_Turn_Off_PC_1_Ch5: + duty_cycle 2 + square_note 4, 15, 0, 1536 + square_note 4, 15, 0, 1024 + square_note 4, 15, 0, 512 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index 842d6b9e..b6682ae2 100644 --- a/audio/sfx/turn_off_pc_3.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,7 +1,7 @@ -SFX_Turn_Off_PC_3_Ch4: - duty 2 - squarenote 4, 15, 0, 1536 - squarenote 4, 15, 0, 1024 - squarenote 4, 15, 0, 512 - squarenote 1, 0, 0, 0 - endchannel +SFX_Turn_Off_PC_3_Ch5: + duty_cycle 2 + square_note 4, 15, 0, 1536 + square_note 4, 15, 0, 1024 + square_note 4, 15, 0, 512 + square_note 1, 0, 0, 0 + sound_ret diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index 6b84b7f3..98c724b5 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,13 +1,13 @@ -SFX_Turn_On_PC_1_Ch4: - duty 2 - squarenote 15, 15, 2, 1984 - squarenote 15, 0, 0, 0 - squarenote 3, 10, 1, 1920 - squarenote 3, 10, 1, 1792 - squarenote 3, 10, 1, 1856 - squarenote 3, 10, 1, 1792 - squarenote 3, 10, 1, 1920 - squarenote 3, 10, 1, 1792 - squarenote 3, 10, 1, 1984 - squarenote 8, 10, 1, 1792 - endchannel +SFX_Turn_On_PC_1_Ch5: + duty_cycle 2 + square_note 15, 15, 2, 1984 + square_note 15, 0, 0, 0 + square_note 3, 10, 1, 1920 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1856 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1920 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1984 + square_note 8, 10, 1, 1792 + sound_ret diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index 281f4567..e33aefa1 100644 --- a/audio/sfx/turn_on_pc_3.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,14 +1,14 @@ -SFX_Turn_On_PC_3_Ch4: - duty 2 - squarenote 15, 15, 2, 1984 - squarenote 15, 0, 0, 0 - squarenote 15, 0, 0, 0 - squarenote 3, 8, 1, 1920 - squarenote 3, 8, 1, 1792 - squarenote 3, 8, 1, 1856 - squarenote 3, 8, 1, 1792 - squarenote 3, 8, 1, 1920 - squarenote 3, 8, 1, 1792 - squarenote 3, 8, 1, 1984 - squarenote 3, 8, 1, 1792 - endchannel +SFX_Turn_On_PC_3_Ch5: + duty_cycle 2 + square_note 15, 15, 2, 1984 + square_note 15, 0, 0, 0 + square_note 15, 0, 0, 0 + square_note 3, 8, 1, 1920 + square_note 3, 8, 1, 1792 + square_note 3, 8, 1, 1856 + square_note 3, 8, 1, 1792 + square_note 3, 8, 1, 1920 + square_note 3, 8, 1, 1792 + square_note 3, 8, 1, 1984 + square_note 3, 8, 1, 1792 + sound_ret diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm index 36c10ba3..aa93f91c 100644 --- a/audio/sfx/unused2_2.asm +++ b/audio/sfx/unused2_2.asm @@ -1,56 +1,56 @@ -SFX_08_unused2_Ch4: - executemusic +SFX_Unused2_Ch5: + execute_music tempo 256 volume 7, 7 vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 6, 11, 1 + duty_cycle 2 + toggle_perfect_pitch + note_type 6, 11, 1 octave 3 - G# 2 - G# 2 - notetype 6, 11, 3 - G# 2 - B_ 2 + note G#, 2 + note G#, 2 + note_type 6, 11, 3 + note G#, 2 + note B_, 2 octave 4 - E_ 8 - endchannel + note E_, 8 + sound_ret -SFX_08_unused2_Ch5: - executemusic +SFX_Unused2_Ch6: + execute_music vibrato 8, 2, 7 - duty 2 - notetype 6, 12, 1 + duty_cycle 2 + note_type 6, 12, 1 octave 4 - E_ 2 - E_ 1 - E_ 1 - notetype 6, 12, 3 - E_ 2 - G# 2 - B_ 8 - endchannel + note E_, 2 + note E_, 1 + note E_, 1 + note_type 6, 12, 3 + note E_, 2 + note G#, 2 + note B_, 8 + sound_ret -SFX_08_unused2_Ch6: - executemusic - notetype 6, 1, 0 +SFX_Unused2_Ch7: + execute_music + note_type 6, 1, 0 octave 4 - B_ 1 + note B_, 1 rest 1 - notetype 3, 1, 0 - B_ 1 + note_type 3, 1, 0 + note B_, 1 rest 1 - B_ 1 + note B_, 1 rest 1 - notetype 6, 1, 0 - B_ 1 + note_type 6, 1, 0 + note B_, 1 rest 1 octave 5 - E_ 1 + note E_, 1 rest 1 octave 4 - B_ 4 + note B_, 4 rest 4 - endchannel + sound_ret diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index e805a333..6b237950 100644 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,31 +1,31 @@ -SFX_Unused_1_Ch4: - dutycycle 240 - squarenote 15, 14, 0, 1920 - squarenote 15, 15, 0, 1924 - squarenote 15, 12, 3, 1504 - squarenote 15, 12, 4, 1536 - squarenote 10, 6, -4, 1920 - squarenote 8, 7, 1, 1924 - endchannel +SFX_Unused_1_Ch5: + duty_cycle_pattern 240 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret -SFX_Unused_1_Ch5: - dutycycle 5 - squarenote 15, 10, 0, 1857 - squarenote 15, 11, 0, 1859 - squarenote 15, 9, 3, 1457 - squarenote 15, 9, 4, 1473 - squarenote 10, 4, -4, 1857 - squarenote 8, 3, 1, 1862 - endchannel +SFX_Unused_1_Ch6: + duty_cycle_pattern 5 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret -SFX_Unused_1_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 0, 58 - noisenote 15, 13, 0, 58 - noisenote 8, 13, 0, 44 - noisenote 6, 14, 6, 76 - noisenote 12, 7, -5, 76 - noisenote 15, 13, 3, 76 - endchannel +SFX_Unused_1_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index fb86989c..0a8fa9d9 100644 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,31 +1,31 @@ -SFX_Unused_2_Ch4: - dutycycle 240 - squarenote 15, 14, 0, 1920 - squarenote 15, 15, 0, 1924 - squarenote 15, 12, 3, 1504 - squarenote 15, 12, 4, 1536 - squarenote 10, 6, -4, 1920 - squarenote 8, 7, 1, 1924 - endchannel +SFX_Unused_2_Ch5: + duty_cycle_pattern 240 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret -SFX_Unused_2_Ch5: - dutycycle 5 - squarenote 15, 10, 0, 1857 - squarenote 15, 11, 0, 1859 - squarenote 15, 9, 3, 1457 - squarenote 15, 9, 4, 1473 - squarenote 10, 4, -4, 1857 - squarenote 8, 3, 1, 1862 - endchannel +SFX_Unused_2_Ch6: + duty_cycle_pattern 5 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret -SFX_Unused_2_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 0, 58 - noisenote 15, 13, 0, 58 - noisenote 8, 13, 0, 44 - noisenote 6, 14, 6, 76 - noisenote 12, 7, -5, 76 - noisenote 15, 13, 3, 76 - endchannel +SFX_Unused_2_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index 30d8e534..3710e797 100644 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,31 +1,31 @@ -SFX_Unused_3_Ch4: - dutycycle 240 - squarenote 15, 14, 0, 1920 - squarenote 15, 15, 0, 1924 - squarenote 15, 12, 3, 1504 - squarenote 15, 12, 4, 1536 - squarenote 10, 6, -4, 1920 - squarenote 8, 7, 1, 1924 - endchannel +SFX_Unused_3_Ch5: + duty_cycle_pattern 240 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret -SFX_Unused_3_Ch5: - dutycycle 5 - squarenote 15, 10, 0, 1857 - squarenote 15, 11, 0, 1859 - squarenote 15, 9, 3, 1457 - squarenote 15, 9, 4, 1473 - squarenote 10, 4, -4, 1857 - squarenote 8, 3, 1, 1862 - endchannel +SFX_Unused_3_Ch6: + duty_cycle_pattern 5 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret -SFX_Unused_3_Ch7: - noisenote 2, 15, 2, 76 - noisenote 6, 14, 0, 58 - noisenote 15, 13, 0, 58 - noisenote 8, 13, 0, 44 - noisenote 6, 14, 6, 76 - noisenote 12, 7, -5, 76 - noisenote 15, 13, 3, 76 - endchannel +SFX_Unused_3_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index 7699d841..c53a7d0a 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,10 +1,10 @@ -SFX_Vine_Whip_Ch7: - noisenote 1, 12, 2, 51 - noisenote 2, 15, 2, 33 - noisenote 1, 14, 2, 51 - noisenote 1, 12, 2, 50 - noisenote 1, 9, 2, 18 - noisenote 1, 11, 2, 49 - noisenote 12, 9, 1, 16 - noisenote 8, 15, 2, 65 - endchannel +SFX_Vine_Whip_Ch8: + noise_note 1, 12, 2, 51 + noise_note 2, 15, 2, 33 + noise_note 1, 14, 2, 51 + noise_note 1, 12, 2, 50 + noise_note 1, 9, 2, 18 + noise_note 1, 11, 2, 49 + noise_note 12, 9, 1, 16 + noise_note 8, 15, 2, 65 + sound_ret diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index fe1daefb..9c4f2868 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,12 +1,12 @@ -SFX_Withdraw_Deposit_1_Ch4: - duty 1 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 1280 - pitchenvelope 2, 2 - squarenote 4, 14, 2, 1280 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 1792 - pitchenvelope 2, 2 - squarenote 15, 14, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Withdraw_Deposit_1_Ch5: + duty_cycle 1 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 4, 14, 2, 1280 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1792 + pitch_sweep 2, 2 + square_note 15, 14, 2, 1792 + pitch_sweep 0, 0 + sound_ret diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index 3ed89f24..cd881753 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,12 +1,12 @@ -SFX_Withdraw_Deposit_3_Ch4: - duty 1 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 1280 - pitchenvelope 2, 2 - squarenote 4, 14, 2, 1280 - pitchenvelope 3, -2 - squarenote 4, 15, 2, 1792 - pitchenvelope 2, 2 - squarenote 15, 14, 2, 1792 - pitchenvelope 0, 0 - endchannel +SFX_Withdraw_Deposit_3_Ch5: + duty_cycle 1 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 4, 14, 2, 1280 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1792 + pitch_sweep 2, 2 + square_note 15, 14, 2, 1792 + pitch_sweep 0, 0 + sound_ret |