diff options
| author | dannye <33dannye@gmail.com> | 2018-03-16 20:35:40 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2018-03-16 20:35:40 -0500 |
| commit | 4398dde1e483d74ae9997aba11f62b9810f9f77b (patch) | |
| tree | 4a927ad4d31946a428d17765386337aad589d05e | |
| parent | b382473f7b6827020f5544c8dcc730be8fc83f6e (diff) | |
Break up sfxnote parameters into duty, volume, volume change and pitch
311 files changed, 2598 insertions, 2586 deletions
diff --git a/audio/engine_1.asm b/audio/engine_1.asm index f762da29..bab1be55 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -563,7 +563,7 @@ Audio1_executemusic: Audio1_octave: and $f0 cp $e0 ; is this command an octave? - jr nz, Audio1_unknownsfx0x20 ; no + jr nz, Audio1_sfxnote ; no ld hl, wChannelOctaves ld b, 0 add hl, bc @@ -572,17 +572,18 @@ Audio1_octave: ld [hl], a ; store low nibble as octave jp Audio1_endchannel -Audio1_unknownsfx0x20: - cp $20 ; is this command an unknownsfx0x20? - jr nz, Audio1_unknownsfx0x10 +; sfxnote is either squarenote or noisenote depending on the channel +Audio1_sfxnote: + cp $20 ; is this command a sfxnote? + jr nz, Audio1_pitchenvelope ld a, c cp Ch3 ; is this a noise or sfx channel? - jr c, Audio1_unknownsfx0x10 ; no + jr c, Audio1_pitchenvelope ; no ld b, 0 ld hl, wChannelFlags2 add hl, bc bit BIT_EXECUTE_MUSIC, [hl] ; is executemusic being used? - jr nz, Audio1_unknownsfx0x10 ; yes + jr nz, Audio1_pitchenvelope ; yes call Audio1_notelength ; This code seems to do the same thing as what Audio1_ApplyDutyAndSoundLength @@ -624,12 +625,12 @@ Audio1_unknownsfx0x20: call Audio1_ApplyWavePatternAndFrequency ret -Audio1_unknownsfx0x10: +Audio1_pitchenvelope: ld a, c cp Ch4 jr c, Audio1_note ; if not a sfx ld a, d - cp $10 ; is this command a unknownsfx0x10? + cp $10 ; is this command a pitchenvelope? jr nz, Audio1_note ; no ld b, $0 ld hl, wChannelFlags2 diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 4eb9b96b..2ca5cbe8 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -557,7 +557,7 @@ Audio2_executemusic: Audio2_octave: and $f0 cp $e0 ; is this command an octave? - jr nz, Audio2_unknownsfx0x20 ; no + jr nz, Audio2_sfxnote ; no ld hl, wChannelOctaves ; yes ld b, $0 add hl, bc @@ -566,17 +566,18 @@ Audio2_octave: ld [hl], a ; store low nibble as octave jp Audio2_endchannel -Audio2_unknownsfx0x20: - cp $20 ; is this command an unknownsfx0x20? - jr nz, Audio2_unknownsfx0x10 ; no +; sfxnote is either squarenote or noisenote depending on the channel +Audio2_sfxnote: + cp $20 ; is this command an sfxnote? + jr nz, Audio2_pitchenvelope ; no ld a, c cp Ch3 ; is this a noise or sfx channel? - jr c, Audio2_unknownsfx0x10 ; no + jr c, Audio2_pitchenvelope ; no ld b, $0 ld hl, wChannelFlags2 add hl, bc bit 0, [hl] - jr nz, Audio2_unknownsfx0x10 ; no + jr nz, Audio2_pitchenvelope ; no call Audio2_notelength ld d, a ld b, $0 @@ -611,12 +612,12 @@ Audio2_unknownsfx0x20: call Audio2_21dcc ret -Audio2_unknownsfx0x10: +Audio2_pitchenvelope: ld a, c cp Ch4 jr c, Audio2_note ; if not a sfx ld a, d - cp $10 ; is this command a unknownsfx0x10? + cp $10 ; is this command a pitchenvelope? jr nz, Audio2_note ; no ld b, $0 ld hl, wChannelFlags2 diff --git a/audio/engine_3.asm b/audio/engine_3.asm index bd784023..9a95f3e1 100644 --- a/audio/engine_3.asm +++ b/audio/engine_3.asm @@ -550,7 +550,7 @@ Audio3_executemusic: Audio3_octave: and $f0 cp $e0 ; is this command an octave? - jr nz, Audio3_unknownsfx0x20 ; no + jr nz, Audio3_sfxnote ; no ld hl, wChannelOctaves ; yes ld b, $0 add hl, bc @@ -559,17 +559,18 @@ Audio3_octave: ld [hl], a ; store low nibble as octave jp Audio3_endchannel -Audio3_unknownsfx0x20: - cp $20 ; is this command an unknownsfx0x20? - jr nz, Audio3_unknownsfx0x10 ; no +; sfxnote is either squarenote or noisenote depending on the channel +Audio3_sfxnote: + cp $20 ; is this command an sfxnote? + jr nz, Audio3_pitchenvelope ; no ld a, c cp Ch3 ; is this a noise or sfx channel? - jr c, Audio3_unknownsfx0x10 ; no + jr c, Audio3_pitchenvelope ; no ld b, $0 ld hl, wChannelFlags2 add hl, bc bit 0, [hl] - jr nz, Audio3_unknownsfx0x10 ; no + jr nz, Audio3_pitchenvelope ; no call Audio3_notelength ; yes ld d, a ld b, $0 @@ -604,12 +605,12 @@ Audio3_unknownsfx0x20: call Audio3_7d6bf ret -Audio3_unknownsfx0x10: +Audio3_pitchenvelope: ld a, c cp Ch4 jr c, Audio3_note ; if not a sfx ld a, d - cp $10 ; is this command an unknownsfx0x10? + cp $10 ; is this command an pitchenvelope? jr nz, Audio3_note ; no ld b, $0 ld hl, wChannelFlags2 diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index ad75c503..c904a18a 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, 241, 128, 7 + squarenote 4, 15, 1, 1920 endchannel SFX_59_1_Ch5: duty 2 - squarenote 1, 8, 0, 0 - squarenote 4, 161, 97, 7 + squarenote 1, 0, 8, 0 + squarenote 4, 10, 1, 1889 endchannel diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 13a8a6e4..7331f973 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, 241, 128, 7 + squarenote 4, 15, 1, 1920 endchannel SFX_59_3_Ch5: duty 2 - squarenote 1, 8, 0, 0 - squarenote 4, 161, 97, 7 + squarenote 1, 0, 8, 0 + squarenote 4, 10, 1, 1889 endchannel diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index f29ddbc1..0d45f451 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, 210, 0, 7 + squarenote 15, 13, 2, 1792 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index 864e55f2..2ee03ec0 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, 210, 0, 7 + squarenote 15, 13, 2, 1792 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 3f0dcab0..c3fefdd2 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, 242, 0, 4 + squarenote 15, 15, 2, 1024 pitchenvelope 0, 0 endchannel SFX_Ball_Poof_Ch7: - noisenote 15, 162, 34 + noisenote 15, 10, 2, 34 endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index 271ceb96..e4518dfc 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, 242, 128, 7 + squarenote 15, 15, 2, 1920 endchannel SFX_Ball_Toss_Ch5: duty 2 - squarenote 15, 194, 130, 7 + squarenote 15, 12, 2, 1922 endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 8119261e..2ab97942 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, 242, 0, 5 + squarenote 15, 15, 2, 1280 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index 83420396..06e2fa14 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ SFX_Battle_0B_Ch7: - noisenote 8, 241, 84 + noisenote 8, 15, 1, 84 endchannel diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index 5c2b40f8..67e910eb 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,5 +1,5 @@ SFX_Battle_0C_Ch7: - noisenote 15, 143, 17 - noisenote 4, 255, 18 - noisenote 10, 241, 85 + noisenote 15, 8, -7, 17 + noisenote 4, 15, -7, 18 + noisenote 10, 15, 1, 85 endchannel diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index 7460238e..231d324f 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,5 +1,5 @@ SFX_Battle_0D_Ch7: - noisenote 15, 143, 52 - noisenote 8, 242, 53 - noisenote 10, 241, 85 + noisenote 15, 8, -7, 52 + noisenote 8, 15, 2, 53 + noisenote 10, 15, 1, 85 endchannel diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index 7c7bebf0..eb67a126 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ SFX_Battle_0E_Ch7: - noisenote 15, 159, 35 - noisenote 8, 241, 33 + noisenote 15, 9, -7, 35 + noisenote 8, 15, 1, 33 endchannel diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index 124a9a1d..26386131 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,6 +1,6 @@ SFX_Battle_0F_Ch7: - noisenote 2, 225, 75 - noisenote 10, 241, 68 - noisenote 2, 225, 58 - noisenote 6, 241, 52 + noisenote 2, 14, 1, 75 + noisenote 10, 15, 1, 68 + noisenote 2, 14, 1, 58 + noisenote 6, 15, 1, 52 endchannel diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 680a93b8..86d5a815 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,6 +1,6 @@ SFX_Battle_12_Ch7: - noisenote 8, 79, 35 - noisenote 4, 196, 34 - noisenote 6, 242, 35 + noisenote 8, 4, -7, 35 + noisenote 4, 12, 4, 34 + noisenote 6, 15, 2, 35 loopchannel 4, SFX_Battle_12_Ch7 endchannel diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 252da5f3..882be8c7 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,6 +1,6 @@ SFX_Battle_13_Ch7: - noisenote 8, 79, 51 - noisenote 4, 196, 34 - noisenote 6, 242, 35 - noisenote 15, 242, 34 + noisenote 8, 4, -7, 51 + noisenote 4, 12, 4, 34 + noisenote 6, 15, 2, 35 + noisenote 15, 15, 2, 34 endchannel diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index 8aa099bf..97a88b95 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,6 +1,6 @@ SFX_Battle_14_Ch7: - noisenote 8, 255, 50 - noisenote 8, 244, 67 - noisenote 8, 242, 84 - noisenote 8, 241, 101 + noisenote 8, 15, -7, 50 + noisenote 8, 15, 4, 67 + noisenote 8, 15, 2, 84 + noisenote 8, 15, 1, 101 endchannel diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index 79c685b0..daa614cd 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,5 +1,5 @@ SFX_Battle_16_Ch7: - noisenote 1, 148, 35 - noisenote 1, 180, 34 - noisenote 8, 241, 68 + noisenote 1, 9, 4, 35 + noisenote 1, 11, 4, 34 + noisenote 8, 15, 1, 68 endchannel diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index 5164fdd6..b6cc787e 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,6 +1,6 @@ SFX_Battle_17_Ch7: - noisenote 2, 148, 51 - noisenote 4, 180, 34 - noisenote 4, 241, 68 - noisenote 8, 241, 85 + noisenote 2, 9, 4, 51 + noisenote 4, 11, 4, 34 + noisenote 4, 15, 1, 68 + noisenote 8, 15, 1, 85 endchannel diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index eb6ff32c..ced87cd8 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ SFX_Battle_18_Ch7: - noisenote 4, 255, 85 - noisenote 8, 241, 101 + noisenote 4, 15, -7, 85 + noisenote 8, 15, 1, 101 endchannel diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 47f742e4..53de4341 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,5 +1,5 @@ SFX_Battle_19_Ch7: - noisenote 2, 132, 67 - noisenote 2, 196, 34 - noisenote 8, 242, 52 + noisenote 2, 8, 4, 67 + noisenote 2, 12, 4, 34 + noisenote 8, 15, 2, 52 endchannel diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index 694c90a5..06c2b6f1 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ SFX_Battle_1B_Ch7: - noisenote 2, 241, 34 - noisenote 15, 242, 18 + noisenote 2, 15, 1, 34 + noisenote 15, 15, 2, 18 endchannel diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index cb87f3d5..7518acd9 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,5 +1,5 @@ SFX_Battle_1C_Ch7: - noisenote 2, 194, 1 - noisenote 15, 244, 1 - noisenote 15, 242, 1 + noisenote 2, 12, 2, 1 + noisenote 15, 15, 4, 1 + noisenote 15, 15, 2, 1 endchannel diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index 7bccb47c..e924414a 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, 242, 0, 2 + squarenote 4, 15, 2, 512 pitchenvelope 2, 2 - squarenote 8, 226, 0, 2 + squarenote 8, 14, 2, 512 pitchenvelope 0, 0 endchannel SFX_Battle_1E_Ch7: - noisenote 0, 209, 66 - noisenote 4, 161, 50 - noisenote 0, 209, 34 - noisenote 6, 161, 50 + noisenote 0, 13, 1, 66 + noisenote 4, 10, 1, 50 + noisenote 0, 13, 1, 34 + noisenote 6, 10, 1, 50 endchannel diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index b80c1e03..4e5687d8 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ SFX_Battle_20_Ch7: - noisenote 12, 241, 84 - noisenote 8, 241, 100 + noisenote 12, 15, 1, 84 + noisenote 8, 15, 1, 100 endchannel diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index 954a3091..616b0c42 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,7 +1,7 @@ SFX_Battle_21_Ch7: - noisenote 2, 241, 51 - noisenote 2, 193, 50 - noisenote 2, 161, 49 - noisenote 15, 130, 50 - noisenote 8, 241, 52 + 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 diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index 82022661..e19417e0 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ SFX_Battle_22_Ch7: - noisenote 2, 210, 50 - noisenote 15, 242, 67 + noisenote 2, 13, 2, 50 + noisenote 15, 15, 2, 67 endchannel diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index e8214c80..febce65a 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,7 +1,7 @@ SFX_Battle_23_Ch7: - noisenote 2, 242, 67 - noisenote 4, 181, 50 - noisenote 9, 134, 49 - noisenote 7, 100, 0 - noisenote 15, 242, 85 + 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 diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index beefeeb9..5a9ab9ca 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, 242, 0, 7 + squarenote 15, 15, 2, 1792 pitchenvelope 0, 0 endchannel SFX_Battle_24_Ch7: - noisenote 15, 63, 34 - noisenote 15, 242, 33 + noisenote 15, 3, -7, 34 + noisenote 15, 15, 2, 33 endchannel diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index 70612976..1d50b391 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,7 +1,7 @@ SFX_Battle_25_Ch7: - noisenote 15, 79, 65 - noisenote 8, 143, 65 - noisenote 8, 207, 65 - noisenote 8, 242, 66 - noisenote 15, 242, 65 + 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 diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index 08837de3..0c0e21ae 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,9 +1,9 @@ SFX_Battle_26_Ch7: - noisenote 10, 255, 80 - noisenote 15, 255, 81 - noisenote 8, 242, 81 - noisenote 6, 255, 82 - noisenote 6, 255, 83 - noisenote 8, 255, 84 - noisenote 15, 242, 84 + 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 diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index f4e9f2e3..4e02cfe9 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, 63, 192, 7 + squarenote 15, 3, -7, 1984 SFX_Battle_27_branch_2062a: - squarenote 15, 223, 192, 7 + squarenote 15, 13, -7, 1984 loopchannel 4, SFX_Battle_27_branch_2062a - squarenote 15, 209, 192, 7 + squarenote 15, 13, 1, 1984 endchannel SFX_Battle_27_Ch5: dutycycle 179 - squarenote 15, 47, 200, 7 + squarenote 15, 2, -7, 1992 SFX_Battle_27_branch_2063d: - squarenote 15, 207, 199, 7 + squarenote 15, 12, -7, 1991 loopchannel 4, SFX_Battle_27_branch_2063d - squarenote 15, 193, 200, 7 + squarenote 15, 12, 1, 1992 endchannel SFX_Battle_27_Ch7: - noisenote 3, 151, 18 - noisenote 3, 161, 17 + noisenote 3, 9, 7, 18 + noisenote 3, 10, 1, 17 loopchannel 10, SFX_Battle_27_Ch7 endchannel diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index cb96b5ca..c2f0c511 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, 241, 192, 7 - squarenote 0, 241, 0, 7 + squarenote 0, 15, 1, 1984 + squarenote 0, 15, 1, 1792 loopchannel 12, SFX_Battle_28_Ch4 endchannel SFX_Battle_28_Ch5: dutycycle 179 - squarenote 0, 225, 193, 7 - squarenote 0, 225, 1, 7 + squarenote 0, 14, 1, 1985 + squarenote 0, 14, 1, 1793 loopchannel 12, SFX_Battle_28_Ch5 endchannel SFX_Battle_28_Ch7: - noisenote 1, 209, 73 - noisenote 1, 209, 41 + noisenote 1, 13, 1, 73 + noisenote 1, 13, 1, 41 loopchannel 6, SFX_Battle_28_Ch7 endchannel diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index a873eed8..534826fe 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, 243, 32, 1 - squarenote 9, 211, 80, 1 + squarenote 11, 15, 3, 288 + squarenote 9, 13, 3, 336 loopchannel 5, SFX_Battle_29_Ch4 - squarenote 8, 227, 48, 1 - squarenote 15, 194, 16, 1 + squarenote 8, 14, 3, 304 + squarenote 15, 12, 2, 272 endchannel SFX_Battle_29_Ch7: - noisenote 10, 243, 53 - noisenote 14, 246, 69 + noisenote 10, 15, 3, 53 + noisenote 14, 15, 6, 69 loopchannel 4, SFX_Battle_29_Ch7 - noisenote 12, 244, 188 - noisenote 12, 245, 156 - noisenote 15, 244, 172 + noisenote 12, 15, 4, 188 + noisenote 12, 15, 5, 156 + noisenote 15, 15, 4, 172 endchannel diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index 2168f90d..f4986805 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, 244, 0, 6 - squarenote 3, 196, 0, 5 - squarenote 5, 181, 0, 6 - squarenote 13, 226, 192, 6 + 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, 209, 0, 6 + squarenote 8, 13, 1, 1536 endchannel SFX_Battle_2A_Ch5: dutycycle 141 - squarenote 5, 228, 224, 5 - squarenote 4, 180, 224, 4 - squarenote 6, 165, 232, 5 - squarenote 14, 209, 160, 6 + 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_Ch7: - noisenote 5, 195, 51 - noisenote 3, 146, 67 - noisenote 10, 181, 51 - noisenote 15, 195, 50 + 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 diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index 94d11f3f..418ab5cb 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, 129, 0, 3 - squarenote 3, 193, 0, 4 - squarenote 3, 241, 0, 5 - squarenote 3, 177, 0, 4 - squarenote 3, 113, 0, 3 + 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, 129, 0, 4 + squarenote 8, 8, 1, 1024 endchannel SFX_Battle_2B_Ch7: - noisenote 3, 98, 34 - noisenote 3, 162, 50 - noisenote 3, 210, 51 - noisenote 3, 146, 35 - noisenote 3, 82, 18 + 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, 129, 18 + noisenote 8, 8, 1, 18 endchannel diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index 63be0d0f..aedb91bd 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, 244, 0, 5 - squarenote 15, 196, 0, 4 - squarenote 15, 226, 192, 5 + 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: dutycycle 141 - squarenote 7, 228, 48, 4 - squarenote 15, 180, 48, 3 - squarenote 15, 162, 56, 4 + 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_Ch7: - noisenote 9, 244, 68 - noisenote 9, 242, 67 - noisenote 15, 244, 66 - noisenote 15, 244, 65 + 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 diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index a1f8916b..ca1afc42 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, 241, 0, 2 - squarenote 3, 241, 0, 7 - squarenote 4, 241, 0, 5 - squarenote 5, 241, 240, 7 + 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: dutycycle 179 - squarenote 2, 225, 2, 3 - squarenote 3, 225, 242, 7 - squarenote 4, 225, 2, 6 - squarenote 5, 225, 2, 7 + 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_Ch7: - noisenote 2, 211, 16 - noisenote 3, 211, 17 - noisenote 2, 210, 16 - noisenote 5, 210, 18 + 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 diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index 2fde88a8..d8c2bd91 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, 241, 240, 7 - squarenote 4, 242, 0, 2 + squarenote 3, 15, 1, 2032 + squarenote 4, 15, 2, 512 loopchannel 8, SFX_Battle_2F_Ch4 endchannel SFX_Battle_2F_Ch5: dutycycle 179 - squarenote 4, 226, 2, 2 - squarenote 4, 225, 226, 7 + squarenote 4, 14, 2, 514 + squarenote 4, 14, 1, 2018 loopchannel 9, SFX_Battle_2F_Ch5 endchannel SFX_Battle_2F_Ch7: - noisenote 4, 255, 67 - noisenote 4, 242, 68 + noisenote 4, 15, -7, 67 + noisenote 4, 15, 2, 68 loopchannel 9, SFX_Battle_2F_Ch7 endchannel diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index 09b08271..ee1cc671 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, 255, 224, 7 - squarenote 15, 255, 224, 7 - squarenote 15, 255, 224, 7 - squarenote 15, 255, 224, 7 - squarenote 15, 242, 224, 7 + 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 3 - squarenote 15, 255, 226, 7 - squarenote 15, 255, 225, 7 - squarenote 15, 255, 226, 7 - squarenote 15, 255, 225, 7 - squarenote 15, 242, 226, 7 + 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 diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index 5e5b8641..92ea4661 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, 241, 0, 7 + squarenote 8, 15, 1, 1792 pitchenvelope 0, 0 endchannel SFX_Battle_32_Ch5: duty 3 - squarenote 8, 241, 1, 7 + squarenote 8, 15, 1, 1793 endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index 740b8b43..5eee7b32 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, 241, 0, 5 - squarenote 6, 241, 128, 5 - squarenote 6, 241, 0, 6 - squarenote 6, 241, 128, 6 - squarenote 8, 241, 0, 7 + 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 3 - squarenote 6, 225, 16, 5 - squarenote 6, 225, 144, 5 - squarenote 6, 225, 16, 6 - squarenote 6, 225, 144, 6 - squarenote 8, 225, 16, 7 + 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 diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index 329c941b..af9d5b65 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, 255, 248, 3 - squarenote 15, 255, 0, 4 - squarenote 15, 243, 0, 4 + squarenote 8, 15, -7, 1016 + squarenote 15, 15, -7, 1024 + squarenote 15, 15, 3, 1024 endchannel SFX_Battle_34_Ch5: dutycycle 180 - squarenote 8, 239, 192, 3 - squarenote 15, 239, 192, 3 - squarenote 15, 227, 192, 3 + squarenote 8, 14, -7, 960 + squarenote 15, 14, -7, 960 + squarenote 15, 14, 3, 960 endchannel SFX_Battle_34_Ch7: - noisenote 4, 255, 81 - noisenote 8, 255, 84 - noisenote 15, 255, 85 - noisenote 15, 243, 86 + noisenote 4, 15, -7, 81 + noisenote 8, 15, -7, 84 + noisenote 15, 15, -7, 85 + noisenote 15, 15, 3, 86 endchannel diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index 983687e3..9d00fad9 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, 241, 128, 7 - squarenote 2, 241, 0, 7 - squarenote 2, 241, 144, 7 - squarenote 2, 241, 0, 7 - squarenote 2, 241, 160, 7 - squarenote 2, 241, 0, 7 - squarenote 2, 241, 176, 7 - squarenote 2, 241, 0, 7 - squarenote 2, 241, 192, 7 - squarenote 2, 241, 0, 7 - squarenote 2, 241, 208, 7 + 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_branch_20930: - squarenote 2, 241, 0, 7 - squarenote 2, 241, 224, 7 + squarenote 2, 15, 1, 1792 + squarenote 2, 15, 1, 2016 loopchannel 12, SFX_Battle_36_branch_20930 - squarenote 15, 241, 0, 7 + squarenote 15, 15, 1, 1792 endchannel SFX_Battle_36_Ch5: dutycycle 179 - squarenote 2, 241, 129, 7 - squarenote 2, 241, 1, 7 - squarenote 2, 241, 145, 7 - squarenote 2, 241, 1, 7 - squarenote 2, 241, 161, 7 - squarenote 2, 241, 1, 7 - squarenote 2, 241, 177, 7 - squarenote 2, 241, 1, 7 - squarenote 2, 241, 193, 7 - squarenote 2, 241, 1, 7 - squarenote 2, 241, 209, 7 - squarenote 2, 241, 1, 7 - squarenote 2, 241, 225, 7 + 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, 241, 1, 7 + squarenote 15, 15, 1, 1793 endchannel SFX_Battle_36_Ch7: - noisenote 1, 209, 73 - noisenote 1, 209, 41 + noisenote 1, 13, 1, 73 + noisenote 1, 13, 1, 41 loopchannel 26, SFX_Battle_36_Ch7 endchannel diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index d0556537..a58adb8a 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, 241, 0, 3 + squarenote 15, 15, 1, 768 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 623213e4..60e8cde3 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, 241, 0, 3 + squarenote 15, 15, 1, 768 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index bc4e64aa..c0c128c0 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, 243, 24, 7 - squarenote 15, 229, 152, 7 - squarenote 8, 145, 88, 7 + squarenote 4, 15, 3, 1816 + squarenote 15, 14, 5, 1944 + squarenote 8, 9, 1, 1880 endchannel SFX_Cry00_1_Ch5: dutycycle 160 - squarenote 5, 179, 8, 7 - squarenote 15, 197, 136, 7 - squarenote 8, 113, 72, 7 + squarenote 5, 11, 3, 1800 + squarenote 15, 12, 5, 1928 + squarenote 8, 7, 1, 1864 endchannel SFX_Cry00_1_Ch7: - noisenote 3, 161, 28 - noisenote 14, 148, 44 - noisenote 8, 129, 28 + noisenote 3, 10, 1, 28 + noisenote 14, 9, 4, 44 + noisenote 8, 8, 1, 28 endchannel diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index 37e2a7b3..f9f104c0 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, 243, 24, 7 - squarenote 15, 229, 152, 7 - squarenote 8, 145, 88, 7 + squarenote 4, 15, 3, 1816 + squarenote 15, 14, 5, 1944 + squarenote 8, 9, 1, 1880 endchannel SFX_Cry00_2_Ch5: dutycycle 160 - squarenote 5, 179, 8, 7 - squarenote 15, 197, 136, 7 - squarenote 8, 113, 72, 7 + squarenote 5, 11, 3, 1800 + squarenote 15, 12, 5, 1928 + squarenote 8, 7, 1, 1864 endchannel SFX_Cry00_2_Ch7: - noisenote 3, 161, 28 - noisenote 14, 148, 44 - noisenote 8, 129, 28 + noisenote 3, 10, 1, 28 + noisenote 14, 9, 4, 44 + noisenote 8, 8, 1, 28 endchannel diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index 3a434193..3956e46c 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, 243, 24, 7 - squarenote 15, 229, 152, 7 - squarenote 8, 145, 88, 7 + squarenote 4, 15, 3, 1816 + squarenote 15, 14, 5, 1944 + squarenote 8, 9, 1, 1880 endchannel SFX_Cry00_3_Ch5: dutycycle 160 - squarenote 5, 179, 8, 7 - squarenote 15, 197, 136, 7 - squarenote 8, 113, 72, 7 + squarenote 5, 11, 3, 1800 + squarenote 15, 12, 5, 1928 + squarenote 8, 7, 1, 1864 endchannel SFX_Cry00_3_Ch7: - noisenote 3, 161, 28 - noisenote 14, 148, 44 - noisenote 8, 129, 28 + noisenote 3, 10, 1, 28 + noisenote 14, 9, 4, 44 + noisenote 8, 8, 1, 28 endchannel diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index 56b8d441..24ebcbc6 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, 243, 0, 6 - squarenote 8, 213, 96, 7 - squarenote 3, 226, 32, 7 - squarenote 8, 209, 16, 7 + 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: dutycycle 90 - squarenote 5, 179, 241, 6 - squarenote 7, 197, 82, 7 - squarenote 3, 162, 17, 7 - squarenote 8, 177, 1, 6 + squarenote 5, 11, 3, 1777 + squarenote 7, 12, 5, 1874 + squarenote 3, 10, 2, 1809 + squarenote 8, 11, 1, 1537 endchannel SFX_Cry01_1_Ch7: - noisenote 3, 162, 60 - noisenote 12, 148, 44 - noisenote 3, 130, 28 - noisenote 8, 113, 44 + noisenote 3, 10, 2, 60 + noisenote 12, 9, 4, 44 + noisenote 3, 8, 2, 28 + noisenote 8, 7, 1, 44 endchannel diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index 43db8130..e226ed44 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, 243, 0, 6 - squarenote 8, 213, 96, 7 - squarenote 3, 226, 32, 7 - squarenote 8, 209, 16, 7 + 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: dutycycle 90 - squarenote 5, 179, 241, 6 - squarenote 7, 197, 82, 7 - squarenote 3, 162, 17, 7 - squarenote 8, 177, 1, 6 + squarenote 5, 11, 3, 1777 + squarenote 7, 12, 5, 1874 + squarenote 3, 10, 2, 1809 + squarenote 8, 11, 1, 1537 endchannel SFX_Cry01_2_Ch7: - noisenote 3, 162, 60 - noisenote 12, 148, 44 - noisenote 3, 130, 28 - noisenote 8, 113, 44 + noisenote 3, 10, 2, 60 + noisenote 12, 9, 4, 44 + noisenote 3, 8, 2, 28 + noisenote 8, 7, 1, 44 endchannel diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index 69728006..43cf91df 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, 243, 0, 6 - squarenote 8, 213, 96, 7 - squarenote 3, 226, 32, 7 - squarenote 8, 209, 16, 7 + 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: dutycycle 90 - squarenote 5, 179, 241, 6 - squarenote 7, 197, 82, 7 - squarenote 3, 162, 17, 7 - squarenote 8, 177, 1, 6 + squarenote 5, 11, 3, 1777 + squarenote 7, 12, 5, 1874 + squarenote 3, 10, 2, 1809 + squarenote 8, 11, 1, 1537 endchannel SFX_Cry01_3_Ch7: - noisenote 3, 162, 60 - noisenote 12, 148, 44 - noisenote 3, 130, 28 - noisenote 8, 113, 44 + noisenote 3, 10, 2, 60 + noisenote 12, 9, 4, 44 + noisenote 3, 8, 2, 28 + noisenote 8, 7, 1, 44 endchannel diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index c210c673..1cc710d2 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,16 +1,16 @@ SFX_Cry02_1_Ch4: duty 0 - squarenote 8, 245, 128, 4 - squarenote 2, 225, 224, 5 - squarenote 8, 209, 220, 5 + squarenote 8, 15, 5, 1152 + squarenote 2, 14, 1, 1504 + squarenote 8, 13, 1, 1500 endchannel SFX_Cry02_1_Ch5: dutycycle 165 - squarenote 7, 149, 65, 4 - squarenote 2, 129, 33, 5 - squarenote 8, 97, 26, 5 + squarenote 7, 9, 5, 1089 + squarenote 2, 8, 1, 1313 + squarenote 8, 6, 1, 1306 SFX_Cry02_1_Ch7: diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index 79e90a8c..6e9ff69f 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,16 +1,16 @@ SFX_Cry02_2_Ch4: duty 0 - squarenote 8, 245, 128, 4 - squarenote 2, 225, 224, 5 - squarenote 8, 209, 220, 5 + squarenote 8, 15, 5, 1152 + squarenote 2, 14, 1, 1504 + squarenote 8, 13, 1, 1500 endchannel SFX_Cry02_2_Ch5: dutycycle 165 - squarenote 7, 149, 65, 4 - squarenote 2, 129, 33, 5 - squarenote 8, 97, 26, 5 + squarenote 7, 9, 5, 1089 + squarenote 2, 8, 1, 1313 + squarenote 8, 6, 1, 1306 SFX_Cry02_2_Ch7: diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 8d069ce0..9f369ad7 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,16 +1,16 @@ SFX_Cry02_3_Ch4: duty 0 - squarenote 8, 245, 128, 4 - squarenote 2, 225, 224, 5 - squarenote 8, 209, 220, 5 + squarenote 8, 15, 5, 1152 + squarenote 2, 14, 1, 1504 + squarenote 8, 13, 1, 1500 endchannel SFX_Cry02_3_Ch5: dutycycle 165 - squarenote 7, 149, 65, 4 - squarenote 2, 129, 33, 5 - squarenote 8, 97, 26, 5 + squarenote 7, 9, 5, 1089 + squarenote 2, 8, 1, 1313 + squarenote 8, 6, 1, 1306 SFX_Cry02_3_Ch7: diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 6a37c5c0..5039203d 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, 247, 8, 6 - squarenote 6, 230, 0, 6 - squarenote 6, 215, 240, 5 - squarenote 6, 196, 224, 5 - squarenote 5, 211, 192, 5 - squarenote 4, 211, 160, 5 - squarenote 8, 225, 128, 5 + 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: dutycycle 10 - squarenote 4, 199, 4, 5 - squarenote 6, 166, 2, 5 - squarenote 6, 151, 241, 4 - squarenote 4, 180, 225, 4 - squarenote 5, 163, 194, 4 - squarenote 4, 179, 163, 4 - squarenote 8, 193, 130, 4 + 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_Ch7: - noisenote 12, 228, 76 - noisenote 10, 199, 92 - noisenote 12, 182, 76 - noisenote 15, 162, 92 + noisenote 12, 14, 4, 76 + noisenote 10, 12, 7, 92 + noisenote 12, 11, 6, 76 + noisenote 15, 10, 2, 92 endchannel diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index 0915e513..54375387 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, 247, 8, 6 - squarenote 6, 230, 0, 6 - squarenote 6, 215, 240, 5 - squarenote 6, 196, 224, 5 - squarenote 5, 211, 192, 5 - squarenote 4, 211, 160, 5 - squarenote 8, 225, 128, 5 + 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: dutycycle 10 - squarenote 4, 199, 4, 5 - squarenote 6, 166, 2, 5 - squarenote 6, 151, 241, 4 - squarenote 4, 180, 225, 4 - squarenote 5, 163, 194, 4 - squarenote 4, 179, 163, 4 - squarenote 8, 193, 130, 4 + 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_Ch7: - noisenote 12, 228, 76 - noisenote 10, 199, 92 - noisenote 12, 182, 76 - noisenote 15, 162, 92 + noisenote 12, 14, 4, 76 + noisenote 10, 12, 7, 92 + noisenote 12, 11, 6, 76 + noisenote 15, 10, 2, 92 endchannel diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index c4a959eb..83e1bdd1 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, 247, 8, 6 - squarenote 6, 230, 0, 6 - squarenote 6, 215, 240, 5 - squarenote 6, 196, 224, 5 - squarenote 5, 211, 192, 5 - squarenote 4, 211, 160, 5 - squarenote 8, 225, 128, 5 + 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: dutycycle 10 - squarenote 4, 199, 4, 5 - squarenote 6, 166, 2, 5 - squarenote 6, 151, 241, 4 - squarenote 4, 180, 225, 4 - squarenote 5, 163, 194, 4 - squarenote 4, 179, 163, 4 - squarenote 8, 193, 130, 4 + 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_Ch7: - noisenote 12, 228, 76 - noisenote 10, 199, 92 - noisenote 12, 182, 76 - noisenote 15, 162, 92 + noisenote 12, 14, 4, 76 + noisenote 10, 12, 7, 92 + noisenote 12, 11, 6, 76 + noisenote 15, 10, 2, 92 endchannel diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index 28c068e3..c99f9582 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, 247, 160, 6 - squarenote 8, 230, 164, 6 - squarenote 4, 214, 160, 6 - squarenote 12, 211, 32, 6 - squarenote 8, 195, 36, 6 - squarenote 4, 194, 32, 6 - squarenote 8, 177, 16, 6 + 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: dutycycle 90 - squarenote 4, 231, 1, 6 - squarenote 8, 214, 3, 6 - squarenote 4, 198, 1, 6 - squarenote 12, 195, 129, 5 - squarenote 8, 179, 131, 5 - squarenote 4, 178, 130, 5 - squarenote 8, 161, 113, 5 + 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_Ch7: - noisenote 7, 214, 92 - noisenote 8, 230, 76 - noisenote 4, 212, 92 - noisenote 4, 212, 76 - noisenote 7, 195, 76 - noisenote 8, 161, 92 + 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 diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index 0d438c4e..def5b459 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, 247, 160, 6 - squarenote 8, 230, 164, 6 - squarenote 4, 214, 160, 6 - squarenote 12, 211, 32, 6 - squarenote 8, 195, 36, 6 - squarenote 4, 194, 32, 6 - squarenote 8, 177, 16, 6 + 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: dutycycle 90 - squarenote 4, 231, 1, 6 - squarenote 8, 214, 3, 6 - squarenote 4, 198, 1, 6 - squarenote 12, 195, 129, 5 - squarenote 8, 179, 131, 5 - squarenote 4, 178, 130, 5 - squarenote 8, 161, 113, 5 + 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_Ch7: - noisenote 7, 214, 92 - noisenote 8, 230, 76 - noisenote 4, 212, 92 - noisenote 4, 212, 76 - noisenote 7, 195, 76 - noisenote 8, 161, 92 + 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 diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index 23011f51..83e81ead 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, 247, 160, 6 - squarenote 8, 230, 164, 6 - squarenote 4, 214, 160, 6 - squarenote 12, 211, 32, 6 - squarenote 8, 195, 36, 6 - squarenote 4, 194, 32, 6 - squarenote 8, 177, 16, 6 + 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: dutycycle 90 - squarenote 4, 231, 1, 6 - squarenote 8, 214, 3, 6 - squarenote 4, 198, 1, 6 - squarenote 12, 195, 129, 5 - squarenote 8, 179, 131, 5 - squarenote 4, 178, 130, 5 - squarenote 8, 161, 113, 5 + 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_Ch7: - noisenote 7, 214, 92 - noisenote 8, 230, 76 - noisenote 4, 212, 92 - noisenote 4, 212, 76 - noisenote 7, 195, 76 - noisenote 8, 161, 92 + 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 diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 00a32ac1..525fdc2d 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,18 +1,18 @@ SFX_Cry05_1_Ch4: dutycycle 10 - squarenote 6, 226, 0, 5 - squarenote 6, 227, 128, 5 - squarenote 6, 211, 112, 5 - squarenote 8, 161, 96, 5 + 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: dutycycle 245 - squarenote 6, 226, 130, 4 - squarenote 6, 211, 1, 5 - squarenote 6, 178, 226, 4 - squarenote 8, 129, 193, 4 + squarenote 6, 14, 2, 1154 + squarenote 6, 13, 3, 1281 + squarenote 6, 11, 2, 1250 + squarenote 8, 8, 1, 1217 SFX_Cry05_1_Ch7: diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index c6039d1e..44e8fb21 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,18 +1,18 @@ SFX_Cry05_2_Ch4: dutycycle 10 - squarenote 6, 226, 0, 5 - squarenote 6, 227, 128, 5 - squarenote 6, 211, 112, 5 - squarenote 8, 161, 96, 5 + 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: dutycycle 245 - squarenote 6, 226, 130, 4 - squarenote 6, 211, 1, 5 - squarenote 6, 178, 226, 4 - squarenote 8, 129, 193, 4 + squarenote 6, 14, 2, 1154 + squarenote 6, 13, 3, 1281 + squarenote 6, 11, 2, 1250 + squarenote 8, 8, 1, 1217 SFX_Cry05_2_Ch7: diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index dec9a99f..2fcb4e1f 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,18 +1,18 @@ SFX_Cry05_3_Ch4: dutycycle 10 - squarenote 6, 226, 0, 5 - squarenote 6, 227, 128, 5 - squarenote 6, 211, 112, 5 - squarenote 8, 161, 96, 5 + 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: dutycycle 245 - squarenote 6, 226, 130, 4 - squarenote 6, 211, 1, 5 - squarenote 6, 178, 226, 4 - squarenote 8, 129, 193, 4 + squarenote 6, 14, 2, 1154 + squarenote 6, 13, 3, 1281 + squarenote 6, 11, 2, 1250 + squarenote 8, 8, 1, 1217 SFX_Cry05_3_Ch7: diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index 5adf4058..09099504 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,11 +1,11 @@ SFX_Cry06_1_Ch4: dutycycle 250 - squarenote 6, 131, 71, 2 - squarenote 15, 98, 38, 2 - squarenote 4, 82, 69, 2 - squarenote 9, 99, 6, 2 - squarenote 15, 130, 37, 2 - squarenote 15, 66, 7, 2 + 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: @@ -13,10 +13,10 @@ SFX_Cry06_1_Ch5: SFX_Cry06_1_Ch7: - noisenote 8, 212, 140 - noisenote 4, 226, 156 - noisenote 15, 198, 140 - noisenote 8, 228, 172 - noisenote 15, 215, 156 - noisenote 15, 242, 172 + 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 diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index e4b62370..75ca8228 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,11 +1,11 @@ SFX_Cry06_2_Ch4: dutycycle 250 - squarenote 6, 131, 71, 2 - squarenote 15, 98, 38, 2 - squarenote 4, 82, 69, 2 - squarenote 9, 99, 6, 2 - squarenote 15, 130, 37, 2 - squarenote 15, 66, 7, 2 + 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: @@ -13,10 +13,10 @@ SFX_Cry06_2_Ch5: SFX_Cry06_2_Ch7: - noisenote 8, 212, 140 - noisenote 4, 226, 156 - noisenote 15, 198, 140 - noisenote 8, 228, 172 - noisenote 15, 215, 156 - noisenote 15, 242, 172 + 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 diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index dd2fef77..760ca4f1 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,11 +1,11 @@ SFX_Cry06_3_Ch4: dutycycle 250 - squarenote 6, 131, 71, 2 - squarenote 15, 98, 38, 2 - squarenote 4, 82, 69, 2 - squarenote 9, 99, 6, 2 - squarenote 15, 130, 37, 2 - squarenote 15, 66, 7, 2 + 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: @@ -13,10 +13,10 @@ SFX_Cry06_3_Ch5: SFX_Cry06_3_Ch7: - noisenote 8, 212, 140 - noisenote 4, 226, 156 - noisenote 15, 198, 140 - noisenote 8, 228, 172 - noisenote 15, 215, 156 - noisenote 15, 242, 172 + 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 diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index d3a9ef92..8a736136 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, 243, 224, 6 - squarenote 15, 228, 64, 6 - squarenote 8, 193, 32, 6 + squarenote 4, 15, 3, 1760 + squarenote 15, 14, 4, 1600 + squarenote 8, 12, 1, 1568 endchannel SFX_Cry07_1_Ch5: dutycycle 10 - squarenote 3, 195, 131, 6 - squarenote 14, 180, 2, 6 - squarenote 8, 161, 1, 6 + squarenote 3, 12, 3, 1667 + squarenote 14, 11, 4, 1538 + squarenote 8, 10, 1, 1537 endchannel SFX_Cry07_1_Ch7: - noisenote 4, 211, 92 - noisenote 15, 230, 76 - noisenote 8, 177, 92 + noisenote 4, 13, 3, 92 + noisenote 15, 14, 6, 76 + noisenote 8, 11, 1, 92 endchannel diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index 5f464588..8ccba10c 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, 243, 224, 6 - squarenote 15, 228, 64, 6 - squarenote 8, 193, 32, 6 + squarenote 4, 15, 3, 1760 + squarenote 15, 14, 4, 1600 + squarenote 8, 12, 1, 1568 endchannel SFX_Cry07_2_Ch5: dutycycle 10 - squarenote 3, 195, 131, 6 - squarenote 14, 180, 2, 6 - squarenote 8, 161, 1, 6 + squarenote 3, 12, 3, 1667 + squarenote 14, 11, 4, 1538 + squarenote 8, 10, 1, 1537 endchannel SFX_Cry07_2_Ch7: - noisenote 4, 211, 92 - noisenote 15, 230, 76 - noisenote 8, 177, 92 + noisenote 4, 13, 3, 92 + noisenote 15, 14, 6, 76 + noisenote 8, 11, 1, 92 endchannel diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index ab6c19c8..bb90a016 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, 243, 224, 6 - squarenote 15, 228, 64, 6 - squarenote 8, 193, 32, 6 + squarenote 4, 15, 3, 1760 + squarenote 15, 14, 4, 1600 + squarenote 8, 12, 1, 1568 endchannel SFX_Cry07_3_Ch5: dutycycle 10 - squarenote 3, 195, 131, 6 - squarenote 14, 180, 2, 6 - squarenote 8, 161, 1, 6 + squarenote 3, 12, 3, 1667 + squarenote 14, 11, 4, 1538 + squarenote 8, 10, 1, 1537 endchannel SFX_Cry07_3_Ch7: - noisenote 4, 211, 92 - noisenote 15, 230, 76 - noisenote 8, 177, 92 + noisenote 4, 13, 3, 92 + noisenote 15, 14, 6, 76 + noisenote 8, 11, 1, 92 endchannel diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 6ca12371..18d324f4 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, 246, 101, 5 - squarenote 10, 228, 124, 5 - squarenote 3, 194, 92, 5 - squarenote 15, 178, 60, 5 + 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: dutycycle 90 - squarenote 14, 214, 3, 5 - squarenote 9, 180, 27, 5 - squarenote 4, 146, 250, 4 - squarenote 15, 162, 219, 4 + squarenote 14, 13, 6, 1283 + squarenote 9, 11, 4, 1307 + squarenote 4, 9, 2, 1274 + squarenote 15, 10, 2, 1243 endchannel SFX_Cry08_1_Ch7: - noisenote 12, 230, 76 - noisenote 11, 215, 92 - noisenote 15, 194, 76 + noisenote 12, 14, 6, 76 + noisenote 11, 13, 7, 92 + noisenote 15, 12, 2, 76 endchannel diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index f864e596..809ab706 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, 246, 101, 5 - squarenote 10, 228, 124, 5 - squarenote 3, 194, 92, 5 - squarenote 15, 178, 60, 5 + 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: dutycycle 90 - squarenote 14, 214, 3, 5 - squarenote 9, 180, 27, 5 - squarenote 4, 146, 250, 4 - squarenote 15, 162, 219, 4 + squarenote 14, 13, 6, 1283 + squarenote 9, 11, 4, 1307 + squarenote 4, 9, 2, 1274 + squarenote 15, 10, 2, 1243 endchannel SFX_Cry08_2_Ch7: - noisenote 12, 230, 76 - noisenote 11, 215, 92 - noisenote 15, 194, 76 + noisenote 12, 14, 6, 76 + noisenote 11, 13, 7, 92 + noisenote 15, 12, 2, 76 endchannel diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index 37b8b900..37e83796 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, 246, 101, 5 - squarenote 10, 228, 124, 5 - squarenote 3, 194, 92, 5 - squarenote 15, 178, 60, 5 + 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: dutycycle 90 - squarenote 14, 214, 3, 5 - squarenote 9, 180, 27, 5 - squarenote 4, 146, 250, 4 - squarenote 15, 162, 219, 4 + squarenote 14, 13, 6, 1283 + squarenote 9, 11, 4, 1307 + squarenote 4, 9, 2, 1274 + squarenote 15, 10, 2, 1243 endchannel SFX_Cry08_3_Ch7: - noisenote 12, 230, 76 - noisenote 11, 215, 92 - noisenote 15, 194, 76 + noisenote 12, 14, 6, 76 + noisenote 11, 13, 7, 92 + noisenote 15, 12, 2, 76 endchannel diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index c09e6b72..8b0178d6 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, 247, 160, 7 - squarenote 6, 230, 163, 7 - squarenote 10, 244, 160, 7 + squarenote 15, 15, 7, 1952 + squarenote 6, 14, 6, 1955 + squarenote 10, 15, 4, 1952 dutycycle 165 - squarenote 10, 246, 216, 7 - squarenote 4, 227, 215, 7 - squarenote 15, 242, 216, 7 + squarenote 10, 15, 6, 2008 + squarenote 4, 14, 3, 2007 + squarenote 15, 15, 2, 2008 endchannel SFX_Cry09_1_Ch5: dutycycle 5 - squarenote 2, 8, 0, 0 - squarenote 15, 167, 161, 6 - squarenote 6, 134, 162, 6 - squarenote 10, 116, 161, 6 + squarenote 2, 0, 8, 0 + squarenote 15, 10, 7, 1697 + squarenote 6, 8, 6, 1698 + squarenote 10, 7, 4, 1697 dutycycle 95 - squarenote 10, 118, 214, 6 - squarenote 4, 131, 217, 6 - squarenote 15, 162, 215, 6 + squarenote 10, 7, 6, 1750 + squarenote 4, 8, 3, 1753 + squarenote 15, 10, 2, 1751 endchannel SFX_Cry09_1_Ch7: - noisenote 2, 242, 60 - noisenote 8, 228, 62 - noisenote 15, 215, 60 - noisenote 6, 197, 59 - noisenote 6, 228, 61 - noisenote 8, 182, 60 - noisenote 6, 212, 61 - noisenote 8, 193, 59 + 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 diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index 93faf91e..378c07bd 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, 247, 160, 7 - squarenote 6, 230, 163, 7 - squarenote 10, 244, 160, 7 + squarenote 15, 15, 7, 1952 + squarenote 6, 14, 6, 1955 + squarenote 10, 15, 4, 1952 dutycycle 165 - squarenote 10, 246, 216, 7 - squarenote 4, 227, 215, 7 - squarenote 15, 242, 216, 7 + squarenote 10, 15, 6, 2008 + squarenote 4, 14, 3, 2007 + squarenote 15, 15, 2, 2008 endchannel SFX_Cry09_2_Ch5: dutycycle 5 - squarenote 2, 8, 0, 0 - squarenote 15, 167, 161, 6 - squarenote 6, 134, 162, 6 - squarenote 10, 116, 161, 6 + squarenote 2, 0, 8, 0 + squarenote 15, 10, 7, 1697 + squarenote 6, 8, 6, 1698 + squarenote 10, 7, 4, 1697 dutycycle 95 - squarenote 10, 118, 214, 6 - squarenote 4, 131, 217, 6 - squarenote 15, 162, 215, 6 + squarenote 10, 7, 6, 1750 + squarenote 4, 8, 3, 1753 + squarenote 15, 10, 2, 1751 endchannel SFX_Cry09_2_Ch7: - noisenote 2, 242, 60 - noisenote 8, 228, 62 - noisenote 15, 215, 60 - noisenote 6, 197, 59 - noisenote 6, 228, 61 - noisenote 8, 182, 60 - noisenote 6, 212, 61 - noisenote 8, 193, 59 + 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 diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index 4edaf511..7bf098b1 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, 247, 160, 7 - squarenote 6, 230, 163, 7 - squarenote 10, 244, 160, 7 + squarenote 15, 15, 7, 1952 + squarenote 6, 14, 6, 1955 + squarenote 10, 15, 4, 1952 dutycycle 165 - squarenote 10, 246, 216, 7 - squarenote 4, 227, 215, 7 - squarenote 15, 242, 216, 7 + squarenote 10, 15, 6, 2008 + squarenote 4, 14, 3, 2007 + squarenote 15, 15, 2, 2008 endchannel SFX_Cry09_3_Ch5: dutycycle 5 - squarenote 2, 8, 0, 0 - squarenote 15, 167, 161, 6 - squarenote 6, 134, 162, 6 - squarenote 10, 116, 161, 6 + squarenote 2, 0, 8, 0 + squarenote 15, 10, 7, 1697 + squarenote 6, 8, 6, 1698 + squarenote 10, 7, 4, 1697 dutycycle 95 - squarenote 10, 118, 214, 6 - squarenote 4, 131, 217, 6 - squarenote 15, 162, 215, 6 + squarenote 10, 7, 6, 1750 + squarenote 4, 8, 3, 1753 + squarenote 15, 10, 2, 1751 endchannel SFX_Cry09_3_Ch7: - noisenote 2, 242, 60 - noisenote 8, 228, 62 - noisenote 15, 215, 60 - noisenote 6, 197, 59 - noisenote 6, 228, 61 - noisenote 8, 182, 60 - noisenote 6, 212, 61 - noisenote 8, 193, 59 + 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 diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index e05821c5..45b293ca 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, 247, 224, 6 - squarenote 6, 230, 229, 6 - squarenote 3, 244, 224, 6 - squarenote 3, 246, 208, 6 - squarenote 3, 227, 192, 6 - squarenote 4, 242, 176, 6 - squarenote 15, 162, 200, 6 + 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: dutycycle 5 - squarenote 3, 8, 0, 0 - squarenote 8, 167, 161, 6 - squarenote 6, 134, 163, 6 - squarenote 3, 116, 161, 6 - squarenote 3, 118, 145, 6 - squarenote 3, 131, 130, 6 - squarenote 4, 162, 113, 6 - squarenote 15, 114, 137, 6 + 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_Ch7: - noisenote 2, 242, 60 - noisenote 8, 228, 62 - noisenote 8, 215, 60 - noisenote 5, 197, 59 - noisenote 3, 212, 44 - noisenote 2, 182, 60 - noisenote 3, 164, 44 - noisenote 8, 145, 60 + 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 diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index 81653447..a4d3b839 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, 247, 224, 6 - squarenote 6, 230, 229, 6 - squarenote 3, 244, 224, 6 - squarenote 3, 246, 208, 6 - squarenote 3, 227, 192, 6 - squarenote 4, 242, 176, 6 - squarenote 15, 162, 200, 6 + 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: dutycycle 5 - squarenote 3, 8, 0, 0 - squarenote 8, 167, 161, 6 - squarenote 6, 134, 163, 6 - squarenote 3, 116, 161, 6 - squarenote 3, 118, 145, 6 - squarenote 3, 131, 130, 6 - squarenote 4, 162, 113, 6 - squarenote 15, 114, 137, 6 + 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_Ch7: - noisenote 2, 242, 60 - noisenote 8, 228, 62 - noisenote 8, 215, 60 - noisenote 5, 197, 59 - noisenote 3, 212, 44 - noisenote 2, 182, 60 - noisenote 3, 164, 44 - noisenote 8, 145, 60 + 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 diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index 6cc94434..5c6617fb 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, 247, 224, 6 - squarenote 6, 230, 229, 6 - squarenote 3, 244, 224, 6 - squarenote 3, 246, 208, 6 - squarenote 3, 227, 192, 6 - squarenote 4, 242, 176, 6 - squarenote 15, 162, 200, 6 + 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: dutycycle 5 - squarenote 3, 8, 0, 0 - squarenote 8, 167, 161, 6 - squarenote 6, 134, 163, 6 - squarenote 3, 116, 161, 6 - squarenote 3, 118, 145, 6 - squarenote 3, 131, 130, 6 - squarenote 4, 162, 113, 6 - squarenote 15, 114, 137, 6 + 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_Ch7: - noisenote 2, 242, 60 - noisenote 8, 228, 62 - noisenote 8, 215, 60 - noisenote 5, 197, 59 - noisenote 3, 212, 44 - noisenote 2, 182, 60 - noisenote 3, 164, 44 - noisenote 8, 145, 60 + 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 diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index 612be214..ba8e1e1b 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, 241, 0, 7 - squarenote 4, 225, 128, 7 - squarenote 4, 209, 64, 7 - squarenote 4, 225, 64, 7 - squarenote 4, 241, 128, 7 - squarenote 4, 209, 0, 7 - squarenote 4, 241, 1, 7 - squarenote 4, 209, 130, 7 - squarenote 4, 193, 66, 7 - squarenote 8, 177, 65, 7 + 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: dutycycle 68 - squarenote 12, 8, 0, 0 - squarenote 4, 241, 1, 7 - squarenote 4, 225, 130, 7 - squarenote 4, 209, 65, 7 - squarenote 4, 225, 65, 7 - squarenote 4, 241, 130, 7 - squarenote 8, 209, 1, 7 + 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_Ch7: - noisenote 15, 8, 0 - noisenote 4, 8, 0 - noisenote 4, 209, 76 - noisenote 4, 177, 44 - noisenote 4, 209, 60 - noisenote 4, 177, 60 - noisenote 4, 193, 44 - noisenote 8, 161, 76 + 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 diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 88a7fdc8..9cbf1ee5 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, 241, 0, 7 - squarenote 4, 225, 128, 7 - squarenote 4, 209, 64, 7 - squarenote 4, 225, 64, 7 - squarenote 4, 241, 128, 7 - squarenote 4, 209, 0, 7 - squarenote 4, 241, 1, 7 - squarenote 4, 209, 130, 7 - squarenote 4, 193, 66, 7 - squarenote 8, 177, 65, 7 + 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: dutycycle 68 - squarenote 12, 8, 0, 0 - squarenote 4, 241, 1, 7 - squarenote 4, 225, 130, 7 - squarenote 4, 209, 65, 7 - squarenote 4, 225, 65, 7 - squarenote 4, 241, 130, 7 - squarenote 8, 209, 1, 7 + 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_Ch7: - noisenote 15, 8, 0 - noisenote 4, 8, 0 - noisenote 4, 209, 76 - noisenote 4, 177, 44 - noisenote 4, 209, 60 - noisenote 4, 177, 60 - noisenote 4, 193, 44 - noisenote 8, 161, 76 + 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 diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index ccc9728a..559fbbe0 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, 241, 0, 7 - squarenote 4, 225, 128, 7 - squarenote 4, 209, 64, 7 - squarenote 4, 225, 64, 7 - squarenote 4, 241, 128, 7 - squarenote 4, 209, 0, 7 - squarenote 4, 241, 1, 7 - squarenote 4, 209, 130, 7 - squarenote 4, 193, 66, 7 - squarenote 8, 177, 65, 7 + 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: dutycycle 68 - squarenote 12, 8, 0, 0 - squarenote 4, 241, 1, 7 - squarenote 4, 225, 130, 7 - squarenote 4, 209, 65, 7 - squarenote 4, 225, 65, 7 - squarenote 4, 241, 130, 7 - squarenote 8, 209, 1, 7 + 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_Ch7: - noisenote 15, 8, 0 - noisenote 4, 8, 0 - noisenote 4, 209, 76 - noisenote 4, 177, 44 - noisenote 4, 209, 60 - noisenote 4, 177, 60 - noisenote 4, 193, 44 - noisenote 8, 161, 76 + 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 diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index 3b31ec94..25246488 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,28 +1,28 @@ SFX_Cry0C_1_Ch4: dutycycle 204 - squarenote 8, 245, 0, 6 - squarenote 2, 210, 56, 6 - squarenote 2, 194, 48, 6 - squarenote 2, 194, 40, 6 - squarenote 2, 178, 32, 6 - squarenote 2, 178, 16, 6 - squarenote 2, 162, 24, 6 - squarenote 2, 178, 16, 6 - squarenote 8, 193, 32, 6 + 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: dutycycle 68 - squarenote 12, 195, 192, 5 - squarenote 3, 177, 249, 5 - squarenote 2, 161, 241, 5 - squarenote 2, 161, 233, 5 - squarenote 2, 145, 225, 5 - squarenote 2, 145, 217, 5 - squarenote 2, 129, 209, 5 - squarenote 2, 145, 217, 5 - squarenote 8, 145, 225, 5 + 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_Ch7: diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index 78695578..e94609c9 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,28 +1,28 @@ SFX_Cry0C_2_Ch4: dutycycle 204 - squarenote 8, 245, 0, 6 - squarenote 2, 210, 56, 6 - squarenote 2, 194, 48, 6 - squarenote 2, 194, 40, 6 - squarenote 2, 178, 32, 6 - squarenote 2, 178, 16, 6 - squarenote 2, 162, 24, 6 - squarenote 2, 178, 16, 6 - squarenote 8, 193, 32, 6 + 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: dutycycle 68 - squarenote 12, 195, 192, 5 - squarenote 3, 177, 249, 5 - squarenote 2, 161, 241, 5 - squarenote 2, 161, 233, 5 - squarenote 2, 145, 225, 5 - squarenote 2, 145, 217, 5 - squarenote 2, 129, 209, 5 - squarenote 2, 145, 217, 5 - squarenote 8, 145, 225, 5 + 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_Ch7: diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index 7b8b0c41..ac5296c6 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,28 +1,28 @@ SFX_Cry0C_3_Ch4: dutycycle 204 - squarenote 8, 245, 0, 6 - squarenote 2, 210, 56, 6 - squarenote 2, 194, 48, 6 - squarenote 2, 194, 40, 6 - squarenote 2, 178, 32, 6 - squarenote 2, 178, 16, 6 - squarenote 2, 162, 24, 6 - squarenote 2, 178, 16, 6 - squarenote 8, 193, 32, 6 + 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: dutycycle 68 - squarenote 12, 195, 192, 5 - squarenote 3, 177, 249, 5 - squarenote 2, 161, 241, 5 - squarenote 2, 161, 233, 5 - squarenote 2, 145, 225, 5 - squarenote 2, 145, 217, 5 - squarenote 2, 129, 209, 5 - squarenote 2, 145, 217, 5 - squarenote 8, 145, 225, 5 + 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_Ch7: diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index b4fd1344..9403af3a 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, 242, 80, 6 - squarenote 9, 209, 96, 6 - squarenote 5, 226, 18, 6 - squarenote 9, 193, 34, 6 - squarenote 5, 242, 16, 6 - squarenote 6, 209, 32, 6 + 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: dutycycle 64 - squarenote 4, 8, 0, 0 - squarenote 5, 242, 81, 6 - squarenote 9, 209, 97, 6 - squarenote 5, 226, 20, 6 - squarenote 8, 193, 36, 6 - squarenote 5, 242, 17, 6 - squarenote 12, 209, 33, 6 - squarenote 5, 226, 20, 6 - squarenote 8, 193, 36, 6 - squarenote 5, 242, 17, 6 - squarenote 4, 209, 33, 6 + 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_Ch7: - noisenote 6, 210, 28 - noisenote 9, 177, 44 - noisenote 8, 194, 44 - noisenote 9, 177, 60 - noisenote 6, 194, 44 - noisenote 9, 162, 60 - noisenote 7, 194, 44 - noisenote 5, 161, 60 - noisenote 9, 194, 44 - noisenote 4, 161, 60 + 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 diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index 76ca2392..9d570892 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, 242, 80, 6 - squarenote 9, 209, 96, 6 - squarenote 5, 226, 18, 6 - squarenote 9, 193, 34, 6 - squarenote 5, 242, 16, 6 - squarenote 6, 209, 32, 6 + 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: dutycycle 64 - squarenote 4, 8, 0, 0 - squarenote 5, 242, 81, 6 - squarenote 9, 209, 97, 6 - squarenote 5, 226, 20, 6 - squarenote 8, 193, 36, 6 - squarenote 5, 242, 17, 6 - squarenote 12, 209, 33, 6 - squarenote 5, 226, 20, 6 - squarenote 8, 193, 36, 6 - squarenote 5, 242, 17, 6 - squarenote 4, 209, 33, 6 + 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_Ch7: - noisenote 6, 210, 28 - noisenote 9, 177, 44 - noisenote 8, 194, 44 - noisenote 9, 177, 60 - noisenote 6, 194, 44 - noisenote 9, 162, 60 - noisenote 7, 194, 44 - noisenote 5, 161, 60 - noisenote 9, 194, 44 - noisenote 4, 161, 60 + 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 diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index 56d1a5c6..18125238 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, 242, 80, 6 - squarenote 9, 209, 96, 6 - squarenote 5, 226, 18, 6 - squarenote 9, 193, 34, 6 - squarenote 5, 242, 16, 6 - squarenote 6, 209, 32, 6 + 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: dutycycle 64 - squarenote 4, 8, 0, 0 - squarenote 5, 242, 81, 6 - squarenote 9, 209, 97, 6 - squarenote 5, 226, 20, 6 - squarenote 8, 193, 36, 6 - squarenote 5, 242, 17, 6 - squarenote 12, 209, 33, 6 - squarenote 5, 226, 20, 6 - squarenote 8, 193, 36, 6 - squarenote 5, 242, 17, 6 - squarenote 4, 209, 33, 6 + 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_Ch7: - noisenote 6, 210, 28 - noisenote 9, 177, 44 - noisenote 8, 194, 44 - noisenote 9, 177, 60 - noisenote 6, 194, 44 - noisenote 9, 162, 60 - noisenote 7, 194, 44 - noisenote 5, 161, 60 - noisenote 9, 194, 44 - noisenote 4, 161, 60 + 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 diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index fb4a8d53..c5a166b7 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, 225, 0, 7 - squarenote 4, 242, 128, 7 - squarenote 2, 146, 64, 7 - squarenote 8, 225, 0, 6 + 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: dutycycle 10 - squarenote 4, 177, 225, 6 - squarenote 3, 194, 225, 6 - squarenote 3, 98, 129, 6 - squarenote 8, 177, 225, 5 + squarenote 4, 11, 1, 1761 + squarenote 3, 12, 2, 1761 + squarenote 3, 6, 2, 1665 + squarenote 8, 11, 1, 1505 endchannel SFX_Cry0E_1_Ch7: - noisenote 2, 97, 50 - noisenote 2, 97, 33 - noisenote 8, 97, 17 + noisenote 2, 6, 1, 50 + noisenote 2, 6, 1, 33 + noisenote 8, 6, 1, 17 endchannel diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index 3a5e7f58..943b12f4 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, 225, 0, 7 - squarenote 4, 242, 128, 7 - squarenote 2, 146, 64, 7 - squarenote 8, 225, 0, 6 + 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: dutycycle 10 - squarenote 4, 177, 225, 6 - squarenote 3, 194, 225, 6 - squarenote 3, 98, 129, 6 - squarenote 8, 177, 225, 5 + squarenote 4, 11, 1, 1761 + squarenote 3, 12, 2, 1761 + squarenote 3, 6, 2, 1665 + squarenote 8, 11, 1, 1505 endchannel SFX_Cry0E_2_Ch7: - noisenote 2, 97, 50 - noisenote 2, 97, 33 - noisenote 8, 97, 17 + noisenote 2, 6, 1, 50 + noisenote 2, 6, 1, 33 + noisenote 8, 6, 1, 17 endchannel diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index 15bea347..c500b326 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, 225, 0, 7 - squarenote 4, 242, 128, 7 - squarenote 2, 146, 64, 7 - squarenote 8, 225, 0, 6 + 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: dutycycle 10 - squarenote 4, 177, 225, 6 - squarenote 3, 194, 225, 6 - squarenote 3, 98, 129, 6 - squarenote 8, 177, 225, 5 + squarenote 4, 11, 1, 1761 + squarenote 3, 12, 2, 1761 + squarenote 3, 6, 2, 1665 + squarenote 8, 11, 1, 1505 endchannel SFX_Cry0E_3_Ch7: - noisenote 2, 97, 50 - noisenote 2, 97, 33 - noisenote 8, 97, 17 + noisenote 2, 6, 1, 50 + noisenote 2, 6, 1, 33 + noisenote 8, 6, 1, 17 endchannel diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 8c260c93..e959205e 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, 247, 192, 7 - squarenote 12, 230, 194, 7 - squarenote 6, 181, 128, 6 - squarenote 4, 196, 112, 6 - squarenote 4, 181, 96, 6 - squarenote 8, 193, 64, 6 + 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: dutycycle 204 - squarenote 3, 199, 129, 7 - squarenote 12, 182, 128, 7 - squarenote 6, 165, 65, 6 - squarenote 4, 196, 50, 6 - squarenote 6, 181, 33, 6 - squarenote 8, 161, 2, 6 + 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_Ch7: - noisenote 3, 228, 60 - noisenote 12, 214, 44 - noisenote 4, 228, 60 - noisenote 8, 183, 92 - noisenote 15, 194, 93 + 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 diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 4812e0fb..dc052645 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, 247, 192, 7 - squarenote 12, 230, 194, 7 - squarenote 6, 181, 128, 6 - squarenote 4, 196, 112, 6 - squarenote 4, 181, 96, 6 - squarenote 8, 193, 64, 6 + 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: dutycycle 204 - squarenote 3, 199, 129, 7 - squarenote 12, 182, 128, 7 - squarenote 6, 165, 65, 6 - squarenote 4, 196, 50, 6 - squarenote 6, 181, 33, 6 - squarenote 8, 161, 2, 6 + 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_Ch7: - noisenote 3, 228, 60 - noisenote 12, 214, 44 - noisenote 4, 228, 60 - noisenote 8, 183, 92 - noisenote 15, 194, 93 + 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 diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 3f612b84..2705d73d 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, 247, 192, 7 - squarenote 12, 230, 194, 7 - squarenote 6, 181, 128, 6 - squarenote 4, 196, 112, 6 - squarenote 4, 181, 96, 6 - squarenote 8, 193, 64, 6 + 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: dutycycle 204 - squarenote 3, 199, 129, 7 - squarenote 12, 182, 128, 7 - squarenote 6, 165, 65, 6 - squarenote 4, 196, 50, 6 - squarenote 6, 181, 33, 6 - squarenote 8, 161, 2, 6 + 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_Ch7: - noisenote 3, 228, 60 - noisenote 12, 214, 44 - noisenote 4, 228, 60 - noisenote 8, 183, 92 - noisenote 15, 194, 93 + 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 diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index 46a1498b..95c72f8a 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, 247, 128, 6 - squarenote 2, 247, 96, 6 - squarenote 1, 231, 64, 6 - squarenote 1, 231, 32, 6 - squarenote 15, 209, 0, 6 - squarenote 4, 199, 64, 7 - squarenote 4, 167, 48, 7 - squarenote 15, 145, 32, 7 + 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: dutycycle 121 - squarenote 10, 231, 130, 6 - squarenote 2, 231, 98, 6 - squarenote 1, 215, 66, 6 - squarenote 1, 215, 34, 6 - squarenote 15, 193, 2, 6 - squarenote 4, 183, 66, 7 - squarenote 2, 151, 50, 7 - squarenote 15, 129, 34, 7 + 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_Ch7: - noisenote 4, 116, 33 - noisenote 4, 116, 16 - noisenote 4, 113, 32 + noisenote 4, 7, 4, 33 + noisenote 4, 7, 4, 16 + noisenote 4, 7, 1, 32 endchannel diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index 047413ae..569e50e2 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, 247, 128, 6 - squarenote 2, 247, 96, 6 - squarenote 1, 231, 64, 6 - squarenote 1, 231, 32, 6 - squarenote 15, 209, 0, 6 - squarenote 4, 199, 64, 7 - squarenote 4, 167, 48, 7 - squarenote 15, 145, 32, 7 + 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: dutycycle 121 - squarenote 10, 231, 130, 6 - squarenote 2, 231, 98, 6 - squarenote 1, 215, 66, 6 - squarenote 1, 215, 34, 6 - squarenote 15, 193, 2, 6 - squarenote 4, 183, 66, 7 - squarenote 2, 151, 50, 7 - squarenote 15, 129, 34, 7 + 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_Ch7: - noisenote 4, 116, 33 - noisenote 4, 116, 16 - noisenote 4, 113, 32 + noisenote 4, 7, 4, 33 + noisenote 4, 7, 4, 16 + noisenote 4, 7, 1, 32 endchannel diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index ecebe7e4..1ac5776b 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, 247, 128, 6 - squarenote 2, 247, 96, 6 - squarenote 1, 231, 64, 6 - squarenote 1, 231, 32, 6 - squarenote 15, 209, 0, 6 - squarenote 4, 199, 64, 7 - squarenote 4, 167, 48, 7 - squarenote 15, 145, 32, 7 + 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: dutycycle 121 - squarenote 10, 231, 130, 6 - squarenote 2, 231, 98, 6 - squarenote 1, 215, 66, 6 - squarenote 1, 215, 34, 6 - squarenote 15, 193, 2, 6 - squarenote 4, 183, 66, 7 - squarenote 2, 151, 50, 7 - squarenote 15, 129, 34, 7 + 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_Ch7: - noisenote 4, 116, 33 - noisenote 4, 116, 16 - noisenote 4, 113, 32 + noisenote 4, 7, 4, 33 + noisenote 4, 7, 4, 16 + noisenote 4, 7, 1, 32 endchannel diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index 0b632a02..5af0fef3 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, 247, 160, 7 - squarenote 8, 230, 164, 7 - squarenote 4, 214, 160, 7 - squarenote 15, 211, 32, 7 - squarenote 8, 195, 35, 7 - squarenote 2, 194, 40, 7 - squarenote 8, 177, 48, 7 + 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: dutycycle 10 - squarenote 4, 8, 0, 0 - squarenote 6, 167, 65, 7 - squarenote 8, 134, 67, 7 - squarenote 4, 118, 65, 7 - squarenote 13, 131, 194, 6 - squarenote 7, 115, 193, 6 - squarenote 3, 130, 204, 6 - squarenote 8, 113, 216, 6 + 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_Ch7: - noisenote 2, 242, 76 - noisenote 6, 230, 58 - noisenote 4, 215, 58 - noisenote 6, 214, 44 - noisenote 8, 229, 60 - noisenote 12, 210, 61 - noisenote 8, 209, 44 + 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 diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index 2bf5a547..6000549a 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, 247, 160, 7 - squarenote 8, 230, 164, 7 - squarenote 4, 214, 160, 7 - squarenote 15, 211, 32, 7 - squarenote 8, 195, 35, 7 - squarenote 2, 194, 40, 7 - squarenote 8, 177, 48, 7 + 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: dutycycle 10 - squarenote 4, 8, 0, 0 - squarenote 6, 167, 65, 7 - squarenote 8, 134, 67, 7 - squarenote 4, 118, 65, 7 - squarenote 13, 131, 194, 6 - squarenote 7, 115, 193, 6 - squarenote 3, 130, 204, 6 - squarenote 8, 113, 216, 6 + 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_Ch7: - noisenote 2, 242, 76 - noisenote 6, 230, 58 - noisenote 4, 215, 58 - noisenote 6, 214, 44 - noisenote 8, 229, 60 - noisenote 12, 210, 61 - noisenote 8, 209, 44 + 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 diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index 6fe2c7d0..c877f28a 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, 247, 160, 7 - squarenote 8, 230, 164, 7 - squarenote 4, 214, 160, 7 - squarenote 15, 211, 32, 7 - squarenote 8, 195, 35, 7 - squarenote 2, 194, 40, 7 - squarenote 8, 177, 48, 7 + 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: dutycycle 10 - squarenote 4, 8, 0, 0 - squarenote 6, 167, 65, 7 - squarenote 8, 134, 67, 7 - squarenote 4, 118, 65, 7 - squarenote 13, 131, 194, 6 - squarenote 7, 115, 193, 6 - squarenote 3, 130, 204, 6 - squarenote 8, 113, 216, 6 + 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_Ch7: - noisenote 2, 242, 76 - noisenote 6, 230, 58 - noisenote 4, 215, 58 - noisenote 6, 214, 44 - noisenote 8, 229, 60 - noisenote 12, 210, 61 - noisenote 8, 209, 44 + 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 diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index c919ddd0..a453a110 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, 242, 64, 4 - squarenote 15, 227, 160, 4 - squarenote 4, 210, 144, 4 - squarenote 8, 209, 128, 4 + 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: dutycycle 238 - squarenote 11, 210, 56, 4 - squarenote 14, 198, 152, 4 - squarenote 3, 178, 136, 4 - squarenote 8, 177, 120, 4 + squarenote 11, 13, 2, 1080 + squarenote 14, 12, 6, 1176 + squarenote 3, 11, 2, 1160 + squarenote 8, 11, 1, 1144 endchannel SFX_Cry12_1_Ch7: - noisenote 10, 230, 108 - noisenote 15, 210, 92 - noisenote 3, 194, 108 - noisenote 8, 209, 92 + noisenote 10, 14, 6, 108 + noisenote 15, 13, 2, 92 + noisenote 3, 12, 2, 108 + noisenote 8, 13, 1, 92 endchannel diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index 4715c969..4f3d39e4 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, 242, 64, 4 - squarenote 15, 227, 160, 4 - squarenote 4, 210, 144, 4 - squarenote 8, 209, 128, 4 + 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: dutycycle 238 - squarenote 11, 210, 56, 4 - squarenote 14, 198, 152, 4 - squarenote 3, 178, 136, 4 - squarenote 8, 177, 120, 4 + squarenote 11, 13, 2, 1080 + squarenote 14, 12, 6, 1176 + squarenote 3, 11, 2, 1160 + squarenote 8, 11, 1, 1144 endchannel SFX_Cry12_2_Ch7: - noisenote 10, 230, 108 - noisenote 15, 210, 92 - noisenote 3, 194, 108 - noisenote 8, 209, 92 + noisenote 10, 14, 6, 108 + noisenote 15, 13, 2, 92 + noisenote 3, 12, 2, 108 + noisenote 8, 13, 1, 92 endchannel diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index 10d067ef..033b02bb 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, 242, 64, 4 - squarenote 15, 227, 160, 4 - squarenote 4, 210, 144, 4 - squarenote 8, 209, 128, 4 + 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: dutycycle 238 - squarenote 11, 210, 56, 4 - squarenote 14, 198, 152, 4 - squarenote 3, 178, 136, 4 - squarenote 8, 177, 120, 4 + squarenote 11, 13, 2, 1080 + squarenote 14, 12, 6, 1176 + squarenote 3, 11, 2, 1160 + squarenote 8, 11, 1, 1144 endchannel SFX_Cry12_3_Ch7: - noisenote 10, 230, 108 - noisenote 15, 210, 92 - noisenote 3, 194, 108 - noisenote 8, 209, 92 + noisenote 10, 14, 6, 108 + noisenote 15, 13, 2, 92 + noisenote 3, 12, 2, 108 + noisenote 8, 13, 1, 92 endchannel diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index 3d2b192e..67db31fe 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, 246, 192, 5 - squarenote 8, 227, 188, 5 - squarenote 6, 210, 208, 5 - squarenote 6, 178, 224, 5 - squarenote 6, 194, 240, 5 - squarenote 8, 177, 0, 6 + 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: dutycycle 153 - squarenote 14, 198, 177, 4 - squarenote 7, 195, 173, 4 - squarenote 5, 178, 193, 4 - squarenote 8, 146, 209, 4 - squarenote 6, 162, 225, 4 - squarenote 8, 145, 241, 4 + 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_Ch7: - noisenote 10, 230, 92 - noisenote 10, 214, 108 - noisenote 4, 194, 76 - noisenote 6, 211, 92 - noisenote 8, 179, 76 - noisenote 8, 161, 92 + 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 diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index 650533ed..f1262bdc 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, 246, 192, 5 - squarenote 8, 227, 188, 5 - squarenote 6, 210, 208, 5 - squarenote 6, 178, 224, 5 - squarenote 6, 194, 240, 5 - squarenote 8, 177, 0, 6 + 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: dutycycle 153 - squarenote 14, 198, 177, 4 - squarenote 7, 195, 173, 4 - squarenote 5, 178, 193, 4 - squarenote 8, 146, 209, 4 - squarenote 6, 162, 225, 4 - squarenote 8, 145, 241, 4 + 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_Ch7: - noisenote 10, 230, 92 - noisenote 10, 214, 108 - noisenote 4, 194, 76 - noisenote 6, 211, 92 - noisenote 8, 179, 76 - noisenote 8, 161, 92 + 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 diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index 5d84bb87..f81dbe29 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, 246, 192, 5 - squarenote 8, 227, 188, 5 - squarenote 6, 210, 208, 5 - squarenote 6, 178, 224, 5 - squarenote 6, 194, 240, 5 - squarenote 8, 177, 0, 6 + 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: dutycycle 153 - squarenote 14, 198, 177, 4 - squarenote 7, 195, 173, 4 - squarenote 5, 178, 193, 4 - squarenote 8, 146, 209, 4 - squarenote 6, 162, 225, 4 - squarenote 8, 145, 241, 4 + 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_Ch7: - noisenote 10, 230, 92 - noisenote 10, 214, 108 - noisenote 4, 194, 76 - noisenote 6, 211, 92 - noisenote 8, 179, 76 - noisenote 8, 161, 92 + 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 diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index 58d5082d..b066f5fc 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, 228, 144, 7 - squarenote 15, 245, 192, 7 - squarenote 8, 209, 216, 7 + squarenote 8, 14, 4, 1936 + squarenote 15, 15, 5, 1984 + squarenote 8, 13, 1, 2008 endchannel SFX_Cry14_1_Ch5: dutycycle 165 - squarenote 10, 196, 113, 7 - squarenote 15, 182, 162, 7 - squarenote 8, 161, 183, 7 + squarenote 10, 12, 4, 1905 + squarenote 15, 11, 6, 1954 + squarenote 8, 10, 1, 1975 endchannel SFX_Cry14_1_Ch7: - noisenote 8, 228, 76 - noisenote 14, 196, 60 - noisenote 8, 209, 44 + noisenote 8, 14, 4, 76 + noisenote 14, 12, 4, 60 + noisenote 8, 13, 1, 44 endchannel diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index 7e326054..36c8e5aa 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, 228, 144, 7 - squarenote 15, 245, 192, 7 - squarenote 8, 209, 216, 7 + squarenote 8, 14, 4, 1936 + squarenote 15, 15, 5, 1984 + squarenote 8, 13, 1, 2008 endchannel SFX_Cry14_2_Ch5: dutycycle 165 - squarenote 10, 196, 113, 7 - squarenote 15, 182, 162, 7 - squarenote 8, 161, 183, 7 + squarenote 10, 12, 4, 1905 + squarenote 15, 11, 6, 1954 + squarenote 8, 10, 1, 1975 endchannel SFX_Cry14_2_Ch7: - noisenote 8, 228, 76 - noisenote 14, 196, 60 - noisenote 8, 209, 44 + noisenote 8, 14, 4, 76 + noisenote 14, 12, 4, 60 + noisenote 8, 13, 1, 44 endchannel diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index 42dc084d..ce4a27b9 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, 228, 144, 7 - squarenote 15, 245, 192, 7 - squarenote 8, 209, 216, 7 + squarenote 8, 14, 4, 1936 + squarenote 15, 15, 5, 1984 + squarenote 8, 13, 1, 2008 endchannel SFX_Cry14_3_Ch5: dutycycle 165 - squarenote 10, 196, 113, 7 - squarenote 15, 182, 162, 7 - squarenote 8, 161, 183, 7 + squarenote 10, 12, 4, 1905 + squarenote 15, 11, 6, 1954 + squarenote 8, 10, 1, 1975 endchannel SFX_Cry14_3_Ch7: - noisenote 8, 228, 76 - noisenote 14, 196, 60 - noisenote 8, 209, 44 + noisenote 8, 14, 4, 76 + noisenote 14, 12, 4, 60 + noisenote 8, 13, 1, 44 endchannel diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index 1a1e1a47..d9966782 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, 243, 128, 7 - squarenote 15, 231, 0, 7 - squarenote 8, 211, 16, 7 - squarenote 4, 194, 0, 7 - squarenote 4, 210, 240, 6 - squarenote 8, 193, 224, 6 + 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: dutycycle 90 - squarenote 6, 195, 1, 7 - squarenote 14, 183, 129, 6 - squarenote 7, 179, 146, 6 - squarenote 3, 162, 129, 6 - squarenote 4, 178, 114, 6 - squarenote 8, 161, 97, 6 + 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_Ch7: - noisenote 6, 227, 92 - noisenote 14, 214, 76 - noisenote 6, 198, 60 - noisenote 3, 179, 76 - noisenote 3, 162, 92 - noisenote 8, 177, 108 + 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 diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 29153506..0fa8daf0 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, 243, 128, 7 - squarenote 15, 231, 0, 7 - squarenote 8, 211, 16, 7 - squarenote 4, 194, 0, 7 - squarenote 4, 210, 240, 6 - squarenote 8, 193, 224, 6 + 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: dutycycle 90 - squarenote 6, 195, 1, 7 - squarenote 14, 183, 129, 6 - squarenote 7, 179, 146, 6 - squarenote 3, 162, 129, 6 - squarenote 4, 178, 114, 6 - squarenote 8, 161, 97, 6 + 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_Ch7: - noisenote 6, 227, 92 - noisenote 14, 214, 76 - noisenote 6, 198, 60 - noisenote 3, 179, 76 - noisenote 3, 162, 92 - noisenote 8, 177, 108 + 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 diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 090b18b2..5c4fe877 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, 243, 128, 7 - squarenote 15, 231, 0, 7 - squarenote 8, 211, 16, 7 - squarenote 4, 194, 0, 7 - squarenote 4, 210, 240, 6 - squarenote 8, 193, 224, 6 + 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: dutycycle 90 - squarenote 6, 195, 1, 7 - squarenote 14, 183, 129, 6 - squarenote 7, 179, 146, 6 - squarenote 3, 162, 129, 6 - squarenote 4, 178, 114, 6 - squarenote 8, 161, 97, 6 + 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_Ch7: - noisenote 6, 227, 92 - noisenote 14, 214, 76 - noisenote 6, 198, 60 - noisenote 3, 179, 76 - noisenote 3, 162, 92 - noisenote 8, 177, 108 + 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 diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index 2009a8b4..c6dcac1b 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, 215, 128, 7 - squarenote 4, 230, 160, 7 - squarenote 15, 210, 64, 7 + squarenote 15, 13, 7, 1920 + squarenote 4, 14, 6, 1952 + squarenote 15, 13, 2, 1856 endchannel SFX_Cry16_1_Ch5: dutycycle 90 - squarenote 15, 199, 83, 7 - squarenote 5, 182, 114, 7 - squarenote 15, 194, 17, 7 + squarenote 15, 12, 7, 1875 + squarenote 5, 11, 6, 1906 + squarenote 15, 12, 2, 1809 endchannel SFX_Cry16_1_Ch7: - noisenote 13, 246, 76 - noisenote 4, 230, 60 - noisenote 15, 242, 76 + noisenote 13, 15, 6, 76 + noisenote 4, 14, 6, 60 + noisenote 15, 15, 2, 76 endchannel diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 7baabb45..1946c8f1 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, 215, 128, 7 - squarenote 4, 230, 160, 7 - squarenote 15, 210, 64, 7 + squarenote 15, 13, 7, 1920 + squarenote 4, 14, 6, 1952 + squarenote 15, 13, 2, 1856 endchannel SFX_Cry16_2_Ch5: dutycycle 90 - squarenote 15, 199, 83, 7 - squarenote 5, 182, 114, 7 - squarenote 15, 194, 17, 7 + squarenote 15, 12, 7, 1875 + squarenote 5, 11, 6, 1906 + squarenote 15, 12, 2, 1809 endchannel SFX_Cry16_2_Ch7: - noisenote 13, 246, 76 - noisenote 4, 230, 60 - noisenote 15, 242, 76 + noisenote 13, 15, 6, 76 + noisenote 4, 14, 6, 60 + noisenote 15, 15, 2, 76 endchannel diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index b86e9fb3..bc8ff2ba 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, 215, 128, 7 - squarenote 4, 230, 160, 7 - squarenote 15, 210, 64, 7 + squarenote 15, 13, 7, 1920 + squarenote 4, 14, 6, 1952 + squarenote 15, 13, 2, 1856 endchannel SFX_Cry16_3_Ch5: dutycycle 90 - squarenote 15, 199, 83, 7 - squarenote 5, 182, 114, 7 - squarenote 15, 194, 17, 7 + squarenote 15, 12, 7, 1875 + squarenote 5, 11, 6, 1906 + squarenote 15, 12, 2, 1809 endchannel SFX_Cry16_3_Ch7: - noisenote 13, 246, 76 - noisenote 4, 230, 60 - noisenote 15, 242, 76 + noisenote 13, 15, 6, 76 + noisenote 4, 14, 6, 60 + noisenote 15, 15, 2, 76 endchannel diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index 1b754064..29b6fff2 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, 247, 0, 5 - squarenote 15, 231, 8, 5 - squarenote 8, 180, 128, 4 - squarenote 15, 162, 96, 4 + 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: dutycycle 68 - squarenote 14, 215, 129, 4 - squarenote 14, 199, 137, 4 - squarenote 10, 180, 1, 4 - squarenote 15, 194, 225, 3 + squarenote 14, 13, 7, 1153 + squarenote 14, 12, 7, 1161 + squarenote 10, 11, 4, 1025 + squarenote 15, 12, 2, 993 endchannel SFX_Cry17_1_Ch7: - noisenote 14, 247, 124 - noisenote 12, 246, 108 - noisenote 9, 228, 124 - noisenote 15, 226, 108 + noisenote 14, 15, 7, 124 + noisenote 12, 15, 6, 108 + noisenote 9, 14, 4, 124 + noisenote 15, 14, 2, 108 endchannel diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index 8e40e269..4a42db48 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, 247, 0, 5 - squarenote 15, 231, 8, 5 - squarenote 8, 180, 128, 4 - squarenote 15, 162, 96, 4 + 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: dutycycle 68 - squarenote 14, 215, 129, 4 - squarenote 14, 199, 137, 4 - squarenote 10, 180, 1, 4 - squarenote 15, 194, 225, 3 + squarenote 14, 13, 7, 1153 + squarenote 14, 12, 7, 1161 + squarenote 10, 11, 4, 1025 + squarenote 15, 12, 2, 993 endchannel SFX_Cry17_2_Ch7: - noisenote 14, 247, 124 - noisenote 12, 246, 108 - noisenote 9, 228, 124 - noisenote 15, 226, 108 + noisenote 14, 15, 7, 124 + noisenote 12, 15, 6, 108 + noisenote 9, 14, 4, 124 + noisenote 15, 14, 2, 108 endchannel diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index a8aa3d26..4340c97f 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, 247, 0, 5 - squarenote 15, 231, 8, 5 - squarenote 8, 180, 128, 4 - squarenote 15, 162, 96, 4 + 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: dutycycle 68 - squarenote 14, 215, 129, 4 - squarenote 14, 199, 137, 4 - squarenote 10, 180, 1, 4 - squarenote 15, 194, 225, 3 + squarenote 14, 13, 7, 1153 + squarenote 14, 12, 7, 1161 + squarenote 10, 11, 4, 1025 + squarenote 15, 12, 2, 993 endchannel SFX_Cry17_3_Ch7: - noisenote 14, 247, 124 - noisenote 12, 246, 108 - noisenote 9, 228, 124 - noisenote 15, 226, 108 + noisenote 14, 15, 7, 124 + noisenote 12, 15, 6, 108 + noisenote 9, 14, 4, 124 + noisenote 15, 14, 2, 108 endchannel diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index cd6ea771..8249731a 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, 245, 128, 6 - squarenote 3, 226, 160, 6 - squarenote 3, 242, 192, 6 - squarenote 3, 226, 224, 6 - squarenote 3, 210, 0, 7 - squarenote 3, 194, 224, 6 - squarenote 3, 210, 192, 6 - squarenote 8, 193, 160, 6 + 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: dutycycle 15 - squarenote 9, 213, 49, 6 - squarenote 3, 210, 82, 6 - squarenote 3, 226, 113, 6 - squarenote 3, 178, 145, 6 - squarenote 3, 194, 178, 6 - squarenote 3, 178, 145, 6 - squarenote 3, 194, 113, 6 - squarenote 8, 177, 81, 6 + 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_Ch7: - noisenote 6, 227, 76 - noisenote 4, 195, 60 - noisenote 5, 212, 60 - noisenote 4, 196, 44 - noisenote 6, 180, 60 - noisenote 8, 193, 44 + 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 diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 5d44d5c0..39f85b8f 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, 245, 128, 6 - squarenote 3, 226, 160, 6 - squarenote 3, 242, 192, 6 - squarenote 3, 226, 224, 6 - squarenote 3, 210, 0, 7 - squarenote 3, 194, 224, 6 - squarenote 3, 210, 192, 6 - squarenote 8, 193, 160, 6 + 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: dutycycle 15 - squarenote 9, 213, 49, 6 - squarenote 3, 210, 82, 6 - squarenote 3, 226, 113, 6 - squarenote 3, 178, 145, 6 - squarenote 3, 194, 178, 6 - squarenote 3, 178, 145, 6 - squarenote 3, 194, 113, 6 - squarenote 8, 177, 81, 6 + 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_Ch7: - noisenote 6, 227, 76 - noisenote 4, 195, 60 - noisenote 5, 212, 60 - noisenote 4, 196, 44 - noisenote 6, 180, 60 - noisenote 8, 193, 44 + 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 diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index edd0eda4..4bcf5b6d 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, 245, 128, 6 - squarenote 3, 226, 160, 6 - squarenote 3, 242, 192, 6 - squarenote 3, 226, 224, 6 - squarenote 3, 210, 0, 7 - squarenote 3, 194, 224, 6 - squarenote 3, 210, 192, 6 - squarenote 8, 193, 160, 6 + 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: dutycycle 15 - squarenote 9, 213, 49, 6 - squarenote 3, 210, 82, 6 - squarenote 3, 226, 113, 6 - squarenote 3, 178, 145, 6 - squarenote 3, 194, 178, 6 - squarenote 3, 178, 145, 6 - squarenote 3, 194, 113, 6 - squarenote 8, 177, 81, 6 + 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_Ch7: - noisenote 6, 227, 76 - noisenote 4, 195, 60 - noisenote 5, 212, 60 - noisenote 4, 196, 44 - noisenote 6, 180, 60 - noisenote 8, 193, 44 + 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 diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index badcd4f9..d0435941 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,17 +1,17 @@ SFX_Cry19_1_Ch4: dutycycle 27 - squarenote 7, 210, 64, 7 - squarenote 15, 229, 96, 7 - squarenote 15, 193, 48, 7 + squarenote 7, 13, 2, 1856 + squarenote 15, 14, 5, 1888 + squarenote 15, 12, 1, 1840 endchannel SFX_Cry19_1_Ch5: dutycycle 129 - squarenote 2, 194, 1, 7 - squarenote 4, 194, 8, 7 - squarenote 15, 215, 65, 7 - squarenote 15, 162, 1, 7 + squarenote 2, 12, 2, 1793 + squarenote 4, 12, 2, 1800 + squarenote 15, 13, 7, 1857 + squarenote 15, 10, 2, 1793 SFX_Cry19_1_Ch7: diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index baba2a1f..b088c0de 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,17 +1,17 @@ SFX_Cry19_2_Ch4: dutycycle 27 - squarenote 7, 210, 64, 7 - squarenote 15, 229, 96, 7 - squarenote 15, 193, 48, 7 + squarenote 7, 13, 2, 1856 + squarenote 15, 14, 5, 1888 + squarenote 15, 12, 1, 1840 endchannel SFX_Cry19_2_Ch5: dutycycle 129 - squarenote 2, 194, 1, 7 - squarenote 4, 194, 8, 7 - squarenote 15, 215, 65, 7 - squarenote 15, 162, 1, 7 + squarenote 2, 12, 2, 1793 + squarenote 4, 12, 2, 1800 + squarenote 15, 13, 7, 1857 + squarenote 15, 10, 2, 1793 SFX_Cry19_2_Ch7: diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index c2ef3f66..e42489c4 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,17 +1,17 @@ SFX_Cry19_3_Ch4: dutycycle 27 - squarenote 7, 210, 64, 7 - squarenote 15, 229, 96, 7 - squarenote 15, 193, 48, 7 + squarenote 7, 13, 2, 1856 + squarenote 15, 14, 5, 1888 + squarenote 15, 12, 1, 1840 endchannel SFX_Cry19_3_Ch5: dutycycle 129 - squarenote 2, 194, 1, 7 - squarenote 4, 194, 8, 7 - squarenote 15, 215, 65, 7 - squarenote 15, 162, 1, 7 + squarenote 2, 12, 2, 1793 + squarenote 4, 12, 2, 1800 + squarenote 15, 13, 7, 1857 + squarenote 15, 10, 2, 1793 SFX_Cry19_3_Ch7: diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index db8dee74..8bbf8288 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, 247, 64, 7 - squarenote 12, 230, 68, 7 - squarenote 6, 213, 80, 7 - squarenote 4, 195, 96, 7 - squarenote 3, 195, 128, 7 - squarenote 8, 209, 160, 7 + 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: dutycycle 10 - squarenote 6, 199, 1, 7 - squarenote 11, 182, 2, 7 - squarenote 6, 165, 17, 7 - squarenote 4, 147, 33, 7 - squarenote 3, 163, 65, 7 - squarenote 8, 145, 98, 7 + 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_Ch7: - noisenote 3, 226, 60 - noisenote 8, 214, 76 - noisenote 5, 212, 60 - noisenote 12, 199, 76 - noisenote 2, 226, 60 - noisenote 8, 209, 44 + 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 diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index 6b2a3a9f..b6ed820b 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, 247, 64, 7 - squarenote 12, 230, 68, 7 - squarenote 6, 213, 80, 7 - squarenote 4, 195, 96, 7 - squarenote 3, 195, 128, 7 - squarenote 8, 209, 160, 7 + 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: dutycycle 10 - squarenote 6, 199, 1, 7 - squarenote 11, 182, 2, 7 - squarenote 6, 165, 17, 7 - squarenote 4, 147, 33, 7 - squarenote 3, 163, 65, 7 - squarenote 8, 145, 98, 7 + 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_Ch7: - noisenote 3, 226, 60 - noisenote 8, 214, 76 - noisenote 5, 212, 60 - noisenote 12, 199, 76 - noisenote 2, 226, 60 - noisenote 8, 209, 44 + 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 diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index 7ec2f544..aee947cd 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, 247, 64, 7 - squarenote 12, 230, 68, 7 - squarenote 6, 213, 80, 7 - squarenote 4, 195, 96, 7 - squarenote 3, 195, 128, 7 - squarenote 8, 209, 160, 7 + 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: dutycycle 10 - squarenote 6, 199, 1, 7 - squarenote 11, 182, 2, 7 - squarenote 6, 165, 17, 7 - squarenote 4, 147, 33, 7 - squarenote 3, 163, 65, 7 - squarenote 8, 145, 98, 7 + 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_Ch7: - noisenote 3, 226, 60 - noisenote 8, 214, 76 - noisenote 5, 212, 60 - noisenote 12, 199, 76 - noisenote 2, 226, 60 - noisenote 8, 209, 44 + 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 diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index 7eb1a301..86f3d421 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, 247, 192, 6 - squarenote 15, 231, 0, 7 - squarenote 4, 244, 240, 6 - squarenote 4, 228, 224, 6 - squarenote 8, 209, 208, 6 + 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: dutycycle 10 - squarenote 7, 230, 129, 6 - squarenote 14, 213, 193, 6 - squarenote 4, 196, 177, 6 - squarenote 4, 212, 161, 6 - squarenote 8, 193, 145, 6 + 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_Ch7: - noisenote 10, 166, 60 - noisenote 14, 148, 44 - noisenote 5, 163, 60 - noisenote 8, 145, 44 + noisenote 10, 10, 6, 60 + noisenote 14, 9, 4, 44 + noisenote 5, 10, 3, 60 + noisenote 8, 9, 1, 44 endchannel diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index c3ff4c8e..1faaf5bb 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, 247, 192, 6 - squarenote 15, 231, 0, 7 - squarenote 4, 244, 240, 6 - squarenote 4, 228, 224, 6 - squarenote 8, 209, 208, 6 + 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: dutycycle 10 - squarenote 7, 230, 129, 6 - squarenote 14, 213, 193, 6 - squarenote 4, 196, 177, 6 - squarenote 4, 212, 161, 6 - squarenote 8, 193, 145, 6 + 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_Ch7: - noisenote 10, 166, 60 - noisenote 14, 148, 44 - noisenote 5, 163, 60 - noisenote 8, 145, 44 + noisenote 10, 10, 6, 60 + noisenote 14, 9, 4, 44 + noisenote 5, 10, 3, 60 + noisenote 8, 9, 1, 44 endchannel diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index eb1cc9df..09196c26 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, 247, 192, 6 - squarenote 15, 231, 0, 7 - squarenote 4, 244, 240, 6 - squarenote 4, 228, 224, 6 - squarenote 8, 209, 208, 6 + 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: dutycycle 10 - squarenote 7, 230, 129, 6 - squarenote 14, 213, 193, 6 - squarenote 4, 196, 177, 6 - squarenote 4, 212, 161, 6 - squarenote 8, 193, 145, 6 + 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_Ch7: - noisenote 10, 166, 60 - noisenote 14, 148, 44 - noisenote 5, 163, 60 - noisenote 8, 145, 44 + noisenote 10, 10, 6, 60 + noisenote 14, 9, 4, 44 + noisenote 5, 10, 3, 60 + noisenote 8, 9, 1, 44 endchannel diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index 66c9e397..2fd4f7b2 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, 214, 225, 7 - squarenote 6, 198, 226, 7 - squarenote 9, 214, 225, 7 - squarenote 7, 198, 224, 7 - squarenote 5, 182, 226, 7 - squarenote 7, 198, 225, 7 - squarenote 6, 182, 224, 7 - squarenote 8, 161, 223, 7 + 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: dutycycle 68 - squarenote 6, 195, 201, 7 - squarenote 6, 179, 199, 7 - squarenote 10, 196, 195, 7 - squarenote 8, 180, 199, 7 - squarenote 6, 195, 201, 7 - squarenote 15, 162, 197, 7 + 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_Ch7: - noisenote 13, 25, 124 - noisenote 13, 247, 140 - noisenote 12, 214, 124 - noisenote 8, 196, 108 - noisenote 15, 179, 92 + 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 diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index 12096df3..69a08eef 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, 214, 225, 7 - squarenote 6, 198, 226, 7 - squarenote 9, 214, 225, 7 - squarenote 7, 198, 224, 7 - squarenote 5, 182, 226, 7 - squarenote 7, 198, 225, 7 - squarenote 6, 182, 224, 7 - squarenote 8, 161, 223, 7 + 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: dutycycle 68 - squarenote 6, 195, 201, 7 - squarenote 6, 179, 199, 7 - squarenote 10, 196, 195, 7 - squarenote 8, 180, 199, 7 - squarenote 6, 195, 201, 7 - squarenote 15, 162, 197, 7 + 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_Ch7: - noisenote 13, 25, 124 - noisenote 13, 247, 140 - noisenote 12, 214, 124 - noisenote 8, 196, 108 - noisenote 15, 179, 92 + 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 diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index b126abb0..59f69402 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, 214, 225, 7 - squarenote 6, 198, 226, 7 - squarenote 9, 214, 225, 7 - squarenote 7, 198, 224, 7 - squarenote 5, 182, 226, 7 - squarenote 7, 198, 225, 7 - squarenote 6, 182, 224, 7 - squarenote 8, 161, 223, 7 + 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: dutycycle 68 - squarenote 6, 195, 201, 7 - squarenote 6, 179, 199, 7 - squarenote 10, 196, 195, 7 - squarenote 8, 180, 199, 7 - squarenote 6, 195, 201, 7 - squarenote 15, 162, 197, 7 + 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_Ch7: - noisenote 13, 25, 124 - noisenote 13, 247, 140 - noisenote 12, 214, 124 - noisenote 8, 196, 108 - noisenote 15, 179, 92 + 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 diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 056ed408..4cef3bf0 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, 240, 5, 7 - squarenote 10, 224, 0, 7 - squarenote 6, 180, 16, 7 - squarenote 4, 211, 0, 7 - squarenote 6, 178, 32, 6 - squarenote 8, 161, 36, 6 + 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: dutycycle 34 - squarenote 15, 176, 195, 6 - squarenote 10, 160, 193, 6 - squarenote 6, 132, 210, 6 - squarenote 4, 147, 193, 6 - squarenote 6, 130, 225, 5 - squarenote 8, 97, 232, 5 + 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_Ch7: - noisenote 6, 230, 76 - noisenote 15, 214, 60 - noisenote 10, 197, 74 - noisenote 1, 178, 91 - noisenote 15, 194, 76 + 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 diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index bfce7c66..874be61e 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, 240, 5, 7 - squarenote 10, 224, 0, 7 - squarenote 6, 180, 16, 7 - squarenote 4, 211, 0, 7 - squarenote 6, 178, 32, 6 - squarenote 8, 161, 36, 6 + 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: dutycycle 34 - squarenote 15, 176, 195, 6 - squarenote 10, 160, 193, 6 - squarenote 6, 132, 210, 6 - squarenote 4, 147, 193, 6 - squarenote 6, 130, 225, 5 - squarenote 8, 97, 232, 5 + 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_Ch7: - noisenote 6, 230, 76 - noisenote 15, 214, 60 - noisenote 10, 197, 74 - noisenote 1, 178, 91 - noisenote 15, 194, 76 + 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 diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index 8b05e3cb..991e44bb 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, 240, 5, 7 - squarenote 10, 224, 0, 7 - squarenote 6, 180, 16, 7 - squarenote 4, 211, 0, 7 - squarenote 6, 178, 32, 6 - squarenote 8, 161, 36, 6 + 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: dutycycle 34 - squarenote 15, 176, 195, 6 - squarenote 10, 160, 193, 6 - squarenote 6, 132, 210, 6 - squarenote 4, 147, 193, 6 - squarenote 6, 130, 225, 5 - squarenote 8, 97, 232, 5 + 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_Ch7: - noisenote 6, 230, 76 - noisenote 15, 214, 60 - noisenote 10, 197, 74 - noisenote 1, 178, 91 - noisenote 15, 194, 76 + 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 diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index d6bf2450..b028e616 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, 242, 0, 6 - squarenote 6, 226, 64, 6 - squarenote 6, 210, 128, 6 - squarenote 6, 226, 192, 6 - squarenote 6, 210, 0, 7 - squarenote 6, 194, 64, 7 - squarenote 6, 178, 128, 7 - squarenote 8, 161, 192, 7 + 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: dutycycle 17 - squarenote 3, 8, 1, 0 - squarenote 6, 194, 193, 5 - squarenote 6, 178, 2, 6 - squarenote 6, 162, 65, 6 - squarenote 6, 178, 130, 6 - squarenote 6, 162, 194, 6 - squarenote 6, 146, 1, 7 - squarenote 6, 162, 66, 7 - squarenote 8, 129, 129, 7 + 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_Ch7: - noisenote 6, 8, 1 - noisenote 5, 226, 92 - noisenote 5, 194, 76 - noisenote 5, 210, 60 - noisenote 5, 178, 44 - noisenote 5, 194, 28 - noisenote 5, 162, 27 - noisenote 5, 146, 26 - noisenote 8, 129, 24 + 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 diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index c9f7a2ed..783ee324 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, 242, 0, 6 - squarenote 6, 226, 64, 6 - squarenote 6, 210, 128, 6 - squarenote 6, 226, 192, 6 - squarenote 6, 210, 0, 7 - squarenote 6, 194, 64, 7 - squarenote 6, 178, 128, 7 - squarenote 8, 161, 192, 7 + 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: dutycycle 17 - squarenote 3, 8, 1, 0 - squarenote 6, 194, 193, 5 - squarenote 6, 178, 2, 6 - squarenote 6, 162, 65, 6 - squarenote 6, 178, 130, 6 - squarenote 6, 162, 194, 6 - squarenote 6, 146, 1, 7 - squarenote 6, 162, 66, 7 - squarenote 8, 129, 129, 7 + 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_Ch7: - noisenote 6, 8, 1 - noisenote 5, 226, 92 - noisenote 5, 194, 76 - noisenote 5, 210, 60 - noisenote 5, 178, 44 - noisenote 5, 194, 28 - noisenote 5, 162, 27 - noisenote 5, 146, 26 - noisenote 8, 129, 24 + 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 diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index d54c72c9..f78e6d0a 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, 242, 0, 6 - squarenote 6, 226, 64, 6 - squarenote 6, 210, 128, 6 - squarenote 6, 226, 192, 6 - squarenote 6, 210, 0, 7 - squarenote 6, 194, 64, 7 - squarenote 6, 178, 128, 7 - squarenote 8, 161, 192, 7 + 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: dutycycle 17 - squarenote 3, 8, 1, 0 - squarenote 6, 194, 193, 5 - squarenote 6, 178, 2, 6 - squarenote 6, 162, 65, 6 - squarenote 6, 178, 130, 6 - squarenote 6, 162, 194, 6 - squarenote 6, 146, 1, 7 - squarenote 6, 162, 66, 7 - squarenote 8, 129, 129, 7 + 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_Ch7: - noisenote 6, 8, 1 - noisenote 5, 226, 92 - noisenote 5, 194, 76 - noisenote 5, 210, 60 - noisenote 5, 178, 44 - noisenote 5, 194, 28 - noisenote 5, 162, 27 - noisenote 5, 146, 26 - noisenote 8, 129, 24 + 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 diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index a636c051..f4596492 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, 244, 65, 6 - squarenote 13, 214, 33, 7 - squarenote 8, 244, 25, 7 - squarenote 8, 193, 26, 7 + 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: dutycycle 204 - squarenote 4, 244, 128, 5 - squarenote 14, 230, 224, 6 - squarenote 8, 213, 216, 6 - squarenote 8, 209, 220, 6 + squarenote 4, 15, 4, 1408 + squarenote 14, 14, 6, 1760 + squarenote 8, 13, 5, 1752 + squarenote 8, 13, 1, 1756 endchannel SFX_Cry1F_1_Ch7: - noisenote 5, 196, 70 - noisenote 13, 165, 68 - noisenote 8, 196, 69 - noisenote 8, 177, 68 + noisenote 5, 12, 4, 70 + noisenote 13, 10, 5, 68 + noisenote 8, 12, 4, 69 + noisenote 8, 11, 1, 68 endchannel diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index efda76fa..dc46f49a 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, 244, 65, 6 - squarenote 13, 214, 33, 7 - squarenote 8, 244, 25, 7 - squarenote 8, 193, 26, 7 + 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: dutycycle 204 - squarenote 4, 244, 128, 5 - squarenote 14, 230, 224, 6 - squarenote 8, 213, 216, 6 - squarenote 8, 209, 220, 6 + squarenote 4, 15, 4, 1408 + squarenote 14, 14, 6, 1760 + squarenote 8, 13, 5, 1752 + squarenote 8, 13, 1, 1756 endchannel SFX_Cry1F_2_Ch7: - noisenote 5, 196, 70 - noisenote 13, 165, 68 - noisenote 8, 196, 69 - noisenote 8, 177, 68 + noisenote 5, 12, 4, 70 + noisenote 13, 10, 5, 68 + noisenote 8, 12, 4, 69 + noisenote 8, 11, 1, 68 endchannel diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index ea2403a5..41c3b766 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, 244, 65, 6 - squarenote 13, 214, 33, 7 - squarenote 8, 244, 25, 7 - squarenote 8, 193, 26, 7 + 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: dutycycle 204 - squarenote 4, 244, 128, 5 - squarenote 14, 230, 224, 6 - squarenote 8, 213, 216, 6 - squarenote 8, 209, 220, 6 + squarenote 4, 15, 4, 1408 + squarenote 14, 14, 6, 1760 + squarenote 8, 13, 5, 1752 + squarenote 8, 13, 1, 1756 endchannel SFX_Cry1F_3_Ch7: - noisenote 5, 196, 70 - noisenote 13, 165, 68 - noisenote 8, 196, 69 - noisenote 8, 177, 68 + noisenote 5, 12, 4, 70 + noisenote 13, 10, 5, 68 + noisenote 8, 12, 4, 69 + noisenote 8, 11, 1, 68 endchannel diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index 2ba98882..cd0b85ec 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, 241, 17, 5 - squarenote 13, 225, 21, 5 - squarenote 13, 225, 17, 5 - squarenote 8, 209, 17, 5 + 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: dutycycle 21 - squarenote 12, 225, 12, 5 - squarenote 12, 209, 16, 5 - squarenote 14, 193, 12, 5 - squarenote 8, 193, 10, 5 + squarenote 12, 14, 1, 1292 + squarenote 12, 13, 1, 1296 + squarenote 14, 12, 1, 1292 + squarenote 8, 12, 1, 1290 endchannel SFX_Cry20_1_Ch7: - noisenote 14, 242, 101 - noisenote 13, 226, 85 - noisenote 14, 210, 86 - noisenote 8, 209, 102 + noisenote 14, 15, 2, 101 + noisenote 13, 14, 2, 85 + noisenote 14, 13, 2, 86 + noisenote 8, 13, 1, 102 endchannel diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index ae3ae4de..7bd21c47 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, 241, 17, 5 - squarenote 13, 225, 21, 5 - squarenote 13, 225, 17, 5 - squarenote 8, 209, 17, 5 + 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: dutycycle 21 - squarenote 12, 225, 12, 5 - squarenote 12, 209, 16, 5 - squarenote 14, 193, 12, 5 - squarenote 8, 193, 10, 5 + squarenote 12, 14, 1, 1292 + squarenote 12, 13, 1, 1296 + squarenote 14, 12, 1, 1292 + squarenote 8, 12, 1, 1290 endchannel SFX_Cry20_2_Ch7: - noisenote 14, 242, 101 - noisenote 13, 226, 85 - noisenote 14, 210, 86 - noisenote 8, 209, 102 + noisenote 14, 15, 2, 101 + noisenote 13, 14, 2, 85 + noisenote 14, 13, 2, 86 + noisenote 8, 13, 1, 102 endchannel diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 1587a0aa..89013d69 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, 241, 17, 5 - squarenote 13, 225, 21, 5 - squarenote 13, 225, 17, 5 - squarenote 8, 209, 17, 5 + 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: dutycycle 21 - squarenote 12, 225, 12, 5 - squarenote 12, 209, 16, 5 - squarenote 14, 193, 12, 5 - squarenote 8, 193, 10, 5 + squarenote 12, 14, 1, 1292 + squarenote 12, 13, 1, 1296 + squarenote 14, 12, 1, 1292 + squarenote 8, 12, 1, 1290 endchannel SFX_Cry20_3_Ch7: - noisenote 14, 242, 101 - noisenote 13, 226, 85 - noisenote 14, 210, 86 - noisenote 8, 209, 102 + noisenote 14, 15, 2, 101 + noisenote 13, 14, 2, 85 + noisenote 14, 13, 2, 86 + noisenote 8, 13, 1, 102 endchannel diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index 0d099839..7cfad5d5 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,26 +1,26 @@ SFX_Cry21_1_Ch4: dutycycle 27 - squarenote 3, 243, 100, 5 - squarenote 2, 226, 68, 5 - squarenote 5, 209, 34, 5 - squarenote 2, 178, 132, 4 - squarenote 8, 209, 162, 4 - squarenote 3, 243, 36, 5 - squarenote 4, 228, 228, 4 - squarenote 8, 209, 2, 5 + 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: dutycycle 204 - squarenote 3, 211, 96, 5 - squarenote 2, 194, 64, 5 - squarenote 5, 193, 32, 5 - squarenote 2, 146, 128, 4 - squarenote 8, 193, 160, 4 - squarenote 3, 211, 32, 5 - squarenote 3, 196, 224, 4 - squarenote 8, 193, 0, 5 + 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_Ch7: diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index a4ec20b2..cb4b80d3 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,26 +1,26 @@ SFX_Cry21_2_Ch4: dutycycle 27 - squarenote 3, 243, 100, 5 - squarenote 2, 226, 68, 5 - squarenote 5, 209, 34, 5 - squarenote 2, 178, 132, 4 - squarenote 8, 209, 162, 4 - squarenote 3, 243, 36, 5 - squarenote 4, 228, 228, 4 - squarenote 8, 209, 2, 5 + 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: dutycycle 204 - squarenote 3, 211, 96, 5 - squarenote 2, 194, 64, 5 - squarenote 5, 193, 32, 5 - squarenote 2, 146, 128, 4 - squarenote 8, 193, 160, 4 - squarenote 3, 211, 32, 5 - squarenote 3, 196, 224, 4 - squarenote 8, 193, 0, 5 + 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_Ch7: diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index 9fa85b11..971a85dc 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,26 +1,26 @@ SFX_Cry21_3_Ch4: dutycycle 27 - squarenote 3, 243, 100, 5 - squarenote 2, 226, 68, 5 - squarenote 5, 209, 34, 5 - squarenote 2, 178, 132, 4 - squarenote 8, 209, 162, 4 - squarenote 3, 243, 36, 5 - squarenote 4, 228, 228, 4 - squarenote 8, 209, 2, 5 + 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: dutycycle 204 - squarenote 3, 211, 96, 5 - squarenote 2, 194, 64, 5 - squarenote 5, 193, 32, 5 - squarenote 2, 146, 128, 4 - squarenote 8, 193, 160, 4 - squarenote 3, 211, 32, 5 - squarenote 3, 196, 224, 4 - squarenote 8, 193, 0, 5 + 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_Ch7: diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index 71f026b6..77ba4679 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, 61, 129, 3 - squarenote 7, 245, 1, 6 - squarenote 1, 194, 129, 4 - squarenote 8, 145, 129, 3 + 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: dutycycle 238 - squarenote 2, 62, 176, 5 - squarenote 7, 213, 93, 7 - squarenote 1, 178, 176, 6 - squarenote 8, 97, 176, 5 + squarenote 2, 3, -6, 1456 + squarenote 7, 13, 5, 1885 + squarenote 1, 11, 2, 1712 + squarenote 8, 6, 1, 1456 endchannel SFX_Cry22_1_Ch7: - noisenote 2, 146, 73 - noisenote 7, 181, 41 - noisenote 1, 162, 57 - noisenote 8, 145, 73 + noisenote 2, 9, 2, 73 + noisenote 7, 11, 5, 41 + noisenote 1, 10, 2, 57 + noisenote 8, 9, 1, 73 endchannel diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index e47021e4..05eb17a1 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, 61, 129, 3 - squarenote 7, 245, 1, 6 - squarenote 1, 194, 129, 4 - squarenote 8, 145, 129, 3 + 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: dutycycle 238 - squarenote 2, 62, 176, 5 - squarenote 7, 213, 93, 7 - squarenote 1, 178, 176, 6 - squarenote 8, 97, 176, 5 + squarenote 2, 3, -6, 1456 + squarenote 7, 13, 5, 1885 + squarenote 1, 11, 2, 1712 + squarenote 8, 6, 1, 1456 endchannel SFX_Cry22_2_Ch7: - noisenote 2, 146, 73 - noisenote 7, 181, 41 - noisenote 1, 162, 57 - noisenote 8, 145, 73 + noisenote 2, 9, 2, 73 + noisenote 7, 11, 5, 41 + noisenote 1, 10, 2, 57 + noisenote 8, 9, 1, 73 endchannel diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 19ee38a5..01cc5b28 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, 61, 129, 3 - squarenote 7, 245, 1, 6 - squarenote 1, 194, 129, 4 - squarenote 8, 145, 129, 3 + 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: dutycycle 238 - squarenote 2, 62, 176, 5 - squarenote 7, 213, 93, 7 - squarenote 1, 178, 176, 6 - squarenote 8, 97, 176, 5 + squarenote 2, 3, -6, 1456 + squarenote 7, 13, 5, 1885 + squarenote 1, 11, 2, 1712 + squarenote 8, 6, 1, 1456 endchannel SFX_Cry22_3_Ch7: - noisenote 2, 146, 73 - noisenote 7, 181, 41 - noisenote 1, 162, 57 - noisenote 8, 145, 73 + noisenote 2, 9, 2, 73 + noisenote 7, 11, 5, 41 + noisenote 1, 10, 2, 57 + noisenote 8, 9, 1, 73 endchannel diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index 87bcf9c5..e87e2b41 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, 247, 192, 7 - squarenote 6, 228, 193, 7 - squarenote 10, 246, 192, 7 - squarenote 4, 211, 194, 7 - squarenote 8, 193, 192, 7 + 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: dutycycle 95 - squarenote 15, 151, 129, 7 - squarenote 6, 132, 128, 7 - squarenote 10, 150, 129, 7 - squarenote 15, 131, 129, 7 + squarenote 15, 9, 7, 1921 + squarenote 6, 8, 4, 1920 + squarenote 10, 9, 6, 1921 + squarenote 15, 8, 3, 1921 endchannel SFX_Cry23_1_Ch7: - noisenote 3, 242, 60 - noisenote 13, 230, 44 - noisenote 15, 215, 60 - noisenote 8, 193, 44 + noisenote 3, 15, 2, 60 + noisenote 13, 14, 6, 44 + noisenote 15, 13, 7, 60 + noisenote 8, 12, 1, 44 endchannel diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index d53448ea..24dba11c 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, 247, 192, 7 - squarenote 6, 228, 193, 7 - squarenote 10, 246, 192, 7 - squarenote 4, 211, 194, 7 - squarenote 8, 193, 192, 7 + 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: dutycycle 95 - squarenote 15, 151, 129, 7 - squarenote 6, 132, 128, 7 - squarenote 10, 150, 129, 7 - squarenote 15, 131, 129, 7 + squarenote 15, 9, 7, 1921 + squarenote 6, 8, 4, 1920 + squarenote 10, 9, 6, 1921 + squarenote 15, 8, 3, 1921 endchannel SFX_Cry23_2_Ch7: - noisenote 3, 242, 60 - noisenote 13, 230, 44 - noisenote 15, 215, 60 - noisenote 8, 193, 44 + noisenote 3, 15, 2, 60 + noisenote 13, 14, 6, 44 + noisenote 15, 13, 7, 60 + noisenote 8, 12, 1, 44 endchannel diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index c8f76727..e3c62be5 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, 247, 192, 7 - squarenote 6, 228, 193, 7 - squarenote 10, 246, 192, 7 - squarenote 4, 211, 194, 7 - squarenote 8, 193, 192, 7 + 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: dutycycle 95 - squarenote 15, 151, 129, 7 - squarenote 6, 132, 128, 7 - squarenote 10, 150, 129, 7 - squarenote 15, 131, 129, 7 + squarenote 15, 9, 7, 1921 + squarenote 6, 8, 4, 1920 + squarenote 10, 9, 6, 1921 + squarenote 15, 8, 3, 1921 endchannel SFX_Cry23_3_Ch7: - noisenote 3, 242, 60 - noisenote 13, 230, 44 - noisenote 15, 215, 60 - noisenote 8, 193, 44 + noisenote 3, 15, 2, 60 + noisenote 13, 14, 6, 44 + noisenote 15, 13, 7, 60 + noisenote 8, 12, 1, 44 endchannel diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index 0beb9ce5..99218856 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, 247, 128, 6 - squarenote 10, 230, 132, 6 - squarenote 15, 215, 144, 6 - squarenote 8, 213, 144, 6 - squarenote 6, 196, 136, 6 - squarenote 5, 211, 112, 6 - squarenote 4, 211, 96, 6 - squarenote 8, 193, 64, 6 + 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: dutycycle 5 - squarenote 15, 183, 65, 6 - squarenote 10, 150, 66, 6 - squarenote 15, 167, 81, 6 - squarenote 8, 165, 81, 6 - squarenote 6, 148, 71, 6 - squarenote 5, 163, 49, 6 - squarenote 4, 147, 34, 6 - squarenote 8, 113, 1, 6 + 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_Ch7: - noisenote 15, 228, 60 - noisenote 10, 199, 76 - noisenote 10, 199, 60 - noisenote 12, 183, 76 - noisenote 15, 162, 92 + 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 diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index 67d8c45e..9773793c 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, 247, 128, 6 - squarenote 10, 230, 132, 6 - squarenote 15, 215, 144, 6 - squarenote 8, 213, 144, 6 - squarenote 6, 196, 136, 6 - squarenote 5, 211, 112, 6 - squarenote 4, 211, 96, 6 - squarenote 8, 193, 64, 6 + 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: dutycycle 5 - squarenote 15, 183, 65, 6 - squarenote 10, 150, 66, 6 - squarenote 15, 167, 81, 6 - squarenote 8, 165, 81, 6 - squarenote 6, 148, 71, 6 - squarenote 5, 163, 49, 6 - squarenote 4, 147, 34, 6 - squarenote 8, 113, 1, 6 + 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_Ch7: - noisenote 15, 228, 60 - noisenote 10, 199, 76 - noisenote 10, 199, 60 - noisenote 12, 183, 76 - noisenote 15, 162, 92 + 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 diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index 10f87daf..785f6e9b 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, 247, 128, 6 - squarenote 10, 230, 132, 6 - squarenote 15, 215, 144, 6 - squarenote 8, 213, 144, 6 - squarenote 6, 196, 136, 6 - squarenote 5, 211, 112, 6 - squarenote 4, 211, 96, 6 - squarenote 8, 193, 64, 6 + 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: dutycycle 5 - squarenote 15, 183, 65, 6 - squarenote 10, 150, 66, 6 - squarenote 15, 167, 81, 6 - squarenote 8, 165, 81, 6 - squarenote 6, 148, 71, 6 - squarenote 5, 163, 49, 6 - squarenote 4, 147, 34, 6 - squarenote 8, 113, 1, 6 + 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_Ch7: - noisenote 15, 228, 60 - noisenote 10, 199, 76 - noisenote 10, 199, 60 - noisenote 12, 183, 76 - noisenote 15, 162, 92 + 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 diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index 35de0e60..9733b0f5 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, 244, 64, 7 - squarenote 15, 227, 48, 7 - squarenote 4, 244, 64, 7 - squarenote 5, 179, 72, 7 - squarenote 8, 209, 80, 7 + 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: dutycycle 119 - squarenote 6, 195, 18, 7 - squarenote 15, 179, 4, 7 - squarenote 3, 195, 18, 7 - squarenote 4, 195, 33, 7 - squarenote 8, 177, 50, 7 + 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_Ch7: - noisenote 8, 214, 44 - noisenote 12, 198, 60 - noisenote 10, 182, 44 - noisenote 8, 145, 28 + noisenote 8, 13, 6, 44 + noisenote 12, 12, 6, 60 + noisenote 10, 11, 6, 44 + noisenote 8, 9, 1, 28 endchannel diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index cef33546..c38fa988 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, 244, 64, 7 - squarenote 15, 227, 48, 7 - squarenote 4, 244, 64, 7 - squarenote 5, 179, 72, 7 - squarenote 8, 209, 80, 7 + 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: dutycycle 119 - squarenote 6, 195, 18, 7 - squarenote 15, 179, 4, 7 - squarenote 3, 195, 18, 7 - squarenote 4, 195, 33, 7 - squarenote 8, 177, 50, 7 + 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_Ch7: - noisenote 8, 214, 44 - noisenote 12, 198, 60 - noisenote 10, 182, 44 - noisenote 8, 145, 28 + noisenote 8, 13, 6, 44 + noisenote 12, 12, 6, 60 + noisenote 10, 11, 6, 44 + noisenote 8, 9, 1, 28 endchannel diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index a21fd708..610fa04b 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, 244, 64, 7 - squarenote 15, 227, 48, 7 - squarenote 4, 244, 64, 7 - squarenote 5, 179, 72, 7 - squarenote 8, 209, 80, 7 + 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: dutycycle 119 - squarenote 6, 195, 18, 7 - squarenote 15, 179, 4, 7 - squarenote 3, 195, 18, 7 - squarenote 4, 195, 33, 7 - squarenote 8, 177, 50, 7 + 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_Ch7: - noisenote 8, 214, 44 - noisenote 12, 198, 60 - noisenote 10, 182, 44 - noisenote 8, 145, 28 + noisenote 8, 13, 6, 44 + noisenote 12, 12, 6, 60 + noisenote 10, 11, 6, 44 + noisenote 8, 9, 1, 28 endchannel diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index c7a39215..b4466ca7 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,7 +1,7 @@ SFX_Cut_1_Ch7: - noisenote 2, 247, 36 - noisenote 2, 247, 52 - noisenote 4, 247, 68 - noisenote 8, 244, 85 - noisenote 8, 241, 68 + 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 diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index 3e2746eb..ff7a0c4d 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,7 +1,7 @@ SFX_Cut_3_Ch7: - noisenote 2, 247, 36 - noisenote 2, 247, 52 - noisenote 4, 247, 68 - noisenote 8, 244, 85 - noisenote 8, 241, 68 + 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 diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm index 9d8a0841..81351836 100644 --- a/audio/sfx/cymbal1_1.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,3 +1,3 @@ SFX_Cymbal1_1_Ch7: - noisenote 0, 161, 16 + noisenote 0, 10, 1, 16 endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm index cc98561c..abae0e01 100644 --- a/audio/sfx/cymbal1_2.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,3 +1,3 @@ SFX_Cymbal1_2_Ch7: - noisenote 0, 161, 16 + noisenote 0, 10, 1, 16 endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm index 300e2971..f76df305 100644 --- a/audio/sfx/cymbal1_3.asm +++ b/audio/sfx/cymbal1_3.asm @@ -1,3 +1,3 @@ SFX_Cymbal1_3_Ch7: - noisenote 0, 161, 16 + noisenote 0, 10, 1, 16 endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm index 5de9ab16..da3ba376 100644 --- a/audio/sfx/cymbal2_1.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,3 +1,3 @@ SFX_Cymbal2_1_Ch7: - noisenote 0, 162, 17 + noisenote 0, 10, 2, 17 endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm index 33b904d4..c8fb1241 100644 --- a/audio/sfx/cymbal2_2.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,3 +1,3 @@ SFX_Cymbal2_2_Ch7: - noisenote 0, 162, 17 + noisenote 0, 10, 2, 17 endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm index 97d60589..b34236d0 100644 --- a/audio/sfx/cymbal2_3.asm +++ b/audio/sfx/cymbal2_3.asm @@ -1,3 +1,3 @@ SFX_Cymbal2_3_Ch7: - noisenote 0, 162, 17 + noisenote 0, 10, 2, 17 endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm index a788cca2..f9b8733e 100644 --- a/audio/sfx/cymbal3_1.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,3 +1,3 @@ SFX_Cymbal3_1_Ch7: - noisenote 0, 162, 80 + noisenote 0, 10, 2, 80 endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm index b67984c6..d80395a4 100644 --- a/audio/sfx/cymbal3_2.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,3 +1,3 @@ SFX_Cymbal3_2_Ch7: - noisenote 0, 162, 80 + noisenote 0, 10, 2, 80 endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm index 06b7f218..1a9a07e2 100644 --- a/audio/sfx/cymbal3_3.asm +++ b/audio/sfx/cymbal3_3.asm @@ -1,3 +1,3 @@ SFX_Cymbal3_3_Ch7: - noisenote 0, 162, 80 + noisenote 0, 10, 2, 80 endchannel diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index 525f9170..c96300fe 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,5 +1,5 @@ SFX_Damage_Ch7: - noisenote 2, 244, 68 - noisenote 2, 244, 20 - noisenote 15, 241, 50 + noisenote 2, 15, 4, 68 + noisenote 2, 15, 4, 20 + noisenote 15, 15, 1, 50 endchannel diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index 028785e9..b8dabd64 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, 240, 0, 5 + squarenote 4, 15, 0, 1280 pitchenvelope 0, 0 squarenote 4, 0, 0, 0 - squarenote 15, 240, 0, 5 + squarenote 15, 15, 0, 1280 squarenote 1, 0, 0, 0 endchannel SFX_Denied_1_Ch5: duty 3 - squarenote 4, 240, 1, 4 + squarenote 4, 15, 0, 1025 squarenote 4, 0, 0, 0 - squarenote 15, 240, 1, 4 + squarenote 15, 15, 0, 1025 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index c22854f4..0deb99eb 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, 240, 0, 5 + squarenote 4, 15, 0, 1280 pitchenvelope 0, 0 squarenote 4, 0, 0, 0 - squarenote 15, 240, 0, 5 + squarenote 15, 15, 0, 1280 squarenote 1, 0, 0, 0 endchannel SFX_Denied_3_Ch5: duty 3 - squarenote 4, 240, 1, 4 + squarenote 4, 15, 0, 1025 squarenote 4, 0, 0, 0 - squarenote 15, 240, 1, 4 + squarenote 15, 15, 0, 1025 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 6f1d1457..46039163 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, 240, 240, 4 + squarenote 15, 15, 0, 1264 pitchenvelope 1, 7 - squarenote 15, 242, 80, 6 + squarenote 15, 15, 2, 1616 pitchenvelope 0, 0 endchannel SFX_Dex_Page_Added_Ch5: duty 2 - squarenote 15, 146, 0, 6 - squarenote 15, 146, 130, 7 + squarenote 15, 9, 2, 1536 + squarenote 15, 9, 2, 1922 endchannel diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 732c9ac5..82262b2e 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ SFX_Doubleslap_Ch7: - noisenote 8, 241, 50 - noisenote 8, 241, 51 + noisenote 8, 15, 1, 50 + noisenote 8, 15, 1, 51 endchannel diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index 3d615458..dfae7edd 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, 240, 0, 7 + squarenote 6, 15, 0, 1792 squarenote 4, 0, 0, 0 - squarenote 6, 240, 0, 7 + squarenote 6, 15, 0, 1792 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index 7b6dc02e..e4372af9 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, 240, 0, 7 + squarenote 4, 15, 0, 1792 squarenote 4, 0, 0, 0 - squarenote 4, 240, 0, 7 + squarenote 4, 15, 0, 1792 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index 4fc24c9c..00e9c255 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, 242, 128, 7 + squarenote 15, 15, 2, 1920 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 6dd9b005..d866b588 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,11 +1,11 @@ SFX_Faint_Thud_Ch4: - squarenote 15, 209, 0, 2 + squarenote 15, 13, 1, 512 pitchenvelope 0, 0 endchannel SFX_Faint_Thud_Ch7: - noisenote 4, 245, 51 - noisenote 8, 244, 34 - noisenote 15, 242, 33 + noisenote 4, 15, 5, 51 + noisenote 8, 15, 4, 34 + noisenote 15, 15, 2, 33 endchannel diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index 76b0f2f3..567485a5 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,18 +1,18 @@ SFX_Fly_1_Ch7: - noisenote 2, 241, 18 - noisenote 2, 0, 0 - noisenote 2, 161, 18 - noisenote 2, 0, 0 - noisenote 2, 209, 18 - noisenote 2, 0, 0 - noisenote 2, 129, 18 - noisenote 2, 0, 0 - noisenote 2, 177, 18 - noisenote 2, 0, 0 - noisenote 2, 97, 18 - noisenote 2, 0, 0 - noisenote 2, 145, 18 - noisenote 2, 0, 0 - noisenote 2, 65, 18 - noisenote 2, 0, 0 + 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 diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index 5337f8d3..30076475 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,18 +1,18 @@ SFX_Fly_3_Ch7: - noisenote 2, 241, 18 - noisenote 2, 0, 0 - noisenote 2, 161, 18 - noisenote 2, 0, 0 - noisenote 2, 209, 18 - noisenote 2, 0, 0 - noisenote 2, 129, 18 - noisenote 2, 0, 0 - noisenote 2, 177, 18 - noisenote 2, 0, 0 - noisenote 2, 97, 18 - noisenote 2, 0, 0 - noisenote 2, 145, 18 - noisenote 2, 0, 0 - noisenote 2, 65, 18 - noisenote 2, 0, 0 + 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 diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index e3ce983e..f45c8399 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, 241, 68 - noisenote 8, 209, 67 + noisenote 9, 15, 1, 68 + noisenote 8, 13, 1, 67 endchannel diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm index 467dfe0d..cf69e4b7 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, 241, 68 - noisenote 8, 209, 67 + noisenote 9, 15, 1, 68 + noisenote 8, 13, 1, 67 endchannel diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index edf384e0..3156eba7 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, 241, 84 - noisenote 12, 113, 35 - noisenote 2, 177, 84 - noisenote 12, 97, 35 - noisenote 6, 65, 84 + 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 diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index 25284c5c..37952248 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, 241, 84 - noisenote 12, 113, 35 - noisenote 2, 177, 84 - noisenote 12, 97, 35 - noisenote 6, 65, 84 + 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 diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 35a0f647..656babad 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, 242, 0, 6 - squarenote 4, 242, 0, 6 + squarenote 4, 15, 2, 1536 + squarenote 4, 15, 2, 1536 pitchenvelope 1, 7 - squarenote 15, 242, 0, 6 + squarenote 15, 15, 2, 1536 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index e4fe0c9c..bb06b360 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, 242, 0, 6 - squarenote 4, 242, 0, 6 + squarenote 4, 15, 2, 1536 + squarenote 4, 15, 2, 1536 pitchenvelope 1, 7 - squarenote 15, 242, 0, 6 + squarenote 15, 15, 2, 1536 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index fb17a5f1..ff1b1304 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, 242, 0, 6 - squarenote 4, 242, 0, 6 + squarenote 4, 15, 2, 1536 + squarenote 4, 15, 2, 1536 pitchenvelope 1, 7 - squarenote 15, 242, 0, 6 + squarenote 15, 15, 2, 1536 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index ece6a473..1fdbdfea 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, 240, 240, 4 - squarenote 15, 242, 80, 6 + squarenote 15, 15, 0, 1264 + squarenote 15, 15, 2, 1616 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index 96adff71..befb3f01 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, 240, 240, 4 - squarenote 15, 242, 80, 6 + squarenote 15, 15, 0, 1264 + squarenote 15, 15, 2, 1616 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index b9f5817b..ba4d6739 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, 240, 240, 4 - squarenote 15, 242, 80, 6 + squarenote 15, 15, 0, 1264 + squarenote 15, 15, 2, 1616 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index 3bcaf4c4..095f7b7a 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, 242, 0, 5 + squarenote 4, 15, 2, 1280 pitchenvelope 2, 2 - squarenote 2, 241, 0, 5 + squarenote 2, 15, 1, 1280 pitchenvelope 0, 0 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index 3ac6a514..a0501d8f 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, 242, 0, 5 + squarenote 4, 15, 2, 1280 pitchenvelope 2, 2 - squarenote 2, 241, 0, 5 + squarenote 2, 15, 1, 1280 pitchenvelope 0, 0 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index 6eccae73..6f126626 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,6 +1,6 @@ SFX_Horn_Drill_Ch7: - noisenote 3, 146, 49 - noisenote 3, 178, 50 - noisenote 3, 194, 51 - noisenote 8, 241, 84 + noisenote 3, 9, 2, 49 + noisenote 3, 11, 2, 50 + noisenote 3, 12, 2, 51 + noisenote 8, 15, 1, 84 endchannel diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 79b2c019..41a4db84 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ SFX_Intro_Crash_Ch7: - noisenote 2, 210, 50 - noisenote 15, 242, 67 + noisenote 2, 13, 2, 50 + noisenote 15, 15, 2, 67 endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index cc394d5c..09af056f 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, 194, 64, 7 + squarenote 12, 12, 2, 1856 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 45829561..7dec29ae 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, 194, 128, 6 + squarenote 12, 12, 2, 1664 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index c7b4d3ee..ecdd9428 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,10 +1,10 @@ SFX_Intro_Lunge_Ch7: - noisenote 6, 32, 16 - noisenote 6, 47, 64 - noisenote 6, 79, 65 - noisenote 6, 143, 65 - noisenote 6, 207, 66 - noisenote 8, 215, 66 - noisenote 15, 231, 67 - noisenote 15, 242, 67 + 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 diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index f9c5b278..c972283d 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,5 +1,5 @@ SFX_Intro_Raise_Ch7: - noisenote 2, 111, 33 - noisenote 2, 175, 49 - noisenote 15, 242, 65 + noisenote 2, 6, -7, 33 + noisenote 2, 10, -7, 49 + noisenote 15, 15, 2, 65 endchannel diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index 93e6b7bc..647fcbd2 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,7 +1,7 @@ SFX_Intro_Whoosh_Ch7: - noisenote 4, 44, 32 - noisenote 3, 160, 32 - noisenote 3, 176, 33 - noisenote 3, 192, 34 - noisenote 15, 210, 36 + 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 diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index d70043fa..0b2b478f 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, 242, 0, 4 + squarenote 15, 15, 2, 1024 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index 858aad9c..29b055a9 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, 242, 0, 4 + squarenote 15, 15, 2, 1024 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm index b6b0f7ab..aa7787ff 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, 161, 24 - noisenote 0, 49, 51 + noisenote 0, 10, 1, 24 + noisenote 0, 3, 1, 51 endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm index 60b6c43a..8b0cbde3 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, 161, 24 - noisenote 0, 49, 51 + noisenote 0, 10, 1, 24 + noisenote 0, 3, 1, 51 endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm index 9657aadf..7487c98f 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, 161, 24 - noisenote 0, 49, 51 + noisenote 0, 10, 1, 24 + noisenote 0, 3, 1, 51 endchannel diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm index efadfbc4..cca5a93e 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, 145, 34 + noisenote 0, 9, 1, 34 endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm index 9483d633..e33c7837 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, 145, 34 + noisenote 0, 9, 1, 34 endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm index e287b461..d53965e4 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, 145, 34 + noisenote 0, 9, 1, 34 endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm index 95802909..1140a92b 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, 113, 34 + noisenote 0, 7, 1, 34 endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm index 7f39ca62..4e5eff53 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, 113, 34 + noisenote 0, 7, 1, 34 endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm index 7c11a20f..d11099b5 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, 113, 34 + noisenote 0, 7, 1, 34 endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm index 31f2399b..aac775e4 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, 97, 34 + noisenote 0, 6, 1, 34 endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm index d658dd4c..8cc7e02e 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, 97, 34 + noisenote 0, 6, 1, 34 endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm index 6ba03ff5..fcc7455b 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, 97, 34 + noisenote 0, 6, 1, 34 endchannel diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 1847daa6..2220bf03 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, 143, 85 - noisenote 2, 244, 68 - noisenote 8, 244, 34 - noisenote 15, 242, 33 + noisenote 4, 8, -7, 85 + noisenote 2, 15, 4, 68 + noisenote 8, 15, 4, 34 + noisenote 15, 15, 2, 33 endchannel diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index 23970df5..c52ce4d0 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ SFX_Peck_Ch7: - noisenote 2, 161, 18 + noisenote 2, 10, 1, 18 endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index d669912d..8deaafe5 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, 242, 0, 6 + squarenote 4, 15, 2, 1536 loopchannel 4, SFX_Poisoned_1_Ch4 - squarenote 15, 243, 0, 6 + squarenote 15, 15, 3, 1536 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index c0811adc..a66aaf7a 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, 242, 0, 6 + squarenote 4, 15, 2, 1536 loopchannel 4, SFX_Poisoned_3_Ch4 - squarenote 15, 243, 0, 6 + squarenote 15, 15, 3, 1536 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index 93f17c72..3aee5836 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ SFX_Pound_Ch7: - noisenote 2, 161, 34 + noisenote 2, 10, 1, 34 endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index 3d40cab3..bfc9635b 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, 145, 192, 7 - squarenote 0, 129, 208, 7 - squarenote 0, 145, 192, 7 - squarenote 12, 161, 208, 7 + squarenote 0, 9, 1, 1984 + squarenote 0, 8, 1, 2000 + squarenote 0, 9, 1, 1984 + squarenote 12, 10, 1, 2000 endchannel diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index a3f14b74..9ad03c67 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, 145, 192, 7 - squarenote 0, 129, 208, 7 - squarenote 0, 145, 192, 7 - squarenote 12, 161, 208, 7 + squarenote 0, 9, 1, 1984 + squarenote 0, 8, 1, 2000 + squarenote 0, 9, 1, 1984 + squarenote 12, 10, 1, 2000 endchannel diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 01cf9b92..67306cbe 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, 145, 192, 7 - squarenote 0, 129, 208, 7 - squarenote 0, 145, 192, 7 - squarenote 12, 161, 208, 7 + squarenote 0, 9, 1, 1984 + squarenote 0, 8, 1, 2000 + squarenote 0, 9, 1, 1984 + squarenote 12, 10, 1, 2000 endchannel diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index c49ebcb5..71c7119b 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,25 +1,25 @@ SFX_Psybeam_Ch4: dutycycle 161 - squarenote 10, 241, 64, 6 - squarenote 10, 243, 128, 6 - squarenote 10, 242, 32, 6 + squarenote 10, 15, 1, 1600 + squarenote 10, 15, 3, 1664 + squarenote 10, 15, 2, 1568 loopchannel 4, SFX_Psybeam_Ch4 - squarenote 10, 241, 64, 6 + squarenote 10, 15, 1, 1600 endchannel SFX_Psybeam_Ch5: dutycycle 179 - squarenote 10, 243, 113, 5 - squarenote 7, 227, 49, 5 - squarenote 10, 241, 81, 5 + squarenote 10, 15, 3, 1393 + squarenote 7, 14, 3, 1329 + squarenote 10, 15, 1, 1361 loopchannel 4, SFX_Psybeam_Ch5 - squarenote 10, 241, 113, 5 + squarenote 10, 15, 1, 1393 endchannel SFX_Psybeam_Ch7: - noisenote 2, 209, 74 - noisenote 2, 210, 42 + noisenote 2, 13, 1, 74 + noisenote 2, 13, 2, 42 loopchannel 21, SFX_Psybeam_Ch7 endchannel diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index 55bb3d25..a9cd5ec3 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, 196, 189, 7 - squarenote 8, 196, 190, 7 - squarenote 8, 196, 191, 7 - squarenote 8, 196, 192, 7 - squarenote 15, 196, 193, 7 - squarenote 15, 242, 192, 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 2 - squarenote 8, 196, 112, 7 - squarenote 8, 196, 97, 7 - squarenote 8, 196, 98, 7 - squarenote 8, 196, 99, 7 - squarenote 15, 196, 100, 7 - squarenote 15, 242, 100, 7 + 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_Ch7: - noisenote 15, 63, 20 - noisenote 15, 207, 19 - noisenote 15, 207, 18 - noisenote 15, 207, 17 - noisenote 15, 207, 16 - noisenote 15, 194, 16 + 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 diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index f1b3799a..bb8c3cce 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, 225, 0, 7 - squarenote 8, 242, 224, 7 + squarenote 4, 14, 1, 1792 + squarenote 8, 15, 2, 2016 endchannel SFX_Purchase_1_Ch5: duty 2 - squarenote 1, 8, 0, 0 - squarenote 4, 145, 193, 6 - squarenote 8, 162, 161, 7 + squarenote 1, 0, 8, 0 + squarenote 4, 9, 1, 1729 + squarenote 8, 10, 2, 1953 endchannel diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index b8a5660f..454e6f83 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, 225, 0, 7 - squarenote 8, 242, 224, 7 + squarenote 4, 14, 1, 1792 + squarenote 8, 15, 2, 2016 endchannel SFX_Purchase_3_Ch5: duty 2 - squarenote 1, 8, 0, 0 - squarenote 4, 145, 193, 6 - squarenote 8, 162, 161, 7 + squarenote 1, 0, 8, 0 + squarenote 4, 9, 1, 1729 + squarenote 8, 10, 2, 1953 endchannel diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index c2d778fa..bf7bf116 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, 162, 35 - noisenote 8, 241, 52 - noisenote 15, 0, 0 - noisenote 2, 247, 36 - noisenote 2, 247, 52 - noisenote 4, 247, 68 - noisenote 8, 244, 85 - noisenote 8, 241, 68 + 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 diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index 9a263a9e..f554da55 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, 162, 35 - noisenote 8, 241, 52 - noisenote 15, 0, 0 - noisenote 2, 247, 36 - noisenote 2, 247, 52 - noisenote 4, 247, 68 - noisenote 8, 244, 85 - noisenote 8, 241, 68 + 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 diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index e05fb675..b59ceefa 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,13 +1,13 @@ SFX_Run_Ch7: - noisenote 2, 97, 35 - noisenote 2, 161, 51 - noisenote 2, 193, 51 - noisenote 2, 81, 17 - noisenote 2, 241, 51 - noisenote 2, 65, 17 - noisenote 2, 193, 51 - noisenote 2, 49, 17 - noisenote 2, 129, 51 - noisenote 2, 49, 17 - noisenote 8, 65, 51 + 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 diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index 6c302b11..5692b0d6 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, 243, 48, 7 - squarenote 8, 101, 48, 7 - squarenote 15, 244, 0, 7 - squarenote 15, 116, 0, 7 - squarenote 15, 68, 0, 7 - squarenote 15, 36, 0, 7 + 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 diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index 900c89c1..07702b4d 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, 244, 0, 7 - squarenote 2, 228, 0, 6 - squarenote 2, 228, 128, 6 - squarenote 2, 228, 192, 6 - squarenote 2, 228, 0, 7 - squarenote 2, 228, 160, 7 - squarenote 15, 242, 224, 7 + 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 2 - squarenote 4, 8, 0, 0 - squarenote 2, 212, 1, 7 - squarenote 2, 196, 1, 6 - squarenote 2, 196, 129, 6 - squarenote 2, 196, 193, 6 - squarenote 2, 196, 1, 7 - squarenote 2, 196, 161, 7 - squarenote 15, 210, 225, 7 + 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 diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index 0f237fd1..eda54e9e 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,17 +1,17 @@ SFX_Save_3_Ch4: duty 2 IF DEF(_RED) - squarenote 4, 244, 0, 7 - squarenote 3, 228, 128, 6 - squarenote 3, 228, 192, 6 - squarenote 3, 228, 0, 7 - squarenote 2, 228, 160, 7 + 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 ELSE - squarenote 3, 228, 0, 6 - squarenote 3, 228, 128, 6 - squarenote 3, 228, 192, 6 - squarenote 3, 228, 0, 7 - squarenote 15, 242, 224, 7 + 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 ENDC endchannel @@ -19,18 +19,18 @@ ENDC SFX_Save_3_Ch5: duty 2 IF DEF(_RED) - squarenote 4, 8, 0, 0 - squarenote 3, 212, 1, 7 - squarenote 3, 196, 129, 6 - squarenote 3, 196, 193, 6 - squarenote 3, 196, 1, 7 - squarenote 2, 196, 161, 7 + 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 ELSE - squarenote 3, 8, 0, 0 - squarenote 3, 196, 1, 6 - squarenote 3, 196, 129, 6 - squarenote 3, 196, 193, 6 - squarenote 3, 196, 1, 7 - squarenote 15, 210, 225, 7 + 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 ENDC endchannel diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index 36e77f45..fbd158fd 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, 64, 224, 7 - squarenote 4, 96, 224, 7 - squarenote 4, 128, 224, 7 - squarenote 8, 160, 224, 7 - squarenote 8, 160, 224, 7 - squarenote 8, 128, 224, 7 - squarenote 8, 96, 224, 7 - squarenote 8, 48, 224, 7 - squarenote 15, 18, 224, 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 diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index 8a2fb1d0..df1fb338 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, 215, 0, 6 - squarenote 15, 183, 128, 5 - squarenote 15, 135, 0, 5 - squarenote 15, 71, 128, 4 - squarenote 15, 23, 0, 4 + 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 diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index 0256c6c9..37a8b572 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, 215, 0, 6 - squarenote 15, 183, 128, 5 - squarenote 15, 135, 0, 5 - squarenote 15, 71, 128, 4 - squarenote 15, 23, 0, 4 + 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 diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index b685abbe..94914320 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, 210, 0, 7 - squarenote 0, 210, 64, 7 - squarenote 0, 210, 128, 7 - squarenote 0, 210, 192, 7 - squarenote 10, 225, 224, 7 + 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 diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index 632003b8..df897225 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, 225, 0, 7 - squarenote 2, 225, 128, 7 - squarenote 15, 241, 192, 7 + squarenote 5, 14, 1, 1792 + squarenote 2, 14, 1, 1920 + squarenote 15, 15, 1, 1984 endchannel SFX_Slots_New_Spin_Ch5: duty 2 - squarenote 4, 193, 193, 6 - squarenote 2, 193, 65, 7 - squarenote 15, 209, 129, 7 + squarenote 4, 12, 1, 1729 + squarenote 2, 12, 1, 1857 + squarenote 15, 13, 1, 1921 endchannel diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index 2322c34a..b82db160 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, 241, 0, 7 - squarenote 8, 129, 224, 7 + squarenote 2, 15, 1, 1792 + squarenote 8, 8, 1, 2016 endchannel diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index 0548600b..6c462c16 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, 242, 160, 6 - squarenote 1, 242, 224, 6 - squarenote 8, 241, 0, 7 + squarenote 1, 15, 2, 1696 + squarenote 1, 15, 2, 1760 + squarenote 8, 15, 1, 1792 endchannel diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm index ea06a573..999b91dc 100644 --- a/audio/sfx/snare1_1.asm +++ b/audio/sfx/snare1_1.asm @@ -1,3 +1,3 @@ SFX_Snare1_1_Ch7: - noisenote 0, 193, 51 + noisenote 0, 12, 1, 51 endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm index 3ac1095d..994ff3de 100644 --- a/audio/sfx/snare1_2.asm +++ b/audio/sfx/snare1_2.asm @@ -1,3 +1,3 @@ SFX_Snare1_2_Ch7: - noisenote 0, 193, 51 + noisenote 0, 12, 1, 51 endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm index 66344d64..87f4e817 100644 --- a/audio/sfx/snare1_3.asm +++ b/audio/sfx/snare1_3.asm @@ -1,3 +1,3 @@ SFX_Snare1_3_Ch7: - noisenote 0, 193, 51 + noisenote 0, 12, 1, 51 endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm index 7852f823..6a9e5cd9 100644 --- a/audio/sfx/snare2_1.asm +++ b/audio/sfx/snare2_1.asm @@ -1,3 +1,3 @@ SFX_Snare2_1_Ch7: - noisenote 0, 177, 51 + noisenote 0, 11, 1, 51 endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm index 0ddeff47..e8f7c5f9 100644 --- a/audio/sfx/snare2_2.asm +++ b/audio/sfx/snare2_2.asm @@ -1,3 +1,3 @@ SFX_Snare2_2_Ch7: - noisenote 0, 177, 51 + noisenote 0, 11, 1, 51 endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm index 4e77c1dc..9775a6e9 100644 --- a/audio/sfx/snare2_3.asm +++ b/audio/sfx/snare2_3.asm @@ -1,3 +1,3 @@ SFX_Snare2_3_Ch7: - noisenote 0, 177, 51 + noisenote 0, 11, 1, 51 endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm index 787f5da5..215eaec4 100644 --- a/audio/sfx/snare3_1.asm +++ b/audio/sfx/snare3_1.asm @@ -1,3 +1,3 @@ SFX_Snare3_1_Ch7: - noisenote 0, 161, 51 + noisenote 0, 10, 1, 51 endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm index 136e99db..18a301b5 100644 --- a/audio/sfx/snare3_2.asm +++ b/audio/sfx/snare3_2.asm @@ -1,3 +1,3 @@ SFX_Snare3_2_Ch7: - noisenote 0, 161, 51 + noisenote 0, 10, 1, 51 endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm index d0aaacbf..decd3ab6 100644 --- a/audio/sfx/snare3_3.asm +++ b/audio/sfx/snare3_3.asm @@ -1,3 +1,3 @@ SFX_Snare3_3_Ch7: - noisenote 0, 161, 51 + noisenote 0, 10, 1, 51 endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm index 31ca4d90..3cf12af2 100644 --- a/audio/sfx/snare4_1.asm +++ b/audio/sfx/snare4_1.asm @@ -1,3 +1,3 @@ SFX_Snare4_1_Ch7: - noisenote 0, 129, 51 + noisenote 0, 8, 1, 51 endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm index ad0cb156..f97fab11 100644 --- a/audio/sfx/snare4_2.asm +++ b/audio/sfx/snare4_2.asm @@ -1,3 +1,3 @@ SFX_Snare4_2_Ch7: - noisenote 0, 129, 51 + noisenote 0, 8, 1, 51 endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm index a8f5b7e0..57b70600 100644 --- a/audio/sfx/snare4_3.asm +++ b/audio/sfx/snare4_3.asm @@ -1,3 +1,3 @@ SFX_Snare4_3_Ch7: - noisenote 0, 129, 51 + noisenote 0, 8, 1, 51 endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm index 346c3e4b..deb1bc43 100644 --- a/audio/sfx/snare5_1.asm +++ b/audio/sfx/snare5_1.asm @@ -1,8 +1,8 @@ SFX_Snare5_1_Ch7: - noisenote 7, 132, 55 - noisenote 6, 132, 54 - noisenote 5, 131, 53 - noisenote 4, 131, 52 - noisenote 3, 130, 51 - noisenote 2, 129, 50 + 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 diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm index 91fd2abe..5c45259b 100644 --- a/audio/sfx/snare5_2.asm +++ b/audio/sfx/snare5_2.asm @@ -1,8 +1,8 @@ SFX_Snare5_2_Ch7: - noisenote 7, 132, 55 - noisenote 6, 132, 54 - noisenote 5, 131, 53 - noisenote 4, 131, 52 - noisenote 3, 130, 51 - noisenote 2, 129, 50 + 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 diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm index 3e0a546d..22836d10 100644 --- a/audio/sfx/snare5_3.asm +++ b/audio/sfx/snare5_3.asm @@ -1,8 +1,8 @@ SFX_Snare5_3_Ch7: - noisenote 7, 132, 55 - noisenote 6, 132, 54 - noisenote 5, 131, 53 - noisenote 4, 131, 52 - noisenote 3, 130, 51 - noisenote 2, 129, 50 + 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 diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm index 982a9d73..5ed7338f 100644 --- a/audio/sfx/snare6_1.asm +++ b/audio/sfx/snare6_1.asm @@ -1,3 +1,3 @@ SFX_Snare6_1_Ch7: - noisenote 0, 129, 16 + noisenote 0, 8, 1, 16 endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm index 0aaf6148..dc7b6f34 100644 --- a/audio/sfx/snare6_2.asm +++ b/audio/sfx/snare6_2.asm @@ -1,3 +1,3 @@ SFX_Snare6_2_Ch7: - noisenote 0, 129, 16 + noisenote 0, 8, 1, 16 endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm index f021de95..4d061316 100644 --- a/audio/sfx/snare6_3.asm +++ b/audio/sfx/snare6_3.asm @@ -1,3 +1,3 @@ SFX_Snare6_3_Ch7: - noisenote 0, 129, 16 + noisenote 0, 8, 1, 16 endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm index a0c5768f..993a35de 100644 --- a/audio/sfx/snare7_1.asm +++ b/audio/sfx/snare7_1.asm @@ -1,3 +1,3 @@ SFX_Snare7_1_Ch7: - noisenote 0, 130, 35 + noisenote 0, 8, 2, 35 endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm index cdd18567..46ed89a5 100644 --- a/audio/sfx/snare7_2.asm +++ b/audio/sfx/snare7_2.asm @@ -1,3 +1,3 @@ SFX_Snare7_2_Ch7: - noisenote 0, 130, 35 + noisenote 0, 8, 2, 35 endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm index f1db9012..663fdf0c 100644 --- a/audio/sfx/snare7_3.asm +++ b/audio/sfx/snare7_3.asm @@ -1,3 +1,3 @@ SFX_Snare7_3_Ch7: - noisenote 0, 130, 35 + noisenote 0, 8, 2, 35 endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm index 3c657ab8..0c64b371 100644 --- a/audio/sfx/snare8_1.asm +++ b/audio/sfx/snare8_1.asm @@ -1,3 +1,3 @@ SFX_Snare8_1_Ch7: - noisenote 0, 130, 37 + noisenote 0, 8, 2, 37 endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm index b0d7a66a..88ece7c2 100644 --- a/audio/sfx/snare8_2.asm +++ b/audio/sfx/snare8_2.asm @@ -1,3 +1,3 @@ SFX_Snare8_2_Ch7: - noisenote 0, 130, 37 + noisenote 0, 8, 2, 37 endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm index 51ab3ecb..9abaa56e 100644 --- a/audio/sfx/snare8_3.asm +++ b/audio/sfx/snare8_3.asm @@ -1,3 +1,3 @@ SFX_Snare8_3_Ch7: - noisenote 0, 130, 37 + noisenote 0, 8, 2, 37 endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm index 1468fc0e..58bfca9a 100644 --- a/audio/sfx/snare9_1.asm +++ b/audio/sfx/snare9_1.asm @@ -1,3 +1,3 @@ SFX_Snare9_1_Ch7: - noisenote 0, 130, 38 + noisenote 0, 8, 2, 38 endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm index 78b01295..b8f43254 100644 --- a/audio/sfx/snare9_2.asm +++ b/audio/sfx/snare9_2.asm @@ -1,3 +1,3 @@ SFX_Snare9_2_Ch7: - noisenote 0, 130, 38 + noisenote 0, 8, 2, 38 endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm index aa56c84a..001ed29f 100644 --- a/audio/sfx/snare9_3.asm +++ b/audio/sfx/snare9_3.asm @@ -1,3 +1,3 @@ SFX_Snare9_3_Ch7: - noisenote 0, 130, 38 + noisenote 0, 8, 2, 38 endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index b84c1c83..d2c57bc3 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, 240, 0, 5 + squarenote 15, 15, 0, 1280 squarenote 4, 0, 0, 0 - squarenote 15, 240, 0, 5 - squarenote 15, 240, 0, 5 - squarenote 15, 240, 0, 5 - squarenote 15, 240, 0, 5 - squarenote 15, 242, 0, 5 + 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 3 - squarenote 15, 240, 130, 4 + squarenote 15, 15, 0, 1154 squarenote 4, 0, 0, 0 - squarenote 15, 240, 130, 4 - squarenote 15, 240, 130, 4 - squarenote 15, 240, 130, 4 - squarenote 15, 240, 130, 4 - squarenote 15, 242, 130, 4 + 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 diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index 35bcff9d..3672d3d5 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, 240, 0, 5 + squarenote 15, 15, 0, 1280 squarenote 4, 0, 0, 0 - squarenote 15, 240, 0, 5 - squarenote 15, 240, 0, 5 - squarenote 15, 240, 0, 5 - squarenote 15, 240, 0, 5 - squarenote 15, 242, 0, 5 + 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 3 - squarenote 15, 240, 130, 4 + squarenote 15, 15, 0, 1154 squarenote 4, 0, 0, 0 - squarenote 15, 240, 130, 4 - squarenote 15, 240, 130, 4 - squarenote 15, 240, 130, 4 - squarenote 15, 240, 130, 4 - squarenote 15, 242, 130, 4 + 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 diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index 5d71ea86..84c28d8a 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, 226, 51 - noisenote 8, 225, 34 + noisenote 1, 14, 2, 51 + noisenote 8, 14, 1, 34 endchannel diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm index 3ab45794..a9689acf 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, 226, 51 - noisenote 8, 225, 34 + noisenote 1, 14, 2, 51 + noisenote 8, 14, 1, 34 endchannel diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm index 5bf74e70..f437a4c3 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, 226, 51 - noisenote 8, 225, 34 + noisenote 1, 14, 2, 51 + noisenote 8, 14, 1, 34 endchannel diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index 4fb99e7c..ebc1e0b7 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ SFX_Super_Effective_Ch7: - noisenote 4, 241, 52 - noisenote 15, 242, 100 + noisenote 4, 15, 1, 52 + noisenote 15, 15, 2, 100 endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index cc7da7c4..d200f3b8 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, 225, 64, 7 + squarenote 8, 14, 1, 1856 endchannel SFX_Swap_1_Ch5: duty 2 - squarenote 2, 8, 0, 0 - squarenote 8, 177, 65, 7 + squarenote 2, 0, 8, 0 + squarenote 8, 11, 1, 1857 endchannel diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 788bbc11..04d795b6 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, 225, 64, 7 + squarenote 8, 14, 1, 1856 endchannel SFX_Swap_3_Ch5: duty 2 - squarenote 2, 8, 0, 0 - squarenote 8, 177, 65, 7 + squarenote 2, 0, 8, 0 + squarenote 8, 11, 1, 1857 endchannel diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index eba35ca8..76f64e04 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, 241, 128, 6 + squarenote 2, 15, 1, 1664 squarenote 1, 0, 0, 0 - squarenote 4, 241, 128, 7 + squarenote 4, 15, 1, 1920 squarenote 4, 0, 0, 0 endchannel diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index 4031c68b..0663b2ed 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, 241, 128, 6 + squarenote 2, 15, 1, 1664 squarenote 1, 0, 0, 0 - squarenote 4, 241, 128, 7 + squarenote 4, 15, 1, 1920 squarenote 4, 0, 0, 0 endchannel diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index c18d5af9..fd94c086 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, 215, 0, 7 - squarenote 15, 183, 128, 6 - squarenote 15, 135, 0, 6 - squarenote 15, 71, 128, 5 - squarenote 15, 23, 0, 5 + 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 diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index d1d26cfb..d7f8f076 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, 215, 0, 7 - squarenote 15, 183, 128, 6 - squarenote 15, 135, 0, 6 - squarenote 15, 71, 128, 5 - squarenote 15, 23, 0, 5 + 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 diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index 07cb9ca6..b0d61646 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, 241, 50 - noisenote 2, 0, 0 - noisenote 2, 241, 34 - noisenote 1, 0, 0 + noisenote 2, 15, 1, 50 + noisenote 2, 0, 0, 0 + noisenote 2, 15, 1, 34 + noisenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index cfeebf12..cc883000 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, 241, 50 - noisenote 2, 0, 0 - noisenote 2, 241, 34 - noisenote 1, 0, 0 + noisenote 2, 15, 1, 50 + noisenote 2, 0, 0, 0 + noisenote 2, 15, 1, 34 + noisenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index 6276139b..dd986dca 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, 215, 0, 5 - squarenote 15, 183, 128, 5 - squarenote 15, 135, 0, 6 - squarenote 15, 71, 128, 6 - squarenote 15, 23, 0, 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 diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index e1af7fd2..e3460ad2 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, 215, 0, 5 - squarenote 15, 183, 128, 5 - squarenote 15, 135, 0, 6 - squarenote 15, 71, 128, 6 - squarenote 15, 23, 0, 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 diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index dc952152..47d7c88b 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, 210, 0, 5 + squarenote 15, 13, 2, 1280 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index 74c5ed99..dccc1d3c 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, 210, 0, 5 + squarenote 15, 13, 2, 1280 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index 1959cc5d..8884a204 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, 242, 0, 2 + squarenote 4, 15, 2, 512 pitchenvelope 2, 2 - squarenote 8, 226, 0, 2 + squarenote 8, 14, 2, 512 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index 99fc105b..f1cc705d 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, 242, 0, 2 + squarenote 4, 15, 2, 512 pitchenvelope 2, 2 - squarenote 8, 226, 0, 2 + squarenote 8, 14, 2, 512 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index e586402f..43d32f5b 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, 242, 0, 2 + squarenote 4, 15, 2, 512 pitchenvelope 2, 2 - squarenote 8, 226, 0, 2 + squarenote 8, 14, 2, 512 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 90be65db..97c6d007 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, 240, 240, 4 - squarenote 15, 242, 80, 6 + squarenote 15, 15, 0, 1264 + squarenote 15, 15, 2, 1616 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index f814056e..26e58263 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, 240, 240, 4 - squarenote 15, 242, 80, 6 + squarenote 15, 15, 0, 1264 + squarenote 15, 15, 2, 1616 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm index 3817adec..f4d08545 100644 --- a/audio/sfx/triangle1_1.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,3 +1,3 @@ SFX_Triangle1_1_Ch7: - noisenote 0, 81, 42 + noisenote 0, 5, 1, 42 endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm index cac270ab..0517ba84 100644 --- a/audio/sfx/triangle1_2.asm +++ b/audio/sfx/triangle1_2.asm @@ -1,3 +1,3 @@ SFX_Triangle1_2_Ch7: - noisenote 0, 81, 42 + noisenote 0, 5, 1, 42 endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm index a0cd81b2..1979b3f9 100644 --- a/audio/sfx/triangle1_3.asm +++ b/audio/sfx/triangle1_3.asm @@ -1,3 +1,3 @@ SFX_Triangle1_3_Ch7: - noisenote 0, 81, 42 + noisenote 0, 5, 1, 42 endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm index 1a6c4ca5..aa6b472e 100644 --- a/audio/sfx/triangle2_1.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,4 +1,4 @@ SFX_Triangle2_1_Ch7: - noisenote 1, 65, 43 - noisenote 0, 97, 42 + noisenote 1, 4, 1, 43 + noisenote 0, 6, 1, 42 endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm index 48fc2086..b9f31022 100644 --- a/audio/sfx/triangle2_2.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,4 +1,4 @@ SFX_Triangle2_2_Ch7: - noisenote 1, 65, 43 - noisenote 0, 97, 42 + noisenote 1, 4, 1, 43 + noisenote 0, 6, 1, 42 endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm index d3c98bad..61dcb880 100644 --- a/audio/sfx/triangle2_3.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,4 +1,4 @@ SFX_Triangle2_3_Ch7: - noisenote 1, 65, 43 - noisenote 0, 97, 42 + noisenote 1, 4, 1, 43 + noisenote 0, 6, 1, 42 endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm index 172c4141..13700a11 100644 --- a/audio/sfx/triangle3_1.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,4 +1,4 @@ SFX_Triangle3_1_Ch7: - noisenote 2, 145, 40 - noisenote 0, 113, 24 + noisenote 2, 9, 1, 40 + noisenote 0, 7, 1, 24 endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm index f2ba1804..5555fc40 100644 --- a/audio/sfx/triangle3_2.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,4 +1,4 @@ SFX_Triangle3_2_Ch7: - noisenote 2, 145, 40 - noisenote 0, 113, 24 + noisenote 2, 9, 1, 40 + noisenote 0, 7, 1, 24 endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm index 654d9e0d..1237c952 100644 --- a/audio/sfx/triangle3_3.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,4 +1,4 @@ SFX_Triangle3_3_Ch7: - noisenote 2, 145, 40 - noisenote 0, 113, 24 + noisenote 2, 9, 1, 40 + noisenote 0, 7, 1, 24 endchannel diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index 2203d40a..ad4ad076 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, 240, 0, 6 - squarenote 4, 240, 0, 4 - squarenote 4, 240, 0, 2 + squarenote 4, 15, 0, 1536 + squarenote 4, 15, 0, 1024 + squarenote 4, 15, 0, 512 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index ba079c05..842d6b9e 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, 240, 0, 6 - squarenote 4, 240, 0, 4 - squarenote 4, 240, 0, 2 + squarenote 4, 15, 0, 1536 + squarenote 4, 15, 0, 1024 + squarenote 4, 15, 0, 512 squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index 39e992b3..6b84b7f3 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, 242, 192, 7 + squarenote 15, 15, 2, 1984 squarenote 15, 0, 0, 0 - squarenote 3, 161, 128, 7 - squarenote 3, 161, 0, 7 - squarenote 3, 161, 64, 7 - squarenote 3, 161, 0, 7 - squarenote 3, 161, 128, 7 - squarenote 3, 161, 0, 7 - squarenote 3, 161, 192, 7 - squarenote 8, 161, 0, 7 + 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 diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index e7500dc9..281f4567 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, 242, 192, 7 + squarenote 15, 15, 2, 1984 squarenote 15, 0, 0, 0 squarenote 15, 0, 0, 0 - squarenote 3, 129, 128, 7 - squarenote 3, 129, 0, 7 - squarenote 3, 129, 64, 7 - squarenote 3, 129, 0, 7 - squarenote 3, 129, 128, 7 - squarenote 3, 129, 0, 7 - squarenote 3, 129, 192, 7 - squarenote 3, 129, 0, 7 + 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 diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index 9d1886cf..e805a333 100644 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,31 +1,31 @@ -SFX_02_unused_Ch4: +SFX_Unused_1_Ch4: dutycycle 240 - squarenote 15, 224, 128, 7 - squarenote 15, 240, 132, 7 - squarenote 15, 195, 224, 5 - squarenote 15, 196, 0, 6 - squarenote 10, 108, 128, 7 - squarenote 8, 113, 132, 7 + 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_02_unused_Ch5: +SFX_Unused_1_Ch5: dutycycle 5 - squarenote 15, 160, 65, 7 - squarenote 15, 176, 67, 7 - squarenote 15, 147, 177, 5 - squarenote 15, 148, 193, 5 - squarenote 10, 76, 65, 7 - squarenote 8, 49, 70, 7 + 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_02_unused_Ch7: - noisenote 2, 242, 76 - noisenote 6, 224, 58 - noisenote 15, 208, 58 - noisenote 8, 208, 44 - noisenote 6, 230, 76 - noisenote 12, 125, 76 - noisenote 15, 211, 76 +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 diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index cf793ec3..fb86989c 100644 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,31 +1,31 @@ -SFX_08_unused_Ch4: +SFX_Unused_2_Ch4: dutycycle 240 - squarenote 15, 224, 128, 7 - squarenote 15, 240, 132, 7 - squarenote 15, 195, 224, 5 - squarenote 15, 196, 0, 6 - squarenote 10, 108, 128, 7 - squarenote 8, 113, 132, 7 + 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_08_unused_Ch5: +SFX_Unused_2_Ch5: dutycycle 5 - squarenote 15, 160, 65, 7 - squarenote 15, 176, 67, 7 - squarenote 15, 147, 177, 5 - squarenote 15, 148, 193, 5 - squarenote 10, 76, 65, 7 - squarenote 8, 49, 70, 7 + 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_08_unused_Ch7: - noisenote 2, 242, 76 - noisenote 6, 224, 58 - noisenote 15, 208, 58 - noisenote 8, 208, 44 - noisenote 6, 230, 76 - noisenote 12, 125, 76 - noisenote 15, 211, 76 +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 diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index b849f5fd..30d8e534 100644 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,31 +1,31 @@ -SFX_1f_unused_Ch4: +SFX_Unused_3_Ch4: dutycycle 240 - squarenote 15, 224, 128, 7 - squarenote 15, 240, 132, 7 - squarenote 15, 195, 224, 5 - squarenote 15, 196, 0, 6 - squarenote 10, 108, 128, 7 - squarenote 8, 113, 132, 7 + 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_1f_unused_Ch5: +SFX_Unused_3_Ch5: dutycycle 5 - squarenote 15, 160, 65, 7 - squarenote 15, 176, 67, 7 - squarenote 15, 147, 177, 5 - squarenote 15, 148, 193, 5 - squarenote 10, 76, 65, 7 - squarenote 8, 49, 70, 7 + 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_1f_unused_Ch7: - noisenote 2, 242, 76 - noisenote 6, 224, 58 - noisenote 15, 208, 58 - noisenote 8, 208, 44 - noisenote 6, 230, 76 - noisenote 12, 125, 76 - noisenote 15, 211, 76 +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 diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index 84845db8..7699d841 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,10 +1,10 @@ SFX_Vine_Whip_Ch7: - noisenote 1, 194, 51 - noisenote 2, 242, 33 - noisenote 1, 226, 51 - noisenote 1, 194, 50 - noisenote 1, 146, 18 - noisenote 1, 178, 49 - noisenote 12, 145, 16 - noisenote 8, 242, 65 + 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 diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index 14b1e66f..fe1daefb 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, 242, 0, 5 + squarenote 4, 15, 2, 1280 pitchenvelope 2, 2 - squarenote 4, 226, 0, 5 + squarenote 4, 14, 2, 1280 pitchenvelope 3, -2 - squarenote 4, 242, 0, 7 + squarenote 4, 15, 2, 1792 pitchenvelope 2, 2 - squarenote 15, 226, 0, 7 + squarenote 15, 14, 2, 1792 pitchenvelope 0, 0 endchannel diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index b6dc4a7d..3ed89f24 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, 242, 0, 5 + squarenote 4, 15, 2, 1280 pitchenvelope 2, 2 - squarenote 4, 226, 0, 5 + squarenote 4, 14, 2, 1280 pitchenvelope 3, -2 - squarenote 4, 242, 0, 7 + squarenote 4, 15, 2, 1792 pitchenvelope 2, 2 - squarenote 15, 226, 0, 7 + squarenote 15, 14, 2, 1792 pitchenvelope 0, 0 endchannel diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index 8195a04d..6d7b45c8 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -40,17 +40,26 @@ pitchenvelope: MACRO ENDC ENDM +;format: duty, volume, volume change, pitch squarenote: MACRO db $20 | \1 - db \2 - db \3 - db \4 + IF \3 < 0 + db (\2 << 4) | (%1000 | (\3 * -1)) + ELSE + db (\2 << 4) | \3 + ENDC + dw \4 ENDM +;format: duty, volume, volume change, pitch noisenote: MACRO db $20 | \1 - db \2 - db \3 + IF \3 < 0 + db (\2 << 4) | (%1000 | (\3 * -1)) + ELSE + db (\2 << 4) | \3 + ENDC + db \4 ENDM ;format: pitch length (in 16ths) |