diff options
Diffstat (limited to 'audio/sfx')
323 files changed, 627 insertions, 627 deletions
diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index 6cbfdb16..c14be83e 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,10 +1,10 @@ -SFX_59_1_Ch1: ; 841b (2:441b) +SFX_59_1_Ch1: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_59_1_Ch2: ; 8422 (2:4422) +SFX_59_1_Ch2: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 9c808359..3b817f2f 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -1,10 +1,10 @@ -SFX_59_3_Ch1: ; 7c404 (1f:4404) +SFX_59_3_Ch1: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_59_3_Ch2: ; 7c40b (1f:440b) +SFX_59_3_Ch2: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index 172907a8..6c3959c9 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,4 +1,4 @@ -SFX_Arrow_Tiles_1_Ch1: ; 8649 (2:4649) +SFX_Arrow_Tiles_1_Ch1: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index fd225a5f..8ff79858 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,4 +1,4 @@ -SFX_Arrow_Tiles_3_Ch1: ; 7c626 (1f:4626) +SFX_Arrow_Tiles_3_Ch1: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 46fb2a07..6cd9701b 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,4 +1,4 @@ -SFX_Ball_Poof_Ch1: ; 2043d (8:443d) +SFX_Ball_Poof_Ch1: duty 2 unknownsfx0x10 22 unknownsfx0x20 15, 242, 0, 4 @@ -6,6 +6,6 @@ SFX_Ball_Poof_Ch1: ; 2043d (8:443d) endchannel -SFX_Ball_Poof_Ch2: ; 20448 (8:4448) +SFX_Ball_Poof_Ch2: unknownnoise0x20 15, 162, 34 endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index fc9f81cc..49176db3 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ -SFX_Ball_Toss_Ch1: ; 2042d (8:442d) +SFX_Ball_Toss_Ch1: duty 2 unknownsfx0x10 47 unknownsfx0x20 15, 242, 128, 7 endchannel -SFX_Ball_Toss_Ch2: ; 20436 (8:4436) +SFX_Ball_Toss_Ch2: duty 2 unknownsfx0x20 15, 194, 130, 7 endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 19e9b9e7..8b92fc50 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,4 +1,4 @@ -SFX_Battle_09_Ch1: ; 204b9 (8:44b9) +SFX_Battle_09_Ch1: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 5 diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index 1a7e17ec..27909666 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ -SFX_Battle_0B_Ch1: ; 204c8 (8:44c8) +SFX_Battle_0B_Ch1: unknownnoise0x20 8, 241, 84 endchannel diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index b2fdf455..7aa009ba 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,4 +1,4 @@ -SFX_Battle_0C_Ch1: ; 204cc (8:44cc) +SFX_Battle_0C_Ch1: unknownnoise0x20 15, 143, 17 unknownnoise0x20 4, 255, 18 unknownnoise0x20 10, 241, 85 diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index c70b281d..1b69e13f 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,4 +1,4 @@ -SFX_Battle_0D_Ch1: ; 204d6 (8:44d6) +SFX_Battle_0D_Ch1: unknownnoise0x20 15, 143, 52 unknownnoise0x20 8, 242, 53 unknownnoise0x20 10, 241, 85 diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index 20c20628..ff60cb9e 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ -SFX_Battle_0E_Ch1: ; 204e0 (8:44e0) +SFX_Battle_0E_Ch1: unknownnoise0x20 15, 159, 35 unknownnoise0x20 8, 241, 33 endchannel diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index d84aed37..3827a5a6 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,4 +1,4 @@ -SFX_Battle_0F_Ch1: ; 204e7 (8:44e7) +SFX_Battle_0F_Ch1: unknownnoise0x20 2, 225, 75 unknownnoise0x20 10, 241, 68 unknownnoise0x20 2, 225, 58 diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 324ce9b9..7d301053 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,4 +1,4 @@ -SFX_Battle_12_Ch1: ; 2050b (8:450b) +SFX_Battle_12_Ch1: unknownnoise0x20 8, 79, 35 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 74349bb5..89b8c555 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,4 +1,4 @@ -SFX_Battle_13_Ch1: ; 20519 (8:4519) +SFX_Battle_13_Ch1: unknownnoise0x20 8, 79, 51 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index 82234904..acc064f7 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,4 +1,4 @@ -SFX_Battle_14_Ch1: ; 20526 (8:4526) +SFX_Battle_14_Ch1: unknownnoise0x20 8, 255, 50 unknownnoise0x20 8, 244, 67 unknownnoise0x20 8, 242, 84 diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index a2b5031e..3aa31247 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,4 +1,4 @@ -SFX_Battle_16_Ch1: ; 2054c (8:454c) +SFX_Battle_16_Ch1: unknownnoise0x20 1, 148, 35 unknownnoise0x20 1, 180, 34 unknownnoise0x20 8, 241, 68 diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index 4be1d96b..2ff4bd6d 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,4 +1,4 @@ -SFX_Battle_17_Ch1: ; 20556 (8:4556) +SFX_Battle_17_Ch1: unknownnoise0x20 2, 148, 51 unknownnoise0x20 4, 180, 34 unknownnoise0x20 4, 241, 68 diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index 6c201d38..81fa2178 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ -SFX_Battle_18_Ch1: ; 20563 (8:4563) +SFX_Battle_18_Ch1: unknownnoise0x20 4, 255, 85 unknownnoise0x20 8, 241, 101 endchannel diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 6b54f8cd..9981f5e4 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,4 +1,4 @@ -SFX_Battle_19_Ch1: ; 2056a (8:456a) +SFX_Battle_19_Ch1: unknownnoise0x20 2, 132, 67 unknownnoise0x20 2, 196, 34 unknownnoise0x20 8, 242, 52 diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index 3bb451d5..9f89e449 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ -SFX_Battle_1B_Ch1: ; 2057b (8:457b) +SFX_Battle_1B_Ch1: unknownnoise0x20 2, 241, 34 unknownnoise0x20 15, 242, 18 endchannel diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index 579e36cc..3827b34c 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,4 +1,4 @@ -SFX_Battle_1C_Ch1: ; 20582 (8:4582) +SFX_Battle_1C_Ch1: unknownnoise0x20 2, 194, 1 unknownnoise0x20 15, 244, 1 unknownnoise0x20 15, 242, 1 diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index df556540..f4e9bdc8 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,4 +1,4 @@ -SFX_Battle_1E_Ch1: ; 20593 (8:4593) +SFX_Battle_1E_Ch1: duty 0 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 @@ -8,7 +8,7 @@ SFX_Battle_1E_Ch1: ; 20593 (8:4593) endchannel -SFX_Battle_1E_Ch2: ; 205a4 (8:45a4) +SFX_Battle_1E_Ch2: unknownnoise0x20 0, 209, 66 unknownnoise0x20 4, 161, 50 unknownnoise0x20 0, 209, 34 diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index 142030ee..e8a4d9f3 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ -SFX_Battle_20_Ch1: ; 205be (8:45be) +SFX_Battle_20_Ch1: unknownnoise0x20 12, 241, 84 unknownnoise0x20 8, 241, 100 endchannel diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index 10ad350e..b59f5833 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,4 +1,4 @@ -SFX_Battle_21_Ch1: ; 205c5 (8:45c5) +SFX_Battle_21_Ch1: unknownnoise0x20 2, 241, 51 unknownnoise0x20 2, 193, 50 unknownnoise0x20 2, 161, 49 diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index c6b0d972..66cd218d 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ -SFX_Battle_22_Ch1: ; 205d5 (8:45d5) +SFX_Battle_22_Ch1: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index 474e43b6..7203dcf2 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,4 +1,4 @@ -SFX_Battle_23_Ch1: ; 205dc (8:45dc) +SFX_Battle_23_Ch1: unknownnoise0x20 2, 242, 67 unknownnoise0x20 4, 181, 50 unknownnoise0x20 9, 134, 49 diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 4fea9cf9..7c81b40b 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,4 +1,4 @@ -SFX_Battle_24_Ch1: ; 205ec (8:45ec) +SFX_Battle_24_Ch1: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_24_Ch1: ; 205ec (8:45ec) endchannel -SFX_Battle_24_Ch2: ; 205f7 (8:45f7) +SFX_Battle_24_Ch2: unknownnoise0x20 15, 63, 34 unknownnoise0x20 15, 242, 33 endchannel diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index 18a70f45..b1f4fc54 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,4 +1,4 @@ -SFX_Battle_25_Ch1: ; 205fe (8:45fe) +SFX_Battle_25_Ch1: unknownnoise0x20 15, 79, 65 unknownnoise0x20 8, 143, 65 unknownnoise0x20 8, 207, 65 diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index 943078e1..c656264b 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,4 +1,4 @@ -SFX_Battle_26_Ch1: ; 2060e (8:460e) +SFX_Battle_26_Ch1: unknownnoise0x20 10, 255, 80 unknownnoise0x20 15, 255, 81 unknownnoise0x20 8, 242, 81 diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index ddd4e452..af86c33f 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,4 +1,4 @@ -SFX_Battle_27_Ch1: ; 20624 (8:4624) +SFX_Battle_27_Ch1: duty 2 unknownsfx0x20 15, 63, 192, 7 @@ -9,7 +9,7 @@ SFX_Battle_27_branch_2062a: endchannel -SFX_Battle_27_Ch2: ; 20637 (8:4637) +SFX_Battle_27_Ch2: dutycycle 179 unknownsfx0x20 15, 47, 200, 7 @@ -20,7 +20,7 @@ SFX_Battle_27_branch_2063d: endchannel -SFX_Battle_27_Ch3: ; 2064a (8:464a) +SFX_Battle_27_Ch3: unknownnoise0x20 3, 151, 18 unknownnoise0x20 3, 161, 17 loopchannel 10, SFX_Battle_27_Ch3 diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index 73855179..1c974e85 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,4 +1,4 @@ -SFX_Battle_28_Ch1: ; 20655 (8:4655) +SFX_Battle_28_Ch1: duty 0 unknownsfx0x20 0, 241, 192, 7 unknownsfx0x20 0, 241, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_28_Ch1: ; 20655 (8:4655) endchannel -SFX_Battle_28_Ch2: ; 20664 (8:4664) +SFX_Battle_28_Ch2: dutycycle 179 unknownsfx0x20 0, 225, 193, 7 unknownsfx0x20 0, 225, 1, 7 @@ -14,7 +14,7 @@ SFX_Battle_28_Ch2: ; 20664 (8:4664) endchannel -SFX_Battle_28_Ch3: ; 20673 (8:4673) +SFX_Battle_28_Ch3: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 loopchannel 6, SFX_Battle_28_Ch3 diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index e766a453..d0abb3cb 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,4 +1,4 @@ -SFX_Battle_29_Ch1: ; 2067e (8:467e) +SFX_Battle_29_Ch1: dutycycle 201 unknownsfx0x20 11, 243, 32, 1 unknownsfx0x20 9, 211, 80, 1 @@ -8,7 +8,7 @@ SFX_Battle_29_Ch1: ; 2067e (8:467e) endchannel -SFX_Battle_29_Ch2: ; 20695 (8:4695) +SFX_Battle_29_Ch2: unknownnoise0x20 10, 243, 53 unknownnoise0x20 14, 246, 69 loopchannel 4, SFX_Battle_29_Ch2 diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index d7334aae..ab01bf85 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,4 +1,4 @@ -SFX_Battle_2A_Ch1: ; 206a9 (8:46a9) +SFX_Battle_2A_Ch1: dutycycle 57 unknownsfx0x20 4, 244, 0, 6 unknownsfx0x20 3, 196, 0, 5 @@ -9,7 +9,7 @@ SFX_Battle_2A_Ch1: ; 206a9 (8:46a9) endchannel -SFX_Battle_2A_Ch2: ; 206c4 (8:46c4) +SFX_Battle_2A_Ch2: dutycycle 141 unknownsfx0x20 5, 228, 224, 5 unknownsfx0x20 4, 180, 224, 4 @@ -19,7 +19,7 @@ SFX_Battle_2A_Ch2: ; 206c4 (8:46c4) endchannel -SFX_Battle_2A_Ch3: ; 206db (8:46db) +SFX_Battle_2A_Ch3: unknownnoise0x20 5, 195, 51 unknownnoise0x20 3, 146, 67 unknownnoise0x20 10, 181, 51 diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index 276627c3..6eddfa76 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,4 +1,4 @@ -SFX_Battle_2B_Ch1: ; 206ec (8:46ec) +SFX_Battle_2B_Ch1: dutycycle 210 unknownsfx0x20 3, 129, 0, 3 unknownsfx0x20 3, 193, 0, 4 @@ -10,7 +10,7 @@ SFX_Battle_2B_Ch1: ; 206ec (8:46ec) endchannel -SFX_Battle_2B_Ch2: ; 2070b (8:470b) +SFX_Battle_2B_Ch2: unknownnoise0x20 3, 98, 34 unknownnoise0x20 3, 162, 50 unknownnoise0x20 3, 210, 51 diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index 22b902f1..9cd9bd16 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,4 +1,4 @@ -SFX_Battle_2C_Ch1: ; 20722 (8:4722) +SFX_Battle_2C_Ch1: dutycycle 57 unknownsfx0x20 15, 244, 0, 5 unknownsfx0x20 15, 196, 0, 4 @@ -7,7 +7,7 @@ SFX_Battle_2C_Ch1: ; 20722 (8:4722) endchannel -SFX_Battle_2C_Ch2: ; 20735 (8:4735) +SFX_Battle_2C_Ch2: dutycycle 141 unknownsfx0x20 7, 228, 48, 4 unknownsfx0x20 15, 180, 48, 3 @@ -16,7 +16,7 @@ SFX_Battle_2C_Ch2: ; 20735 (8:4735) endchannel -SFX_Battle_2C_Ch3: ; 20748 (8:4748) +SFX_Battle_2C_Ch3: unknownnoise0x20 9, 244, 68 unknownnoise0x20 9, 242, 67 unknownnoise0x20 15, 244, 66 diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index 91dda605..a0841ccf 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,4 +1,4 @@ -SFX_Battle_2E_Ch1: ; 20792 (8:4792) +SFX_Battle_2E_Ch1: duty 0 unknownsfx0x20 2, 241, 0, 2 unknownsfx0x20 3, 241, 0, 7 @@ -8,7 +8,7 @@ SFX_Battle_2E_Ch1: ; 20792 (8:4792) endchannel -SFX_Battle_2E_Ch2: ; 207a9 (8:47a9) +SFX_Battle_2E_Ch2: dutycycle 179 unknownsfx0x20 2, 225, 2, 3 unknownsfx0x20 3, 225, 242, 7 @@ -18,7 +18,7 @@ SFX_Battle_2E_Ch2: ; 207a9 (8:47a9) endchannel -SFX_Battle_2E_Ch3: ; 207c0 (8:47c0) +SFX_Battle_2E_Ch3: unknownnoise0x20 2, 211, 16 unknownnoise0x20 3, 211, 17 unknownnoise0x20 2, 210, 16 diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index 4b1d9b2c..ad607993 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,4 +1,4 @@ -SFX_Battle_2F_Ch1: ; 207d1 (8:47d1) +SFX_Battle_2F_Ch1: dutycycle 43 unknownsfx0x20 3, 241, 240, 7 unknownsfx0x20 4, 242, 0, 2 @@ -6,7 +6,7 @@ SFX_Battle_2F_Ch1: ; 207d1 (8:47d1) endchannel -SFX_Battle_2F_Ch2: ; 207e0 (8:47e0) +SFX_Battle_2F_Ch2: dutycycle 179 unknownsfx0x20 4, 226, 2, 2 unknownsfx0x20 4, 225, 226, 7 @@ -14,7 +14,7 @@ SFX_Battle_2F_Ch2: ; 207e0 (8:47e0) endchannel -SFX_Battle_2F_Ch3: ; 207ef (8:47ef) +SFX_Battle_2F_Ch3: unknownnoise0x20 4, 255, 67 unknownnoise0x20 4, 242, 68 loopchannel 9, SFX_Battle_2F_Ch3 diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index 5d3e2e40..c88cc476 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,4 +1,4 @@ -SFX_Battle_31_Ch1: ; 20847 (8:4847) +SFX_Battle_31_Ch1: duty 2 unknownsfx0x20 15, 255, 224, 7 unknownsfx0x20 15, 255, 224, 7 @@ -8,7 +8,7 @@ SFX_Battle_31_Ch1: ; 20847 (8:4847) endchannel -SFX_Battle_31_Ch2: ; 2085e (8:485e) +SFX_Battle_31_Ch2: duty 3 unknownsfx0x20 15, 255, 226, 7 unknownsfx0x20 15, 255, 225, 7 diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index c949fb5b..a85d4334 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,4 +1,4 @@ -SFX_Battle_32_Ch1: ; 20875 (8:4875) +SFX_Battle_32_Ch1: duty 2 unknownsfx0x10 175 unknownsfx0x20 8, 241, 0, 7 @@ -6,7 +6,7 @@ SFX_Battle_32_Ch1: ; 20875 (8:4875) endchannel -SFX_Battle_32_Ch2: ; 20880 (8:4880) +SFX_Battle_32_Ch2: duty 3 unknownsfx0x20 8, 241, 1, 7 endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index 8b2bd17d..25b1ee42 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,4 +1,4 @@ -SFX_Battle_33_Ch1: ; 20887 (8:4887) +SFX_Battle_33_Ch1: duty 2 unknownsfx0x20 6, 241, 0, 5 unknownsfx0x20 6, 241, 128, 5 @@ -8,7 +8,7 @@ SFX_Battle_33_Ch1: ; 20887 (8:4887) endchannel -SFX_Battle_33_Ch2: ; 2089e (8:489e) +SFX_Battle_33_Ch2: duty 3 unknownsfx0x20 6, 225, 16, 5 unknownsfx0x20 6, 225, 144, 5 diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index ac80eeea..14718916 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,4 +1,4 @@ -SFX_Battle_34_Ch1: ; 208b5 (8:48b5) +SFX_Battle_34_Ch1: dutycycle 237 unknownsfx0x20 8, 255, 248, 3 unknownsfx0x20 15, 255, 0, 4 @@ -6,7 +6,7 @@ SFX_Battle_34_Ch1: ; 208b5 (8:48b5) endchannel -SFX_Battle_34_Ch2: ; 208c4 (8:48c4) +SFX_Battle_34_Ch2: dutycycle 180 unknownsfx0x20 8, 239, 192, 3 unknownsfx0x20 15, 239, 192, 3 @@ -14,7 +14,7 @@ SFX_Battle_34_Ch2: ; 208c4 (8:48c4) endchannel -SFX_Battle_34_Ch3: ; 208d3 (8:48d3) +SFX_Battle_34_Ch3: unknownnoise0x20 4, 255, 81 unknownnoise0x20 8, 255, 84 unknownnoise0x20 15, 255, 85 diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm index 7e64aca9..2fe57bc4 100644 --- a/audio/sfx/battle_35.asm +++ b/audio/sfx/battle_35.asm @@ -1,4 +1,4 @@ -SFX_Battle_35_Ch1: ; 208e0 (8:48e0) +SFX_Battle_35_Ch1: executemusic vibrato 10, 2, 4 duty 2 @@ -13,7 +13,7 @@ SFX_Battle_35_Ch1: ; 208e0 (8:48e0) endchannel -SFX_Battle_35_Ch2: ; 208f0 (8:48f0) +SFX_Battle_35_Ch2: executemusic vibrato 10, 2, 3 duty 2 diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index f878a1c8..dcf9c56e 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,4 +1,4 @@ -SFX_Battle_36_Ch1: ; 20902 (8:4902) +SFX_Battle_36_Ch1: duty 0 unknownsfx0x20 2, 241, 128, 7 unknownsfx0x20 2, 241, 0, 7 @@ -20,7 +20,7 @@ SFX_Battle_36_branch_20930: endchannel -SFX_Battle_36_Ch2: ; 20941 (8:4941) +SFX_Battle_36_Ch2: dutycycle 179 unknownsfx0x20 2, 241, 129, 7 unknownsfx0x20 2, 241, 1, 7 @@ -40,7 +40,7 @@ SFX_Battle_36_Ch2: ; 20941 (8:4941) endchannel -SFX_Battle_36_Ch3: ; 20980 (8:4980) +SFX_Battle_36_Ch3: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 loopchannel 26, SFX_Battle_36_Ch3 diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm index d841f57a..d4f3e858 100644 --- a/audio/sfx/caught_mon.asm +++ b/audio/sfx/caught_mon.asm @@ -1,4 +1,4 @@ -SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13) +SFX_Caught_Mon_Ch1: executemusic tempo 256 volume 7, 7 @@ -22,7 +22,7 @@ SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13) endchannel -SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e) +SFX_Caught_Mon_Ch2: executemusic duty 2 notetype 6, 12, 2 @@ -44,7 +44,7 @@ SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e) endchannel -SFX_Caught_Mon_Ch3: ; 23a44 (8:7a44) +SFX_Caught_Mon_Ch3: executemusic notetype 6, 1, 0 octave 4 diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index 4b9c4a7e..7a45bdf4 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,4 +1,4 @@ -SFX_Collision_1_Ch1: ; 8447 (2:4447) +SFX_Collision_1_Ch1: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 18806c1f..601670d5 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,4 +1,4 @@ -SFX_Collision_3_Ch1: ; 7c430 (1f:4430) +SFX_Collision_3_Ch1: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index f29e29ab..4fc82294 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,4 +1,4 @@ -SFX_Cry00_1_Ch1: ; 8987 (2:4987) +SFX_Cry00_1_Ch1: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_1_Ch1: ; 8987 (2:4987) endchannel -SFX_Cry00_1_Ch2: ; 8996 (2:4996) +SFX_Cry00_1_Ch2: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_1_Ch2: ; 8996 (2:4996) endchannel -SFX_Cry00_1_Ch3: ; 89a5 (2:49a5) +SFX_Cry00_1_Ch3: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index fa069f18..ccce6943 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,4 +1,4 @@ -SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f) +SFX_Cry00_2_Ch1: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f) endchannel -SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e) +SFX_Cry00_2_Ch2: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e) endchannel -SFX_Cry00_2_Ch3: ; 20c4d (8:4c4d) +SFX_Cry00_2_Ch3: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index bdeadab5..9b8b6fda 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,4 +1,4 @@ -SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc) +SFX_Cry00_3_Ch1: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc) endchannel -SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b) +SFX_Cry00_3_Ch2: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,7 +14,7 @@ SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b) endchannel -SFX_Cry00_3_Ch3: ; 7ca1a (1f:4a1a) +SFX_Cry00_3_Ch3: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index 835d41f7..d684af6f 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,4 +1,4 @@ -SFX_Cry01_1_Ch1: ; 8b97 (2:4b97) +SFX_Cry01_1_Ch1: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_1_Ch1: ; 8b97 (2:4b97) endchannel -SFX_Cry01_1_Ch2: ; 8baa (2:4baa) +SFX_Cry01_1_Ch2: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_1_Ch2: ; 8baa (2:4baa) endchannel -SFX_Cry01_1_Ch3: ; 8bbd (2:4bbd) +SFX_Cry01_1_Ch3: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index bcafa873..0e1030e1 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,4 +1,4 @@ -SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f) +SFX_Cry01_2_Ch1: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f) endchannel -SFX_Cry01_2_Ch2: ; 20e52 (8:4e52) +SFX_Cry01_2_Ch2: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_2_Ch2: ; 20e52 (8:4e52) endchannel -SFX_Cry01_2_Ch3: ; 20e65 (8:4e65) +SFX_Cry01_2_Ch3: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index 1a31c7ca..be084d7e 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,4 +1,4 @@ -SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c) +SFX_Cry01_3_Ch1: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c) endchannel -SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f) +SFX_Cry01_3_Ch2: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,7 +16,7 @@ SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f) endchannel -SFX_Cry01_3_Ch3: ; 7cc32 (1f:4c32) +SFX_Cry01_3_Ch3: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index 97cff95e..d4b520c9 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,4 +1,4 @@ -SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c) +SFX_Cry02_1_Ch1: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c) endchannel -SFX_Cry02_1_Ch2: ; 8b1b (2:4b1b) +SFX_Cry02_1_Ch2: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_1_Ch3: ; 8b29 (2:4b29) +SFX_Cry02_1_Ch3: endchannel diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index 7d67fc4a..526e8c48 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,4 +1,4 @@ -SFX_Cry02_2_Ch1: ; 20db4 (8:4db4) +SFX_Cry02_2_Ch1: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_2_Ch1: ; 20db4 (8:4db4) endchannel -SFX_Cry02_2_Ch2: ; 20dc3 (8:4dc3) +SFX_Cry02_2_Ch2: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_2_Ch3: ; 20dd1 (8:4dd1) +SFX_Cry02_2_Ch3: endchannel diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 604d084a..2366ff97 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,4 +1,4 @@ -SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81) +SFX_Cry02_3_Ch1: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,12 +6,12 @@ SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81) endchannel -SFX_Cry02_3_Ch2: ; 7cb90 (1f:4b90) +SFX_Cry02_3_Ch2: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_Cry02_3_Ch3: ; 7cb9e (1f:4b9e) +SFX_Cry02_3_Ch3: endchannel diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 42f2c5d3..72ea5d38 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,4 +1,4 @@ -SFX_Cry03_1_Ch1: ; 88a6 (2:48a6) +SFX_Cry03_1_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_1_Ch1: ; 88a6 (2:48a6) endchannel -SFX_Cry03_1_Ch2: ; 88c5 (2:48c5) +SFX_Cry03_1_Ch2: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_1_Ch2: ; 88c5 (2:48c5) endchannel -SFX_Cry03_1_Ch3: ; 88e4 (2:48e4) +SFX_Cry03_1_Ch3: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index 92dab482..de043909 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,4 +1,4 @@ -SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e) +SFX_Cry03_2_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e) endchannel -SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d) +SFX_Cry03_2_Ch2: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d) endchannel -SFX_Cry03_2_Ch3: ; 20b8c (8:4b8c) +SFX_Cry03_2_Ch3: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index 0161b820..467745f9 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,4 +1,4 @@ -SFX_Cry03_3_Ch1: ; 7c91b (1f:491b) +SFX_Cry03_3_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_Cry03_3_Ch1: ; 7c91b (1f:491b) endchannel -SFX_Cry03_3_Ch2: ; 7c93a (1f:493a) +SFX_Cry03_3_Ch2: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,7 +22,7 @@ SFX_Cry03_3_Ch2: ; 7c93a (1f:493a) endchannel -SFX_Cry03_3_Ch3: ; 7c959 (1f:4959) +SFX_Cry03_3_Ch3: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index c80a6bd9..2c34f1c6 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,4 +1,4 @@ -SFX_Cry04_1_Ch1: ; 8c55 (2:4c55) +SFX_Cry04_1_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_1_Ch1: ; 8c55 (2:4c55) endchannel -SFX_Cry04_1_Ch2: ; 8c74 (2:4c74) +SFX_Cry04_1_Ch2: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_1_Ch2: ; 8c74 (2:4c74) endchannel -SFX_Cry04_1_Ch3: ; 8c93 (2:4c93) +SFX_Cry04_1_Ch3: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index dcd866da..38bfbf63 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,4 +1,4 @@ -SFX_Cry04_2_Ch1: ; 20efd (8:4efd) +SFX_Cry04_2_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_2_Ch1: ; 20efd (8:4efd) endchannel -SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c) +SFX_Cry04_2_Ch2: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c) endchannel -SFX_Cry04_2_Ch3: ; 20f3b (8:4f3b) +SFX_Cry04_2_Ch3: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index 5d8c6df9..bd73c271 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,4 +1,4 @@ -SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca) +SFX_Cry04_3_Ch1: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca) endchannel -SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9) +SFX_Cry04_3_Ch2: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9) endchannel -SFX_Cry04_3_Ch3: ; 7cd08 (1f:4d08) +SFX_Cry04_3_Ch3: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index 891cc50e..8de5bf02 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,4 +1,4 @@ -SFX_Cry05_1_Ch1: ; 8a35 (2:4a35) +SFX_Cry05_1_Ch1: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_1_Ch1: ; 8a35 (2:4a35) endchannel -SFX_Cry05_1_Ch2: ; 8a48 (2:4a48) +SFX_Cry05_1_Ch2: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_1_Ch2: ; 8a48 (2:4a48) unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_1_Ch3: ; 8a5a (2:4a5a) +SFX_Cry05_1_Ch3: endchannel diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index 98df4c1d..28879677 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,4 +1,4 @@ -SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd) +SFX_Cry05_2_Ch1: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd) endchannel -SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0) +SFX_Cry05_2_Ch2: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0) unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_2_Ch3: ; 20d02 (8:4d02) +SFX_Cry05_2_Ch3: endchannel diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index a7f88abf..261492af 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,4 +1,4 @@ -SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa) +SFX_Cry05_3_Ch1: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa) endchannel -SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd) +SFX_Cry05_3_Ch2: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,5 +15,5 @@ SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd) unknownsfx0x20 8, 129, 193, 4 -SFX_Cry05_3_Ch3: ; 7cacf (1f:4acf) +SFX_Cry05_3_Ch3: endchannel diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index b26004e2..e171b025 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,4 +1,4 @@ -SFX_Cry06_1_Ch1: ; 89df (2:49df) +SFX_Cry06_1_Ch1: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_1_Ch1: ; 89df (2:49df) unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_1_Ch2: ; 89f9 (2:49f9) +SFX_Cry06_1_Ch2: endchannel -SFX_Cry06_1_Ch3: ; 89fa (2:49fa) +SFX_Cry06_1_Ch3: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 283c1360..5e6e9e6a 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,4 +1,4 @@ -SFX_Cry06_2_Ch1: ; 20c87 (8:4c87) +SFX_Cry06_2_Ch1: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_2_Ch1: ; 20c87 (8:4c87) unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_2_Ch2: ; 20ca1 (8:4ca1) +SFX_Cry06_2_Ch2: endchannel -SFX_Cry06_2_Ch3: ; 20ca2 (8:4ca2) +SFX_Cry06_2_Ch3: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index 9feecc3b..5d2994f1 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,4 +1,4 @@ -SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54) +SFX_Cry06_3_Ch1: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54) unknownsfx0x20 15, 66, 7, 2 -SFX_Cry06_3_Ch2: ; 7ca6e (1f:4a6e) +SFX_Cry06_3_Ch2: endchannel -SFX_Cry06_3_Ch3: ; 7ca6f (1f:4a6f) +SFX_Cry06_3_Ch3: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index b1346b94..e48a50a2 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,4 +1,4 @@ -SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d) +SFX_Cry07_1_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d) endchannel -SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c) +SFX_Cry07_1_Ch2: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c) endchannel -SFX_Cry07_1_Ch3: ; 8a2b (2:4a2b) +SFX_Cry07_1_Ch3: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index 075b7139..ab902a30 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,4 +1,4 @@ -SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5) +SFX_Cry07_2_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5) endchannel -SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4) +SFX_Cry07_2_Ch2: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4) endchannel -SFX_Cry07_2_Ch3: ; 20cd3 (8:4cd3) +SFX_Cry07_2_Ch3: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index 4955e115..40fad544 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,4 +1,4 @@ -SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82) +SFX_Cry07_3_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82) endchannel -SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91) +SFX_Cry07_3_Ch2: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,7 +14,7 @@ SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91) endchannel -SFX_Cry07_3_Ch3: ; 7caa0 (1f:4aa0) +SFX_Cry07_3_Ch3: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 65131766..6ec5ca3c 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,4 +1,4 @@ -SFX_Cry08_1_Ch1: ; 8c25 (2:4c25) +SFX_Cry08_1_Ch1: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_1_Ch1: ; 8c25 (2:4c25) endchannel -SFX_Cry08_1_Ch2: ; 8c38 (2:4c38) +SFX_Cry08_1_Ch2: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_1_Ch2: ; 8c38 (2:4c38) endchannel -SFX_Cry08_1_Ch3: ; 8c4b (2:4c4b) +SFX_Cry08_1_Ch3: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 71a0e205..9c154b1c 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,4 +1,4 @@ -SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd) +SFX_Cry08_2_Ch1: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd) endchannel -SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0) +SFX_Cry08_2_Ch2: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0) endchannel -SFX_Cry08_2_Ch3: ; 20ef3 (8:4ef3) +SFX_Cry08_2_Ch3: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index bfda8c3d..95fea40e 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,4 +1,4 @@ -SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a) +SFX_Cry08_3_Ch1: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a) endchannel -SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad) +SFX_Cry08_3_Ch2: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,7 +16,7 @@ SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad) endchannel -SFX_Cry08_3_Ch3: ; 7ccc0 (1f:4cc0) +SFX_Cry08_3_Ch3: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index 29dffdb6..46aae33c 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,4 +1,4 @@ -SFX_Cry09_1_Ch1: ; 872f (2:472f) +SFX_Cry09_1_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_1_Ch1: ; 872f (2:472f) endchannel -SFX_Cry09_1_Ch2: ; 874c (2:474c) +SFX_Cry09_1_Ch2: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_1_Ch2: ; 874c (2:474c) endchannel -SFX_Cry09_1_Ch3: ; 876d (2:476d) +SFX_Cry09_1_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index c0e61ec7..8ce97609 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,4 +1,4 @@ -SFX_Cry09_2_Ch1: ; 209d7 (8:49d7) +SFX_Cry09_2_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_2_Ch1: ; 209d7 (8:49d7) endchannel -SFX_Cry09_2_Ch2: ; 209f4 (8:49f4) +SFX_Cry09_2_Ch2: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_2_Ch2: ; 209f4 (8:49f4) endchannel -SFX_Cry09_2_Ch3: ; 20a15 (8:4a15) +SFX_Cry09_2_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index c5c0f599..a6b40dde 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,4 +1,4 @@ -SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4) +SFX_Cry09_3_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4) endchannel -SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1) +SFX_Cry09_3_Ch2: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1) endchannel -SFX_Cry09_3_Ch3: ; 7c7e2 (1f:47e2) +SFX_Cry09_3_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index 9a8e616b..4264e858 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_1_Ch1: ; 8bca (2:4bca) +SFX_Cry0A_1_Ch1: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_1_Ch1: ; 8bca (2:4bca) endchannel -SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9) +SFX_Cry0A_1_Ch2: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9) endchannel -SFX_Cry0A_1_Ch3: ; 8c0c (2:4c0c) +SFX_Cry0A_1_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index 0386099d..42a8e603 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72) +SFX_Cry0A_2_Ch1: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72) endchannel -SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91) +SFX_Cry0A_2_Ch2: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91) endchannel -SFX_Cry0A_2_Ch3: ; 20eb4 (8:4eb4) +SFX_Cry0A_2_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index 4cf59333..f8576fa1 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f) +SFX_Cry0A_3_Ch1: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f) endchannel -SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e) +SFX_Cry0A_3_Ch2: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e) endchannel -SFX_Cry0A_3_Ch3: ; 7cc81 (1f:4c81) +SFX_Cry0A_3_Ch3: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index 0f0edca7..d0da6c2e 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b) +SFX_Cry0B_1_Ch1: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b) endchannel -SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86) +SFX_Cry0B_1_Ch2: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86) endchannel -SFX_Cry0B_1_Ch3: ; 8aa5 (2:4aa5) +SFX_Cry0B_1_Ch3: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index 071cd9b1..0fe7840a 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03) +SFX_Cry0B_2_Ch1: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03) endchannel -SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e) +SFX_Cry0B_2_Ch2: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e) endchannel -SFX_Cry0B_2_Ch3: ; 20d4d (8:4d4d) +SFX_Cry0B_2_Ch3: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index c2bd1809..ff761b85 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0) +SFX_Cry0B_3_Ch1: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0) endchannel -SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb) +SFX_Cry0B_3_Ch2: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb) endchannel -SFX_Cry0B_3_Ch3: ; 7cb1a (1f:4b1a) +SFX_Cry0B_3_Ch3: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index 1c0f9f65..4ff72662 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_1_Ch1: ; 8abe (2:4abe) +SFX_Cry0C_1_Ch1: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_1_Ch1: ; 8abe (2:4abe) endchannel -SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5) +SFX_Cry0C_1_Ch2: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5) unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_1_Ch3: ; 8b0b (2:4b0b) +SFX_Cry0C_1_Ch3: endchannel diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index ef598b3e..8fb925da 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66) +SFX_Cry0C_2_Ch1: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66) endchannel -SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d) +SFX_Cry0C_2_Ch2: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d) unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_2_Ch3: ; 20db3 (8:4db3) +SFX_Cry0C_2_Ch3: endchannel diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index 4075ac51..149b585d 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33) +SFX_Cry0C_3_Ch1: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33) endchannel -SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a) +SFX_Cry0C_3_Ch2: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,5 +25,5 @@ SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a) unknownsfx0x20 8, 145, 225, 5 -SFX_Cry0C_3_Ch3: ; 7cb80 (1f:4b80) +SFX_Cry0C_3_Ch3: endchannel diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index 591bf58e..dccccb4e 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a) +SFX_Cry0D_1_Ch1: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -10,7 +10,7 @@ SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a) endchannel -SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49) +SFX_Cry0D_1_Ch2: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49) endchannel -SFX_Cry0D_1_Ch3: ; 8b78 (2:4b78) +SFX_Cry0D_1_Ch3: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index a7ca34f1..718364dd 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2) +SFX_Cry0D_2_Ch1: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -10,7 +10,7 @@ SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2) endchannel -SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1) +SFX_Cry0D_2_Ch2: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1) endchannel -SFX_Cry0D_2_Ch3: ; 20e20 (8:4e20) +SFX_Cry0D_2_Ch3: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index a9187dc8..ce26e7e5 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f) +SFX_Cry0D_3_Ch1: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -10,7 +10,7 @@ SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f) endchannel -SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe) +SFX_Cry0D_3_Ch2: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe) endchannel -SFX_Cry0D_3_Ch3: ; 7cbed (1f:4bed) +SFX_Cry0D_3_Ch3: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index 1e778dea..c30aaf20 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_1_Ch1: ; 89af (2:49af) +SFX_Cry0E_1_Ch1: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_1_Ch1: ; 89af (2:49af) endchannel -SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2) +SFX_Cry0E_1_Ch2: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2) endchannel -SFX_Cry0E_1_Ch3: ; 89d5 (2:49d5) +SFX_Cry0E_1_Ch3: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index bab74449..194fb04b 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57) +SFX_Cry0E_2_Ch1: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57) endchannel -SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a) +SFX_Cry0E_2_Ch2: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a) endchannel -SFX_Cry0E_2_Ch3: ; 20c7d (8:4c7d) +SFX_Cry0E_2_Ch3: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index da14b3a7..062e8970 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24) +SFX_Cry0E_3_Ch1: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24) endchannel -SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37) +SFX_Cry0E_3_Ch2: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,7 +16,7 @@ SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37) endchannel -SFX_Cry0E_3_Ch3: ; 7ca4a (1f:4a4a) +SFX_Cry0E_3_Ch3: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 84563293..1646d4b5 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1) +SFX_Cry0F_1_Ch1: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1) endchannel -SFX_Cry0F_1_Ch2: ; 890c (2:490c) +SFX_Cry0F_1_Ch2: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_1_Ch2: ; 890c (2:490c) endchannel -SFX_Cry0F_1_Ch3: ; 8927 (2:4927) +SFX_Cry0F_1_Ch3: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 0fbaeb7a..6058e7cc 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99) +SFX_Cry0F_2_Ch1: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99) endchannel -SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4) +SFX_Cry0F_2_Ch2: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4) endchannel -SFX_Cry0F_2_Ch3: ; 20bcf (8:4bcf) +SFX_Cry0F_2_Ch3: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 810ab949..113f5ed1 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,4 +1,4 @@ -SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966) +SFX_Cry0F_3_Ch1: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966) endchannel -SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981) +SFX_Cry0F_3_Ch2: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,7 +20,7 @@ SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981) endchannel -SFX_Cry0F_3_Ch3: ; 7c99c (1f:499c) +SFX_Cry0F_3_Ch3: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index 956fc910..5199b973 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,4 +1,4 @@ -SFX_Cry10_1_Ch1: ; 8937 (2:4937) +SFX_Cry10_1_Ch1: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_1_Ch1: ; 8937 (2:4937) endchannel -SFX_Cry10_1_Ch2: ; 895a (2:495a) +SFX_Cry10_1_Ch2: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_1_Ch2: ; 895a (2:495a) endchannel -SFX_Cry10_1_Ch3: ; 897d (2:497d) +SFX_Cry10_1_Ch3: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index 5d4cc3aa..789c61b1 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,4 +1,4 @@ -SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf) +SFX_Cry10_2_Ch1: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf) endchannel -SFX_Cry10_2_Ch2: ; 20c02 (8:4c02) +SFX_Cry10_2_Ch2: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_2_Ch2: ; 20c02 (8:4c02) endchannel -SFX_Cry10_2_Ch3: ; 20c25 (8:4c25) +SFX_Cry10_2_Ch3: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index 2d5df465..83980fc7 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,4 +1,4 @@ -SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac) +SFX_Cry10_3_Ch1: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac) endchannel -SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf) +SFX_Cry10_3_Ch2: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,7 +24,7 @@ SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf) endchannel -SFX_Cry10_3_Ch3: ; 7c9f2 (1f:49f2) +SFX_Cry10_3_Ch3: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index dd354c90..d7e0b0f9 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,4 +1,4 @@ -SFX_Cry11_1_Ch1: ; 8813 (2:4813) +SFX_Cry11_1_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_1_Ch1: ; 8813 (2:4813) endchannel -SFX_Cry11_1_Ch2: ; 8832 (2:4832) +SFX_Cry11_1_Ch2: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_1_Ch2: ; 8832 (2:4832) endchannel -SFX_Cry11_1_Ch3: ; 8855 (2:4855) +SFX_Cry11_1_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index 37546fe1..f46580eb 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,4 +1,4 @@ -SFX_Cry11_2_Ch1: ; 20abb (8:4abb) +SFX_Cry11_2_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_2_Ch1: ; 20abb (8:4abb) endchannel -SFX_Cry11_2_Ch2: ; 20ada (8:4ada) +SFX_Cry11_2_Ch2: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_2_Ch2: ; 20ada (8:4ada) endchannel -SFX_Cry11_2_Ch3: ; 20afd (8:4afd) +SFX_Cry11_2_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index 75b9a861..c07e01a5 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,4 +1,4 @@ -SFX_Cry11_3_Ch1: ; 7c888 (1f:4888) +SFX_Cry11_3_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_Cry11_3_Ch1: ; 7c888 (1f:4888) endchannel -SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7) +SFX_Cry11_3_Ch2: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7) endchannel -SFX_Cry11_3_Ch3: ; 7c8ca (1f:48ca) +SFX_Cry11_3_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index a6b1a0f8..62956626 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,4 +1,4 @@ -SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b) +SFX_Cry12_1_Ch1: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b) endchannel -SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e) +SFX_Cry12_1_Ch2: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e) endchannel -SFX_Cry12_1_Ch3: ; 8d51 (2:4d51) +SFX_Cry12_1_Ch3: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index e2b29de7..4acb8911 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,4 +1,4 @@ -SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3) +SFX_Cry12_2_Ch1: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3) endchannel -SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6) +SFX_Cry12_2_Ch2: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6) endchannel -SFX_Cry12_2_Ch3: ; 20ff9 (8:4ff9) +SFX_Cry12_2_Ch3: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index 143f8045..bb433ac9 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,4 +1,4 @@ -SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0) +SFX_Cry12_3_Ch1: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0) endchannel -SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3) +SFX_Cry12_3_Ch2: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,7 +16,7 @@ SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3) endchannel -SFX_Cry12_3_Ch3: ; 7cdc6 (1f:4dc6) +SFX_Cry12_3_Ch3: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index c2f1002f..7f9ef226 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,4 +1,4 @@ -SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e) +SFX_Cry13_1_Ch1: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e) endchannel -SFX_Cry13_1_Ch2: ; 8d79 (2:4d79) +SFX_Cry13_1_Ch2: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_1_Ch2: ; 8d79 (2:4d79) endchannel -SFX_Cry13_1_Ch3: ; 8d94 (2:4d94) +SFX_Cry13_1_Ch3: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index b072fb07..35d723dd 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,4 +1,4 @@ -SFX_Cry13_2_Ch1: ; 21006 (8:5006) +SFX_Cry13_2_Ch1: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_2_Ch1: ; 21006 (8:5006) endchannel -SFX_Cry13_2_Ch2: ; 21021 (8:5021) +SFX_Cry13_2_Ch2: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_2_Ch2: ; 21021 (8:5021) endchannel -SFX_Cry13_2_Ch3: ; 2103c (8:503c) +SFX_Cry13_2_Ch3: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index f2c110b8..a298e5ff 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,4 +1,4 @@ -SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3) +SFX_Cry13_3_Ch1: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3) endchannel -SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee) +SFX_Cry13_3_Ch2: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee) endchannel -SFX_Cry13_3_Ch3: ; 7ce09 (1f:4e09) +SFX_Cry13_3_Ch3: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index 125fe86e..b3cb43b9 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,4 +1,4 @@ -SFX_Cry14_1_Ch1: ; 8da7 (2:4da7) +SFX_Cry14_1_Ch1: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_1_Ch1: ; 8da7 (2:4da7) endchannel -SFX_Cry14_1_Ch2: ; 8db6 (2:4db6) +SFX_Cry14_1_Ch2: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_1_Ch2: ; 8db6 (2:4db6) endchannel -SFX_Cry14_1_Ch3: ; 8dc5 (2:4dc5) +SFX_Cry14_1_Ch3: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index 3ba2ac26..d243bcbd 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,4 +1,4 @@ -SFX_Cry14_2_Ch1: ; 2104f (8:504f) +SFX_Cry14_2_Ch1: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_2_Ch1: ; 2104f (8:504f) endchannel -SFX_Cry14_2_Ch2: ; 2105e (8:505e) +SFX_Cry14_2_Ch2: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_2_Ch2: ; 2105e (8:505e) endchannel -SFX_Cry14_2_Ch3: ; 2106d (8:506d) +SFX_Cry14_2_Ch3: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index fe2cd1e8..b1a32bc4 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,4 +1,4 @@ -SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c) +SFX_Cry14_3_Ch1: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c) endchannel -SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b) +SFX_Cry14_3_Ch2: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,7 +14,7 @@ SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b) endchannel -SFX_Cry14_3_Ch3: ; 7ce3a (1f:4e3a) +SFX_Cry14_3_Ch3: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index 54f94deb..4ebd4963 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,4 +1,4 @@ -SFX_Cry15_1_Ch1: ; 8e35 (2:4e35) +SFX_Cry15_1_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_1_Ch1: ; 8e35 (2:4e35) endchannel -SFX_Cry15_1_Ch2: ; 8e50 (2:4e50) +SFX_Cry15_1_Ch2: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_1_Ch2: ; 8e50 (2:4e50) endchannel -SFX_Cry15_1_Ch3: ; 8e6b (2:4e6b) +SFX_Cry15_1_Ch3: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 14b1af72..77807203 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,4 +1,4 @@ -SFX_Cry15_2_Ch1: ; 210dd (8:50dd) +SFX_Cry15_2_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_2_Ch1: ; 210dd (8:50dd) endchannel -SFX_Cry15_2_Ch2: ; 210f8 (8:50f8) +SFX_Cry15_2_Ch2: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_2_Ch2: ; 210f8 (8:50f8) endchannel -SFX_Cry15_2_Ch3: ; 21113 (8:5113) +SFX_Cry15_2_Ch3: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 36951439..2c24d658 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,4 +1,4 @@ -SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa) +SFX_Cry15_3_Ch1: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa) endchannel -SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5) +SFX_Cry15_3_Ch2: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5) endchannel -SFX_Cry15_3_Ch3: ; 7cee0 (1f:4ee0) +SFX_Cry15_3_Ch3: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index 91fa2596..8a7ee4c1 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,4 +1,4 @@ -SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8) +SFX_Cry16_1_Ch1: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8) endchannel -SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7) +SFX_Cry16_1_Ch2: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7) endchannel -SFX_Cry16_1_Ch3: ; 8ce6 (2:4ce6) +SFX_Cry16_1_Ch3: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 5e29eba8..46729c2a 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,4 +1,4 @@ -SFX_Cry16_2_Ch1: ; 20f70 (8:4f70) +SFX_Cry16_2_Ch1: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_2_Ch1: ; 20f70 (8:4f70) endchannel -SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f) +SFX_Cry16_2_Ch2: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f) endchannel -SFX_Cry16_2_Ch3: ; 20f8e (8:4f8e) +SFX_Cry16_2_Ch3: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index af32e9ef..a94ac495 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,4 +1,4 @@ -SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d) +SFX_Cry16_3_Ch1: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d) endchannel -SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c) +SFX_Cry16_3_Ch2: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,7 +14,7 @@ SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c) endchannel -SFX_Cry16_3_Ch3: ; 7cd5b (1f:4d5b) +SFX_Cry16_3_Ch3: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index 2f2cde11..ddf0967d 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,4 +1,4 @@ -SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e) +SFX_Cry17_1_Ch1: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e) endchannel -SFX_Cry17_1_Ch2: ; 8e91 (2:4e91) +SFX_Cry17_1_Ch2: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_1_Ch2: ; 8e91 (2:4e91) endchannel -SFX_Cry17_1_Ch3: ; 8ea4 (2:4ea4) +SFX_Cry17_1_Ch3: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index cca78ae2..f2528875 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,4 +1,4 @@ -SFX_Cry17_2_Ch1: ; 21126 (8:5126) +SFX_Cry17_2_Ch1: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_2_Ch1: ; 21126 (8:5126) endchannel -SFX_Cry17_2_Ch2: ; 21139 (8:5139) +SFX_Cry17_2_Ch2: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_2_Ch2: ; 21139 (8:5139) endchannel -SFX_Cry17_2_Ch3: ; 2114c (8:514c) +SFX_Cry17_2_Ch3: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index 6aad35d0..f180a3b8 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,4 +1,4 @@ -SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3) +SFX_Cry17_3_Ch1: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3) endchannel -SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06) +SFX_Cry17_3_Ch2: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,7 +16,7 @@ SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06) endchannel -SFX_Cry17_3_Ch3: ; 7cf19 (1f:4f19) +SFX_Cry17_3_Ch3: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index 576ea693..c28bf7f4 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,4 +1,4 @@ -SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e) +SFX_Cry18_1_Ch1: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e) endchannel -SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1) +SFX_Cry18_1_Ch2: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1) endchannel -SFX_Cry18_1_Ch3: ; 8fd4 (2:4fd4) +SFX_Cry18_1_Ch3: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 333ddb9e..1c3c26b9 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,4 +1,4 @@ -SFX_Cry18_2_Ch1: ; 21236 (8:5236) +SFX_Cry18_2_Ch1: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_2_Ch1: ; 21236 (8:5236) endchannel -SFX_Cry18_2_Ch2: ; 21259 (8:5259) +SFX_Cry18_2_Ch2: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_2_Ch2: ; 21259 (8:5259) endchannel -SFX_Cry18_2_Ch3: ; 2127c (8:527c) +SFX_Cry18_2_Ch3: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index 3c7b1a99..ceeda42f 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,4 +1,4 @@ -SFX_Cry18_3_Ch1: ; 7d003 (1f:5003) +SFX_Cry18_3_Ch1: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_Cry18_3_Ch1: ; 7d003 (1f:5003) endchannel -SFX_Cry18_3_Ch2: ; 7d026 (1f:5026) +SFX_Cry18_3_Ch2: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_Cry18_3_Ch2: ; 7d026 (1f:5026) endchannel -SFX_Cry18_3_Ch3: ; 7d049 (1f:5049) +SFX_Cry18_3_Ch3: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index 94607b9b..4b5b4ed0 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,4 +1,4 @@ -SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6) +SFX_Cry19_1_Ch1: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6) endchannel -SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5) +SFX_Cry19_1_Ch2: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5) unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_1_Ch3: ; 8cc7 (2:4cc7) +SFX_Cry19_1_Ch3: endchannel diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index 717a5d2b..9c9557a9 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,4 +1,4 @@ -SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e) +SFX_Cry19_2_Ch1: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e) endchannel -SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d) +SFX_Cry19_2_Ch2: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d) unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_2_Ch3: ; 20f6f (8:4f6f) +SFX_Cry19_2_Ch3: endchannel diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index 535be2b6..71eccbf8 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,4 +1,4 @@ -SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b) +SFX_Cry19_3_Ch1: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b) endchannel -SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a) +SFX_Cry19_3_Ch2: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,5 +14,5 @@ SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a) unknownsfx0x20 15, 162, 1, 7 -SFX_Cry19_3_Ch3: ; 7cd3c (1f:4d3c) +SFX_Cry19_3_Ch3: endchannel diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index 0217deef..7f8911c7 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_1_Ch1: ; 8eff (2:4eff) +SFX_Cry1A_1_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_1_Ch1: ; 8eff (2:4eff) endchannel -SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a) +SFX_Cry1A_1_Ch2: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a) endchannel -SFX_Cry1A_1_Ch3: ; 8f35 (2:4f35) +SFX_Cry1A_1_Ch3: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index c94fc657..da54ff6e 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7) +SFX_Cry1A_2_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7) endchannel -SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2) +SFX_Cry1A_2_Ch2: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2) endchannel -SFX_Cry1A_2_Ch3: ; 211dd (8:51dd) +SFX_Cry1A_2_Ch3: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index 29ff2ec0..d16cf035 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74) +SFX_Cry1A_3_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74) endchannel -SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f) +SFX_Cry1A_3_Ch2: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f) endchannel -SFX_Cry1A_3_Ch3: ; 7cfaa (1f:4faa) +SFX_Cry1A_3_Ch3: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index 858d724a..f6f03c98 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0) +SFX_Cry1B_1_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0) endchannel -SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07) +SFX_Cry1B_1_Ch2: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07) endchannel -SFX_Cry1B_1_Ch3: ; 8d1e (2:4d1e) +SFX_Cry1B_1_Ch3: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index 423258ee..fe96943d 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98) +SFX_Cry1B_2_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98) endchannel -SFX_Cry1B_2_Ch2: ; 20faf (8:4faf) +SFX_Cry1B_2_Ch2: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_2_Ch2: ; 20faf (8:4faf) endchannel -SFX_Cry1B_2_Ch3: ; 20fc6 (8:4fc6) +SFX_Cry1B_2_Ch3: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index 7fe6019f..8a034b1e 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65) +SFX_Cry1B_3_Ch1: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65) endchannel -SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c) +SFX_Cry1B_3_Ch2: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,7 +18,7 @@ SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c) endchannel -SFX_Cry1B_3_Ch3: ; 7cd93 (1f:4d93) +SFX_Cry1B_3_Ch3: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index f7e66dfb..1561353e 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1) +SFX_Cry1C_1_Ch1: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1) endchannel -SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4) +SFX_Cry1C_1_Ch2: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4) endchannel -SFX_Cry1C_1_Ch3: ; 8eef (2:4eef) +SFX_Cry1C_1_Ch3: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index 8037fc96..c589a24d 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_2_Ch1: ; 21159 (8:5159) +SFX_Cry1C_2_Ch1: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_2_Ch1: ; 21159 (8:5159) endchannel -SFX_Cry1C_2_Ch2: ; 2117c (8:517c) +SFX_Cry1C_2_Ch2: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_2_Ch2: ; 2117c (8:517c) endchannel -SFX_Cry1C_2_Ch3: ; 21197 (8:5197) +SFX_Cry1C_2_Ch3: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 853eb1c6..930e3368 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26) +SFX_Cry1C_3_Ch1: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26) endchannel -SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49) +SFX_Cry1C_3_Ch2: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,7 +22,7 @@ SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49) endchannel -SFX_Cry1C_3_Ch3: ; 7cf64 (1f:4f64) +SFX_Cry1C_3_Ch3: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 6e2818c1..6b8b3f79 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48) +SFX_Cry1D_1_Ch1: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48) endchannel -SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63) +SFX_Cry1D_1_Ch2: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63) endchannel -SFX_Cry1D_1_Ch3: ; 8f7e (2:4f7e) +SFX_Cry1D_1_Ch3: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index c7a2c512..31fccb8d 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0) +SFX_Cry1D_2_Ch1: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0) endchannel -SFX_Cry1D_2_Ch2: ; 2120b (8:520b) +SFX_Cry1D_2_Ch2: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_2_Ch2: ; 2120b (8:520b) endchannel -SFX_Cry1D_2_Ch3: ; 21226 (8:5226) +SFX_Cry1D_2_Ch3: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index 7210406c..fbbe9ca5 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd) +SFX_Cry1D_3_Ch1: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd) endchannel -SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8) +SFX_Cry1D_3_Ch2: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,7 +20,7 @@ SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8) endchannel -SFX_Cry1D_3_Ch3: ; 7cff3 (1f:4ff3) +SFX_Cry1D_3_Ch3: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index e445fdd7..9501a06a 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf) +SFX_Cry1E_1_Ch1: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf) endchannel -SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2) +SFX_Cry1E_1_Ch2: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2) endchannel -SFX_Cry1E_1_Ch3: ; 8e19 (2:4e19) +SFX_Cry1E_1_Ch3: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index 59c9985f..fe112101 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_2_Ch1: ; 21077 (8:5077) +SFX_Cry1E_2_Ch1: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_2_Ch1: ; 21077 (8:5077) endchannel -SFX_Cry1E_2_Ch2: ; 2109a (8:509a) +SFX_Cry1E_2_Ch2: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_2_Ch2: ; 2109a (8:509a) endchannel -SFX_Cry1E_2_Ch3: ; 210c1 (8:50c1) +SFX_Cry1E_2_Ch3: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index 1c50d4b8..f5bdbe08 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44) +SFX_Cry1E_3_Ch1: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44) endchannel -SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67) +SFX_Cry1E_3_Ch2: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67) endchannel -SFX_Cry1E_3_Ch3: ; 7ce8e (1f:4e8e) +SFX_Cry1E_3_Ch3: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index 52be80df..28b91c61 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7) +SFX_Cry1F_1_Ch1: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7) endchannel -SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa) +SFX_Cry1F_1_Ch2: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa) endchannel -SFX_Cry1F_1_Ch3: ; 900d (2:500d) +SFX_Cry1F_1_Ch3: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index da7df61a..9691654f 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_2_Ch1: ; 2128f (8:528f) +SFX_Cry1F_2_Ch1: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_2_Ch1: ; 2128f (8:528f) endchannel -SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2) +SFX_Cry1F_2_Ch2: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2) endchannel -SFX_Cry1F_2_Ch3: ; 212b5 (8:52b5) +SFX_Cry1F_2_Ch3: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index 2f6c1eda..3c50327b 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,4 +1,4 @@ -SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c) +SFX_Cry1F_3_Ch1: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c) endchannel -SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f) +SFX_Cry1F_3_Ch2: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,7 +16,7 @@ SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f) endchannel -SFX_Cry1F_3_Ch3: ; 7d082 (1f:5082) +SFX_Cry1F_3_Ch3: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index d6586bdd..0e9ffb00 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,4 +1,4 @@ -SFX_Cry20_1_Ch1: ; 901a (2:501a) +SFX_Cry20_1_Ch1: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_1_Ch1: ; 901a (2:501a) endchannel -SFX_Cry20_1_Ch2: ; 902d (2:502d) +SFX_Cry20_1_Ch2: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_1_Ch2: ; 902d (2:502d) endchannel -SFX_Cry20_1_Ch3: ; 9040 (2:5040) +SFX_Cry20_1_Ch3: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index b345eba5..91891b4f 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,4 +1,4 @@ -SFX_Cry20_2_Ch1: ; 212c2 (8:52c2) +SFX_Cry20_2_Ch1: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_2_Ch1: ; 212c2 (8:52c2) endchannel -SFX_Cry20_2_Ch2: ; 212d5 (8:52d5) +SFX_Cry20_2_Ch2: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_2_Ch2: ; 212d5 (8:52d5) endchannel -SFX_Cry20_2_Ch3: ; 212e8 (8:52e8) +SFX_Cry20_2_Ch3: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 5bcdf3df..1fae1bb3 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,4 +1,4 @@ -SFX_Cry20_3_Ch1: ; 7d08f (1f:508f) +SFX_Cry20_3_Ch1: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_Cry20_3_Ch1: ; 7d08f (1f:508f) endchannel -SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2) +SFX_Cry20_3_Ch2: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,7 +16,7 @@ SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2) endchannel -SFX_Cry20_3_Ch3: ; 7d0b5 (1f:50b5) +SFX_Cry20_3_Ch3: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index 9b81e2a3..17d1e16c 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,4 +1,4 @@ -SFX_Cry21_1_Ch1: ; 904d (2:504d) +SFX_Cry21_1_Ch1: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_1_Ch1: ; 904d (2:504d) endchannel -SFX_Cry21_1_Ch2: ; 9070 (2:5070) +SFX_Cry21_1_Ch2: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_1_Ch2: ; 9070 (2:5070) unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_1_Ch3: ; 9092 (2:5092) +SFX_Cry21_1_Ch3: endchannel diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index f5571642..14856fc9 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,4 +1,4 @@ -SFX_Cry21_2_Ch1: ; 212f5 (8:52f5) +SFX_Cry21_2_Ch1: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_2_Ch1: ; 212f5 (8:52f5) endchannel -SFX_Cry21_2_Ch2: ; 21318 (8:5318) +SFX_Cry21_2_Ch2: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_2_Ch2: ; 21318 (8:5318) unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_2_Ch3: ; 2133a (8:533a) +SFX_Cry21_2_Ch3: endchannel diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index d91177b8..40cbf7f2 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,4 +1,4 @@ -SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2) +SFX_Cry21_3_Ch1: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2) endchannel -SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5) +SFX_Cry21_3_Ch2: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,5 +23,5 @@ SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5) unknownsfx0x20 8, 193, 0, 5 -SFX_Cry21_3_Ch3: ; 7d107 (1f:5107) +SFX_Cry21_3_Ch3: endchannel diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index 90961298..fb0c6b23 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,4 +1,4 @@ -SFX_Cry22_1_Ch1: ; 9093 (2:5093) +SFX_Cry22_1_Ch1: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_1_Ch1: ; 9093 (2:5093) endchannel -SFX_Cry22_1_Ch2: ; 90a6 (2:50a6) +SFX_Cry22_1_Ch2: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_1_Ch2: ; 90a6 (2:50a6) endchannel -SFX_Cry22_1_Ch3: ; 90b9 (2:50b9) +SFX_Cry22_1_Ch3: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index 861c3bfb..7653234e 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,4 +1,4 @@ -SFX_Cry22_2_Ch1: ; 2133b (8:533b) +SFX_Cry22_2_Ch1: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_2_Ch1: ; 2133b (8:533b) endchannel -SFX_Cry22_2_Ch2: ; 2134e (8:534e) +SFX_Cry22_2_Ch2: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_2_Ch2: ; 2134e (8:534e) endchannel -SFX_Cry22_2_Ch3: ; 21361 (8:5361) +SFX_Cry22_2_Ch3: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 42b3039c..96fae832 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,4 +1,4 @@ -SFX_Cry22_3_Ch1: ; 7d108 (1f:5108) +SFX_Cry22_3_Ch1: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_Cry22_3_Ch1: ; 7d108 (1f:5108) endchannel -SFX_Cry22_3_Ch2: ; 7d11b (1f:511b) +SFX_Cry22_3_Ch2: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,7 +16,7 @@ SFX_Cry22_3_Ch2: ; 7d11b (1f:511b) endchannel -SFX_Cry22_3_Ch3: ; 7d12e (1f:512e) +SFX_Cry22_3_Ch3: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index 02868042..4aaa3bfa 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,4 +1,4 @@ -SFX_Cry23_1_Ch1: ; 8786 (2:4786) +SFX_Cry23_1_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_1_Ch1: ; 8786 (2:4786) endchannel -SFX_Cry23_1_Ch2: ; 879d (2:479d) +SFX_Cry23_1_Ch2: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_1_Ch2: ; 879d (2:479d) endchannel -SFX_Cry23_1_Ch3: ; 87b0 (2:47b0) +SFX_Cry23_1_Ch3: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 089a233c..644b14cf 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,4 +1,4 @@ -SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e) +SFX_Cry23_2_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e) endchannel -SFX_Cry23_2_Ch2: ; 20a45 (8:4a45) +SFX_Cry23_2_Ch2: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_2_Ch2: ; 20a45 (8:4a45) endchannel -SFX_Cry23_2_Ch3: ; 20a58 (8:4a58) +SFX_Cry23_2_Ch3: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index 31ba3743..d86dfcd4 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,4 +1,4 @@ -SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb) +SFX_Cry23_3_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb) endchannel -SFX_Cry23_3_Ch2: ; 7c812 (1f:4812) +SFX_Cry23_3_Ch2: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,7 +17,7 @@ SFX_Cry23_3_Ch2: ; 7c812 (1f:4812) endchannel -SFX_Cry23_3_Ch3: ; 7c825 (1f:4825) +SFX_Cry23_3_Ch3: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index 061ed65a..a94803c1 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,4 +1,4 @@ -SFX_Cry24_1_Ch1: ; 87bd (2:47bd) +SFX_Cry24_1_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_1_Ch1: ; 87bd (2:47bd) endchannel -SFX_Cry24_1_Ch2: ; 87e0 (2:47e0) +SFX_Cry24_1_Ch2: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_1_Ch2: ; 87e0 (2:47e0) endchannel -SFX_Cry24_1_Ch3: ; 8803 (2:4803) +SFX_Cry24_1_Ch3: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index 52986829..cc8b2f87 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,4 +1,4 @@ -SFX_Cry24_2_Ch1: ; 20a65 (8:4a65) +SFX_Cry24_2_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_2_Ch1: ; 20a65 (8:4a65) endchannel -SFX_Cry24_2_Ch2: ; 20a88 (8:4a88) +SFX_Cry24_2_Ch2: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_2_Ch2: ; 20a88 (8:4a88) endchannel -SFX_Cry24_2_Ch3: ; 20aab (8:4aab) +SFX_Cry24_2_Ch3: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index 8c9cfc81..37926146 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,4 +1,4 @@ -SFX_Cry24_3_Ch1: ; 7c832 (1f:4832) +SFX_Cry24_3_Ch1: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_Cry24_3_Ch1: ; 7c832 (1f:4832) endchannel -SFX_Cry24_3_Ch2: ; 7c855 (1f:4855) +SFX_Cry24_3_Ch2: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,7 +24,7 @@ SFX_Cry24_3_Ch2: ; 7c855 (1f:4855) endchannel -SFX_Cry24_3_Ch3: ; 7c878 (1f:4878) +SFX_Cry24_3_Ch3: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index ce238db2..d54b8d6c 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,4 +1,4 @@ -SFX_Cry25_1_Ch1: ; 886b (2:486b) +SFX_Cry25_1_Ch1: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_1_Ch1: ; 886b (2:486b) endchannel -SFX_Cry25_1_Ch2: ; 8882 (2:4882) +SFX_Cry25_1_Ch2: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_1_Ch2: ; 8882 (2:4882) endchannel -SFX_Cry25_1_Ch3: ; 8899 (2:4899) +SFX_Cry25_1_Ch3: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index b00210a9..48e4d057 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,4 +1,4 @@ -SFX_Cry25_2_Ch1: ; 20b13 (8:4b13) +SFX_Cry25_2_Ch1: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_2_Ch1: ; 20b13 (8:4b13) endchannel -SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a) +SFX_Cry25_2_Ch2: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a) endchannel -SFX_Cry25_2_Ch3: ; 20b41 (8:4b41) +SFX_Cry25_2_Ch3: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index 7c93b0e6..f08c6a00 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,4 +1,4 @@ -SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0) +SFX_Cry25_3_Ch1: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0) endchannel -SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7) +SFX_Cry25_3_Ch2: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,7 +18,7 @@ SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7) endchannel -SFX_Cry25_3_Ch3: ; 7c90e (1f:490e) +SFX_Cry25_3_Ch3: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index c1b763e0..a42cd660 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,4 +1,4 @@ -SFX_Cut_1_Ch1: ; 83e1 (2:43e1) +SFX_Cut_1_Ch1: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index 4ad5551d..12c2366e 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,4 +1,4 @@ -SFX_Cut_3_Ch1: ; 7c3ca (1f:43ca) +SFX_Cut_3_Ch1: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm index d001b750..3f3c6d8b 100644 --- a/audio/sfx/cymbal1_1.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_1_Ch1: ; 833b (2:433b) +SFX_Cymbal1_1_Ch1: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm index 8987d85f..bb1e3e3e 100644 --- a/audio/sfx/cymbal1_2.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_2_Ch1: ; 2033b (8:433b) +SFX_Cymbal1_2_Ch1: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm index 597a8b61..9587977f 100644 --- a/audio/sfx/cymbal1_3.asm +++ b/audio/sfx/cymbal1_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal1_3_Ch1: ; 7c33b (1f:433b) +SFX_Cymbal1_3_Ch1: unknownnoise0x20 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm index 3f50299a..2ec3fc86 100644 --- a/audio/sfx/cymbal2_1.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_1_Ch1: ; 833f (2:433f) +SFX_Cymbal2_1_Ch1: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm index 5224a20d..8b27a0de 100644 --- a/audio/sfx/cymbal2_2.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_2_Ch1: ; 2033f (8:433f) +SFX_Cymbal2_2_Ch1: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm index dd3a4fc9..642a336a 100644 --- a/audio/sfx/cymbal2_3.asm +++ b/audio/sfx/cymbal2_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal2_3_Ch1: ; 7c33f (1f:433f) +SFX_Cymbal2_3_Ch1: unknownnoise0x20 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm index 8aa5ebe5..3fd225e2 100644 --- a/audio/sfx/cymbal3_1.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_1_Ch1: ; 8343 (2:4343) +SFX_Cymbal3_1_Ch1: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm index d1fd3b90..1435b5ed 100644 --- a/audio/sfx/cymbal3_2.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_2_Ch1: ; 20343 (8:4343) +SFX_Cymbal3_2_Ch1: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm index 45e41c15..b45fb03d 100644 --- a/audio/sfx/cymbal3_3.asm +++ b/audio/sfx/cymbal3_3.asm @@ -1,3 +1,3 @@ -SFX_Cymbal3_3_Ch1: ; 7c343 (1f:4343) +SFX_Cymbal3_3_Ch1: unknownnoise0x20 0, 162, 80 endchannel diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index 4022fcbf..ea2727d8 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,4 +1,4 @@ -SFX_Damage_Ch1: ; 204f4 (8:44f4) +SFX_Damage_Ch1: unknownnoise0x20 2, 244, 68 unknownnoise0x20 2, 244, 20 unknownnoise0x20 15, 241, 50 diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index 46520151..d954308a 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,4 +1,4 @@ -SFX_Denied_1_Ch1: ; 861f (2:461f) +SFX_Denied_1_Ch1: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,7 +9,7 @@ SFX_Denied_1_Ch1: ; 861f (2:461f) endchannel -SFX_Denied_1_Ch2: ; 8636 (2:4636) +SFX_Denied_1_Ch2: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index 2cebd766..ca82a739 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,4 +1,4 @@ -SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc) +SFX_Denied_3_Ch1: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,7 +9,7 @@ SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc) endchannel -SFX_Denied_3_Ch2: ; 7c613 (1f:4613) +SFX_Denied_3_Ch2: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index dac55ed9..6e3a0dcf 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,4 +1,4 @@ -SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f) +SFX_Dex_Page_Added_Ch1: duty 2 unknownsfx0x10 68 unknownsfx0x20 15, 240, 240, 4 @@ -8,7 +8,7 @@ SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f) endchannel -SFX_Dex_Page_Added_Ch2: ; 20490 (8:4490) +SFX_Dex_Page_Added_Ch2: duty 2 unknownsfx0x20 15, 146, 0, 6 unknownsfx0x20 15, 146, 130, 7 diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 0918238a..5cae0a4b 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ -SFX_Doubleslap_Ch1: ; 2058c (8:458c) +SFX_Doubleslap_Ch1: unknownnoise0x20 8, 241, 50 unknownnoise0x20 8, 241, 51 endchannel diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index 5c1a189a..b2450ced 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Enter_PC_1_Ch1: ; 853b (2:453b) +SFX_Enter_PC_1_Ch1: duty 2 unknownsfx0x20 6, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index 5907a7e5..061068ce 100644 --- a/audio/sfx/enter_pc_3.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Enter_PC_3_Ch1: ; 7c518 (1f:4518) +SFX_Enter_PC_3_Ch1: duty 2 unknownsfx0x20 4, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index c252b93a..cd1b2cdc 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,4 +1,4 @@ -SFX_Faint_Fall_Ch1: ; 204ae (8:44ae) +SFX_Faint_Fall_Ch1: duty 1 unknownsfx0x10 175 unknownsfx0x20 15, 242, 128, 7 diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 5ef100c5..7b6ec0a0 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,10 +1,10 @@ -SFX_Faint_Thud_Ch1: ; 2044c (8:444c) +SFX_Faint_Thud_Ch1: unknownsfx0x20 15, 209, 0, 2 unknownsfx0x10 8 endchannel -SFX_Faint_Thud_Ch2: ; 20453 (8:4453) +SFX_Faint_Thud_Ch2: unknownnoise0x20 4, 245, 51 unknownnoise0x20 8, 244, 34 unknownnoise0x20 15, 242, 33 diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index c2ecf435..2b487bc2 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,4 +1,4 @@ -SFX_Fly_1_Ch1: ; 85ee (2:45ee) +SFX_Fly_1_Ch1: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index 043d4b51..c081030d 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,4 +1,4 @@ -SFX_Fly_3_Ch1: ; 7c5cb (1f:45cb) +SFX_Fly_3_Ch1: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm index 471124d7..ba428722 100644 --- a/audio/sfx/get_item1_1.asm +++ b/audio/sfx/get_item1_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77) +SFX_Get_Item1_1_Ch1: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77) endchannel -SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e) +SFX_Get_Item1_1_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e) endchannel -SFX_Get_Item1_1_Ch3: ; ad9e (2:6d9e) +SFX_Get_Item1_1_Ch3: executemusic notetype 4, 1, 0 octave 4 diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm index 6a7ebabc..b30ce40c 100644 --- a/audio/sfx/get_item1_3.asm +++ b/audio/sfx/get_item1_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850) +SFX_Get_Item1_3_Ch1: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850) endchannel -SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867) +SFX_Get_Item1_3_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867) endchannel -SFX_Get_Item1_3_Ch3: ; 7e877 (1f:6877) +SFX_Get_Item1_3_Ch3: executemusic notetype 4, 1, 0 octave 4 diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm index 6fda3404..67bb7bb8 100644 --- a/audio/sfx/get_item2_1.asm +++ b/audio/sfx/get_item2_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_1_Ch1: ; b316 (2:7316) +SFX_Get_Item2_1_Ch1: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_1_Ch1: ; b316 (2:7316) endchannel -SFX_Get_Item2_1_Ch2: ; b335 (2:7335) +SFX_Get_Item2_1_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_1_Ch2: ; b335 (2:7335) endchannel -SFX_Get_Item2_1_Ch3: ; b34d (2:734d) +SFX_Get_Item2_1_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm index 25e40744..292a74f6 100644 --- a/audio/sfx/get_item2_2.asm +++ b/audio/sfx/get_item2_2.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7) +SFX_Get_Item2_2_Ch1: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7) endchannel -SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6) +SFX_Get_Item2_2_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6) endchannel -SFX_Get_Item2_2_Ch3: ; 239fe (8:79fe) +SFX_Get_Item2_2_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm index 20a0ee04..1a833741 100644 --- a/audio/sfx/get_item2_3.asm +++ b/audio/sfx/get_item2_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28) +SFX_Get_Item2_3_Ch1: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28) endchannel -SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47) +SFX_Get_Item2_3_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47) endchannel -SFX_Get_Item2_3_Ch3: ; 7ee5f (1f:6e5f) +SFX_Get_Item2_3_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm index 233ea01b..c8da1745 100644 --- a/audio/sfx/get_key_item_1.asm +++ b/audio/sfx/get_key_item_1.asm @@ -1,4 +1,4 @@ -SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362) +SFX_Get_Key_Item_1_Ch1: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362) endchannel -SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381) +SFX_Get_Key_Item_1_Ch2: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381) endchannel -SFX_Get_Key_Item_1_Ch3: ; b39d (2:739d) +SFX_Get_Key_Item_1_Ch3: executemusic notetype 5, 1, 0 octave 4 diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm index f918e1bf..e6a50929 100644 --- a/audio/sfx/get_key_item_3.asm +++ b/audio/sfx/get_key_item_3.asm @@ -1,4 +1,4 @@ -SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74) +SFX_Get_Key_Item_3_Ch1: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74) endchannel -SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93) +SFX_Get_Key_Item_3_Ch2: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93) endchannel -SFX_Get_Key_Item_3_Ch3: ; 7eeaf (1f:6eaf) +SFX_Get_Key_Item_3_Ch3: executemusic notetype 5, 1, 0 octave 4 diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index 1eb1e2ca..5da5be86 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_1_Ch1: ; 83f1 (2:43f1) +SFX_Go_Inside_1_Ch1: unknownnoise0x20 9, 241, 68 unknownnoise0x20 8, 209, 67 endchannel diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm index d8e18b7d..460b3b4a 100644 --- a/audio/sfx/go_inside_3.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Inside_3_Ch1: ; 7c3da (1f:43da) +SFX_Go_Inside_3_Ch1: unknownnoise0x20 9, 241, 68 unknownnoise0x20 8, 209, 67 endchannel diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index 2e8a8b31..2038d299 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,4 +1,4 @@ -SFX_Go_Outside_1_Ch1: ; 8452 (2:4452) +SFX_Go_Outside_1_Ch1: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index 2dc4242d..d45b8410 100644 --- a/audio/sfx/go_outside_3.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,4 +1,4 @@ -SFX_Go_Outside_3_Ch1: ; 7c43b (1f:443b) +SFX_Go_Outside_3_Ch1: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index 5937f3a2..3a292b82 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_1_Ch1: ; 84d9 (2:44d9) +SFX_Heal_Ailment_1_Ch1: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index 4b39895a..25e1bbe0 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_2_Ch1: ; 203fd (8:43fd) +SFX_Heal_Ailment_2_Ch1: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index b2805f3d..2719358f 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,4 +1,4 @@ -SFX_Heal_Ailment_3_Ch1: ; 7c4b2 (1f:44b2) +SFX_Heal_Ailment_3_Ch1: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index eb8063f7..a23db490 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_1_Ch1: ; 84b7 (2:44b7) +SFX_Heal_HP_1_Ch1: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index 890a2151..f21f6712 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_2_Ch1: ; 203ee (8:43ee) +SFX_Heal_HP_2_Ch1: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index da80d48f..96ff391b 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,4 +1,4 @@ -SFX_Heal_HP_3_Ch1: ; 7c490 (1f:4490) +SFX_Heal_HP_3_Ch1: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index 4babf6b0..ecb7c09c 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,4 +1,4 @@ -SFX_Healing_Machine_1_Ch1: ; 8580 (2:4580) +SFX_Healing_Machine_1_Ch1: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index c72f7905..ec73e139 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,4 +1,4 @@ -SFX_Healing_Machine_3_Ch1: ; 7c55d (1f:455d) +SFX_Healing_Machine_3_Ch1: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index e68e5834..b1af527b 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,4 +1,4 @@ -SFX_Horn_Drill_Ch1: ; 205b1 (8:45b1) +SFX_Horn_Drill_Ch1: unknownnoise0x20 3, 146, 49 unknownnoise0x20 3, 178, 50 unknownnoise0x20 3, 194, 51 diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 65e475f8..69d6ff9b 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ -SFX_Intro_Crash_Ch1: ; 7c6de (1f:46de) +SFX_Intro_Crash_Ch1: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 70d0f8b1..3d6de9d6 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,4 +1,4 @@ -SFX_Intro_Hip_Ch1: ; 7c6be (1f:46be) +SFX_Intro_Hip_Ch1: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 64, 7 diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 223c7f25..8e077c67 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,4 +1,4 @@ -SFX_Intro_Hop_Ch1: ; 7c6c9 (1f:46c9) +SFX_Intro_Hop_Ch1: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 128, 6 diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index ad00f56f..cb7570de 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,4 +1,4 @@ -SFX_Intro_Lunge_Ch1: ; 7c6a5 (1f:46a5) +SFX_Intro_Lunge_Ch1: unknownnoise0x20 6, 32, 16 unknownnoise0x20 6, 47, 64 unknownnoise0x20 6, 79, 65 diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index d6ee1430..0088228f 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,4 +1,4 @@ -SFX_Intro_Raise_Ch1: ; 7c6d4 (1f:46d4) +SFX_Intro_Raise_Ch1: unknownnoise0x20 2, 111, 33 unknownnoise0x20 2, 175, 49 unknownnoise0x20 15, 242, 65 diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index 903b7252..5609bfc0 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,4 +1,4 @@ -SFX_Intro_Whoosh_Ch1: ; 7c6e5 (1f:46e5) +SFX_Intro_Whoosh_Ch1: unknownnoise0x20 4, 44, 32 unknownnoise0x20 3, 160, 32 unknownnoise0x20 3, 176, 33 diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index dfd7c819..72aa087e 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,4 +1,4 @@ -SFX_Ledge_1_Ch1: ; 85d6 (2:45d6) +SFX_Ledge_1_Ch1: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index 2bf172e7..a554282e 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,4 +1,4 @@ -SFX_Ledge_3_Ch1: ; 7c5b3 (1f:45b3) +SFX_Ledge_3_Ch1: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm index 03e077ec..f0890eab 100644 --- a/audio/sfx/level_up.asm +++ b/audio/sfx/level_up.asm @@ -1,4 +1,4 @@ -SFX_Level_Up_Ch1: ; 2397d (8:797d) +SFX_Level_Up_Ch1: executemusic tempo 256 volume 7, 7 @@ -20,7 +20,7 @@ SFX_Level_Up_Ch1: ; 2397d (8:797d) endchannel -SFX_Level_Up_Ch2: ; 23998 (8:7998) +SFX_Level_Up_Ch2: executemusic vibrato 4, 2, 2 duty 2 @@ -40,7 +40,7 @@ SFX_Level_Up_Ch2: ; 23998 (8:7998) endchannel -SFX_Level_Up_Ch3: ; 239b0 (8:79b0) +SFX_Level_Up_Ch3: executemusic notetype 6, 1, 0 octave 5 diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm index 5d10ecc1..b29a5b87 100644 --- a/audio/sfx/muted_snare1_1.asm +++ b/audio/sfx/muted_snare1_1.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_1_Ch1: ; 8347 (2:4347) +SFX_Muted_Snare1_1_Ch1: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm index ea3cfc8c..a7f5467f 100644 --- a/audio/sfx/muted_snare1_2.asm +++ b/audio/sfx/muted_snare1_2.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_2_Ch1: ; 20347 (8:4347) +SFX_Muted_Snare1_2_Ch1: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm index 27caa37b..136018ef 100644 --- a/audio/sfx/muted_snare1_3.asm +++ b/audio/sfx/muted_snare1_3.asm @@ -1,4 +1,4 @@ -SFX_Muted_Snare1_3_Ch1: ; 7c347 (1f:4347) +SFX_Muted_Snare1_3_Ch1: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm index 7ab6252b..9ad52c27 100644 --- a/audio/sfx/muted_snare2_1.asm +++ b/audio/sfx/muted_snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_1_Ch1: ; 8355 (2:4355) +SFX_Muted_Snare2_1_Ch1: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm index a9359226..20670ec8 100644 --- a/audio/sfx/muted_snare2_2.asm +++ b/audio/sfx/muted_snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_2_Ch1: ; 20355 (8:4355) +SFX_Muted_Snare2_2_Ch1: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm index 7ac9705d..007d462d 100644 --- a/audio/sfx/muted_snare2_3.asm +++ b/audio/sfx/muted_snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare2_3_Ch1: ; 7c355 (1f:4355) +SFX_Muted_Snare2_3_Ch1: unknownnoise0x20 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm index 1cd27319..8db6b874 100644 --- a/audio/sfx/muted_snare3_1.asm +++ b/audio/sfx/muted_snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_1_Ch1: ; 8359 (2:4359) +SFX_Muted_Snare3_1_Ch1: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm index 1606b6d5..013ea9ab 100644 --- a/audio/sfx/muted_snare3_2.asm +++ b/audio/sfx/muted_snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_2_Ch1: ; 20359 (8:4359) +SFX_Muted_Snare3_2_Ch1: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm index c0fe7efb..038a66db 100644 --- a/audio/sfx/muted_snare3_3.asm +++ b/audio/sfx/muted_snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare3_3_Ch1: ; 7c359 (1f:4359) +SFX_Muted_Snare3_3_Ch1: unknownnoise0x20 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm index bcac6440..99429995 100644 --- a/audio/sfx/muted_snare4_1.asm +++ b/audio/sfx/muted_snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_1_Ch1: ; 835d (2:435d) +SFX_Muted_Snare4_1_Ch1: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm index 6910c20d..11ee3218 100644 --- a/audio/sfx/muted_snare4_2.asm +++ b/audio/sfx/muted_snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_2_Ch1: ; 2035d (8:435d) +SFX_Muted_Snare4_2_Ch1: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm index 52f14f21..86223813 100644 --- a/audio/sfx/muted_snare4_3.asm +++ b/audio/sfx/muted_snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Muted_Snare4_3_Ch1: ; 7c35d (1f:435d) +SFX_Muted_Snare4_3_Ch1: unknownnoise0x20 0, 97, 34 endchannel diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 959f33e3..8a4c521e 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,4 +1,4 @@ -SFX_Not_Very_Effective_Ch1: ; 204fe (8:44fe) +SFX_Not_Very_Effective_Ch1: unknownnoise0x20 4, 143, 85 unknownnoise0x20 2, 244, 68 unknownnoise0x20 8, 244, 34 diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index e4632281..c474e9b3 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ -SFX_Peck_Ch1: ; 204aa (8:44aa) +SFX_Peck_Ch1: unknownnoise0x20 2, 161, 18 endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index 4760696d..bfd619fd 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,4 +1,4 @@ -SFX_Poisoned_1_Ch1: ; 84c6 (2:44c6) +SFX_Poisoned_1_Ch1: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index b6d69dc6..b972ca92 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,4 +1,4 @@ -SFX_Poisoned_3_Ch1: ; 7c49f (1f:449f) +SFX_Poisoned_3_Ch1: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm index 21503d16..eccf0ee5 100644 --- a/audio/sfx/pokedex_rating_1.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -1,4 +1,4 @@ -SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8) +SFX_Pokedex_Rating_1_Ch1: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8) endchannel -SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1) +SFX_Pokedex_Rating_1_Ch2: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1) endchannel -SFX_Pokedex_Rating_1_Ch3: ; b2f7 (2:72f7) +SFX_Pokedex_Rating_1_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm index a9ea1c75..ec82888e 100644 --- a/audio/sfx/pokedex_rating_3.asm +++ b/audio/sfx/pokedex_rating_3.asm @@ -1,4 +1,4 @@ -SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda) +SFX_Pokedex_Rating_3_Ch1: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda) endchannel -SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3) +SFX_Pokedex_Rating_3_Ch2: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3) endchannel -SFX_Pokedex_Rating_3_Ch3: ; 7ee09 (1f:6e09) +SFX_Pokedex_Rating_3_Ch3: executemusic notetype 5, 1, 0 octave 5 diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm index 4abf1713..cf61a6ee 100644 --- a/audio/sfx/pokeflute.asm +++ b/audio/sfx/pokeflute.asm @@ -1,4 +1,4 @@ -SFX_Pokeflute_Ch1: ; 83ca (2:43ca) +SFX_Pokeflute_Ch1: vibrato 16, 1, 4 notetype 12, 1, 0 octave 5 diff --git a/audio/sfx/pokeflute_ch1_ch2.asm b/audio/sfx/pokeflute_ch1_ch2.asm index 4ccf89d8..84631bca 100755 --- a/audio/sfx/pokeflute_ch1_ch2.asm +++ b/audio/sfx/pokeflute_ch1_ch2.asm @@ -1,8 +1,8 @@ -SFX_08_PokeFlute_Ch1: ; 22322 (8:6322) +SFX_08_PokeFlute_Ch1: tempo 256 -SFX_08_PokeFlute_Ch2: ; 22325 (8:6325) +SFX_08_PokeFlute_Ch2: executemusic notetype 8, 0, 0 rest 5 diff --git a/audio/sfx/pokeflute_ch3.asm b/audio/sfx/pokeflute_ch3.asm index 0652e673..3c883462 100755 --- a/audio/sfx/pokeflute_ch3.asm +++ b/audio/sfx/pokeflute_ch3.asm @@ -1,4 +1,4 @@ -SFX_08_PokeFlute_Ch3: ; 2049b (8:449b) +SFX_08_PokeFlute_Ch3: executemusic vibrato 16, 1, 4 notetype 8, 1, 0 diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index 102d7d6d..f70f6725 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ -SFX_Pound_Ch1: ; 204c4 (8:44c4) +SFX_Pound_Ch1: unknownnoise0x20 2, 161, 34 endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index 5925b788..f68a6384 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_1_Ch1: ; 8462 (2:4462) +SFX_Press_AB_1_Ch1: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index e15dadc4..83b5ccd6 100644 --- a/audio/sfx/press_ab_2.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_2_Ch1: ; 203c3 (8:43c3) +SFX_Press_AB_2_Ch1: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 8af4a335..167c0fb1 100644 --- a/audio/sfx/press_ab_3.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,4 +1,4 @@ -SFX_Press_AB_3_Ch1: ; 7c44b (1f:444b) +SFX_Press_AB_3_Ch1: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 65fcc229..893d4334 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,4 +1,4 @@ -SFX_Psybeam_Ch1: ; 20759 (8:4759) +SFX_Psybeam_Ch1: dutycycle 161 unknownsfx0x20 10, 241, 64, 6 unknownsfx0x20 10, 243, 128, 6 @@ -8,7 +8,7 @@ SFX_Psybeam_Ch1: ; 20759 (8:4759) endchannel -SFX_Psybeam_Ch2: ; 20770 (8:4770) +SFX_Psybeam_Ch2: dutycycle 179 unknownsfx0x20 10, 243, 113, 5 unknownsfx0x20 7, 227, 49, 5 @@ -18,7 +18,7 @@ SFX_Psybeam_Ch2: ; 20770 (8:4770) endchannel -SFX_Psybeam_Ch3: ; 20787 (8:4787) +SFX_Psybeam_Ch3: unknownnoise0x20 2, 209, 74 unknownnoise0x20 2, 210, 42 loopchannel 21, SFX_Psybeam_Ch3 diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index e734b7ac..abaa8345 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,4 +1,4 @@ -SFX_Psychic_M_Ch1: ; 207fa (8:47fa) +SFX_Psychic_M_Ch1: duty 2 unknownsfx0x10 247 unknownsfx0x20 8, 196, 189, 7 @@ -11,7 +11,7 @@ SFX_Psychic_M_Ch1: ; 207fa (8:47fa) endchannel -SFX_Psychic_M_Ch2: ; 20819 (8:4819) +SFX_Psychic_M_Ch2: duty 2 unknownsfx0x20 8, 196, 112, 7 unknownsfx0x20 8, 196, 97, 7 @@ -22,7 +22,7 @@ SFX_Psychic_M_Ch2: ; 20819 (8:4819) endchannel -SFX_Psychic_M_Ch3: ; 20834 (8:4834) +SFX_Psychic_M_Ch3: unknownnoise0x20 15, 63, 20 unknownnoise0x20 15, 207, 19 unknownnoise0x20 15, 207, 18 diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index fc0cecb5..767035ea 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,11 +1,11 @@ -SFX_Purchase_1_Ch1: ; 842d (2:442d) +SFX_Purchase_1_Ch1: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_Purchase_1_Ch2: ; 8438 (2:4438) +SFX_Purchase_1_Ch2: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index 5d649958..65a22527 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -1,11 +1,11 @@ -SFX_Purchase_3_Ch1: ; 7c416 (1f:4416) +SFX_Purchase_3_Ch1: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_Purchase_3_Ch2: ; 7c421 (1f:4421) +SFX_Purchase_3_Ch2: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index 31096861..cf43bbcf 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,4 +1,4 @@ -SFX_Push_Boulder_1_Ch1: ; 8654 (2:4654) +SFX_Push_Boulder_1_Ch1: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index ca7d2cd1..9f536964 100644 --- a/audio/sfx/push_boulder_3.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,4 +1,4 @@ -SFX_Push_Boulder_3_Ch1: ; 7c631 (1f:4631) +SFX_Push_Boulder_3_Ch1: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index 653b0f6b..656d3d01 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,4 +1,4 @@ -SFX_Run_Ch1: ; 2045d (8:445d) +SFX_Run_Ch1: unknownnoise0x20 2, 97, 35 unknownnoise0x20 2, 161, 51 unknownnoise0x20 2, 193, 51 diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index fb8c4d1f..d385feb3 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,4 +1,4 @@ -SFX_Safari_Zone_PA_Ch1: ; 86c8 (2:46c8) +SFX_Safari_Zone_PA_Ch1: duty 2 unknownsfx0x20 15, 243, 48, 7 unknownsfx0x20 8, 101, 48, 7 diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index 2e6c1f2b..13cb46e5 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,4 +1,4 @@ -SFX_Save_1_Ch1: ; 8475 (2:4475) +SFX_Save_1_Ch1: duty 2 unknownsfx0x20 4, 244, 0, 7 unknownsfx0x20 2, 228, 0, 6 @@ -10,7 +10,7 @@ SFX_Save_1_Ch1: ; 8475 (2:4475) endchannel -SFX_Save_1_Ch2: ; 8494 (2:4494) +SFX_Save_1_Ch2: duty 2 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 2, 212, 1, 7 diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index 47142bb4..ad049ec6 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,4 +1,4 @@ -SFX_Save_3_Ch1: ; 7c45e (1f:445e) +SFX_Save_3_Ch1: duty 2 IF DEF(_RED) unknownsfx0x20 4, 244, 0, 7 @@ -16,7 +16,7 @@ ENDC endchannel -SFX_Save_3_Ch2: ; 7c475 (1f:4475) +SFX_Save_3_Ch2: duty 2 IF DEF(_RED) unknownsfx0x20 4, 8, 0, 0 diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index 2cb831c8..f8b8e285 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,4 +1,4 @@ -SFX_Shooting_Star_Ch1: ; 7c72d (1f:472d) +SFX_Shooting_Star_Ch1: dutycycle 228 unknownsfx0x10 47 unknownsfx0x20 4, 64, 224, 7 diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index 61ca1933..d69d60de 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,4 +1,4 @@ -SFX_Shrink_1_Ch1: ; 854e (2:454e) +SFX_Shrink_1_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index 59fe1556..e5c4b7af 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,4 +1,4 @@ -SFX_Shrink_3_Ch1: ; 7c52b (1f:452b) +SFX_Shrink_3_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index 66e4fe95..ad789af2 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,4 +1,4 @@ -SFX_Silph_Scope_Ch1: ; 20412 (8:4412) +SFX_Silph_Scope_Ch1: duty 0 unknownsfx0x20 0, 210, 0, 7 unknownsfx0x20 0, 210, 64, 7 diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index d122517d..d29529e9 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,4 +1,4 @@ -SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f) +SFX_Slots_New_Spin_Ch1: duty 3 unknownsfx0x20 5, 225, 0, 7 unknownsfx0x20 2, 225, 128, 7 @@ -6,7 +6,7 @@ SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f) endchannel -SFX_Slots_New_Spin_Ch2: ; 7c71e (1f:471e) +SFX_Slots_New_Spin_Ch2: duty 2 unknownsfx0x20 4, 193, 193, 6 unknownsfx0x20 2, 193, 65, 7 diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index 2400c0df..d7833f55 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,4 +1,4 @@ -SFX_Slots_Reward_Ch1: ; 7c704 (1f:4704) +SFX_Slots_Reward_Ch1: duty 2 unknownsfx0x20 2, 241, 0, 7 unknownsfx0x20 8, 129, 224, 7 diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index e67af4c4..00641a5e 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,4 +1,4 @@ -SFX_Slots_Stop_Wheel_Ch1: ; 7c6f5 (1f:46f5) +SFX_Slots_Stop_Wheel_Ch1: duty 2 unknownsfx0x20 1, 242, 160, 6 unknownsfx0x20 1, 242, 224, 6 diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm index 3aa0f74e..9f7b4138 100644 --- a/audio/sfx/snare1_1.asm +++ b/audio/sfx/snare1_1.asm @@ -1,3 +1,3 @@ -SFX_Snare1_1_Ch1: ; 82fd (2:42fd) +SFX_Snare1_1_Ch1: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm index 7d0c3413..55fdf84a 100644 --- a/audio/sfx/snare1_2.asm +++ b/audio/sfx/snare1_2.asm @@ -1,3 +1,3 @@ -SFX_Snare1_2_Ch1: ; 202fd (8:42fd) +SFX_Snare1_2_Ch1: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm index 8d92bff6..cab603c1 100644 --- a/audio/sfx/snare1_3.asm +++ b/audio/sfx/snare1_3.asm @@ -1,3 +1,3 @@ -SFX_Snare1_3_Ch1: ; 7c2fd (1f:42fd) +SFX_Snare1_3_Ch1: unknownnoise0x20 0, 193, 51 endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm index 7636a4f3..e40facb5 100644 --- a/audio/sfx/snare2_1.asm +++ b/audio/sfx/snare2_1.asm @@ -1,3 +1,3 @@ -SFX_Snare2_1_Ch1: ; 8301 (2:4301) +SFX_Snare2_1_Ch1: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm index 4c34e91a..82deb096 100644 --- a/audio/sfx/snare2_2.asm +++ b/audio/sfx/snare2_2.asm @@ -1,3 +1,3 @@ -SFX_Snare2_2_Ch1: ; 20301 (8:4301) +SFX_Snare2_2_Ch1: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm index eb816f54..fb5e1672 100644 --- a/audio/sfx/snare2_3.asm +++ b/audio/sfx/snare2_3.asm @@ -1,3 +1,3 @@ -SFX_Snare2_3_Ch1: ; 7c301 (1f:4301) +SFX_Snare2_3_Ch1: unknownnoise0x20 0, 177, 51 endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm index b7e319b2..c2b20add 100644 --- a/audio/sfx/snare3_1.asm +++ b/audio/sfx/snare3_1.asm @@ -1,3 +1,3 @@ -SFX_Snare3_1_Ch1: ; 8305 (2:4305) +SFX_Snare3_1_Ch1: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm index ce889e55..16f87fc5 100644 --- a/audio/sfx/snare3_2.asm +++ b/audio/sfx/snare3_2.asm @@ -1,3 +1,3 @@ -SFX_Snare3_2_Ch1: ; 20305 (8:4305) +SFX_Snare3_2_Ch1: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm index c94f436f..6b9a006f 100644 --- a/audio/sfx/snare3_3.asm +++ b/audio/sfx/snare3_3.asm @@ -1,3 +1,3 @@ -SFX_Snare3_3_Ch1: ; 7c305 (1f:4305) +SFX_Snare3_3_Ch1: unknownnoise0x20 0, 161, 51 endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm index 20c62731..2796410c 100644 --- a/audio/sfx/snare4_1.asm +++ b/audio/sfx/snare4_1.asm @@ -1,3 +1,3 @@ -SFX_Snare4_1_Ch1: ; 8309 (2:4309) +SFX_Snare4_1_Ch1: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm index da38dd62..920321ab 100644 --- a/audio/sfx/snare4_2.asm +++ b/audio/sfx/snare4_2.asm @@ -1,3 +1,3 @@ -SFX_Snare4_2_Ch1: ; 20309 (8:4309) +SFX_Snare4_2_Ch1: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm index 4496260b..a47c332c 100644 --- a/audio/sfx/snare4_3.asm +++ b/audio/sfx/snare4_3.asm @@ -1,3 +1,3 @@ -SFX_Snare4_3_Ch1: ; 7c309 (1f:4309) +SFX_Snare4_3_Ch1: unknownnoise0x20 0, 129, 51 endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm index e0ae8b4c..dd4eab3a 100644 --- a/audio/sfx/snare5_1.asm +++ b/audio/sfx/snare5_1.asm @@ -1,4 +1,4 @@ -SFX_Snare5_1_Ch1: ; 830d (2:430d) +SFX_Snare5_1_Ch1: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm index 649463cc..fad74021 100644 --- a/audio/sfx/snare5_2.asm +++ b/audio/sfx/snare5_2.asm @@ -1,4 +1,4 @@ -SFX_Snare5_2_Ch1: ; 2030d (8:430d) +SFX_Snare5_2_Ch1: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm index 33a169b9..d0ca1d91 100644 --- a/audio/sfx/snare5_3.asm +++ b/audio/sfx/snare5_3.asm @@ -1,4 +1,4 @@ -SFX_Snare5_3_Ch1: ; 7c30d (1f:430d) +SFX_Snare5_3_Ch1: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm index 4779226f..74bf01c7 100644 --- a/audio/sfx/snare6_1.asm +++ b/audio/sfx/snare6_1.asm @@ -1,3 +1,3 @@ -SFX_Snare6_1_Ch1: ; 832b (2:432b) +SFX_Snare6_1_Ch1: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm index 36359d02..0a96680e 100644 --- a/audio/sfx/snare6_2.asm +++ b/audio/sfx/snare6_2.asm @@ -1,3 +1,3 @@ -SFX_Snare6_2_Ch1: ; 2032b (8:432b) +SFX_Snare6_2_Ch1: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm index d4807ff6..f3130931 100644 --- a/audio/sfx/snare6_3.asm +++ b/audio/sfx/snare6_3.asm @@ -1,3 +1,3 @@ -SFX_Snare6_3_Ch1: ; 7c32b (1f:432b) +SFX_Snare6_3_Ch1: unknownnoise0x20 0, 129, 16 endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm index c53642ed..ef8f80ab 100644 --- a/audio/sfx/snare7_1.asm +++ b/audio/sfx/snare7_1.asm @@ -1,3 +1,3 @@ -SFX_Snare7_1_Ch1: ; 832f (2:432f) +SFX_Snare7_1_Ch1: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm index 066aaa53..5e266b12 100644 --- a/audio/sfx/snare7_2.asm +++ b/audio/sfx/snare7_2.asm @@ -1,3 +1,3 @@ -SFX_Snare7_2_Ch1: ; 2032f (8:432f) +SFX_Snare7_2_Ch1: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm index 1b058a9b..26db3703 100644 --- a/audio/sfx/snare7_3.asm +++ b/audio/sfx/snare7_3.asm @@ -1,3 +1,3 @@ -SFX_Snare7_3_Ch1: ; 7c32f (1f:432f) +SFX_Snare7_3_Ch1: unknownnoise0x20 0, 130, 35 endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm index 6269c7dc..5f624177 100644 --- a/audio/sfx/snare8_1.asm +++ b/audio/sfx/snare8_1.asm @@ -1,3 +1,3 @@ -SFX_Snare8_1_Ch1: ; 8333 (2:4333) +SFX_Snare8_1_Ch1: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm index 4c5bb18e..cf5d5654 100644 --- a/audio/sfx/snare8_2.asm +++ b/audio/sfx/snare8_2.asm @@ -1,3 +1,3 @@ -SFX_Snare8_2_Ch1: ; 20333 (8:4333) +SFX_Snare8_2_Ch1: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm index d1f0edc0..7da0e415 100644 --- a/audio/sfx/snare8_3.asm +++ b/audio/sfx/snare8_3.asm @@ -1,3 +1,3 @@ -SFX_Snare8_3_Ch1: ; 7c333 (1f:4333) +SFX_Snare8_3_Ch1: unknownnoise0x20 0, 130, 37 endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm index 44b2e8c7..c511cdaf 100644 --- a/audio/sfx/snare9_1.asm +++ b/audio/sfx/snare9_1.asm @@ -1,3 +1,3 @@ -SFX_Snare9_1_Ch1: ; 8337 (2:4337) +SFX_Snare9_1_Ch1: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm index 1d20de2d..db9aecf9 100644 --- a/audio/sfx/snare9_2.asm +++ b/audio/sfx/snare9_2.asm @@ -1,3 +1,3 @@ -SFX_Snare9_2_Ch1: ; 20337 (8:4337) +SFX_Snare9_2_Ch1: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm index 849f4404..18df2e46 100644 --- a/audio/sfx/snare9_3.asm +++ b/audio/sfx/snare9_3.asm @@ -1,3 +1,3 @@ -SFX_Snare9_3_Ch1: ; 7c337 (1f:4337) +SFX_Snare9_3_Ch1: unknownnoise0x20 0, 130, 38 endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index 3989c148..66c95262 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,4 +1,4 @@ -SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d) +SFX_SS_Anne_Horn_1_Ch1: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d) endchannel -SFX_SS_Anne_Horn_1_Ch2: ; 868c (2:468c) +SFX_SS_Anne_Horn_1_Ch2: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index c671b6cb..070f111c 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,4 +1,4 @@ -SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a) +SFX_SS_Anne_Horn_3_Ch1: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a) endchannel -SFX_SS_Anne_Horn_3_Ch2: ; 7c669 (1f:4669) +SFX_SS_Anne_Horn_3_Ch2: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index 350b08ce..f509326c 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_1_Ch1: ; 83c3 (2:43c3) +SFX_Start_Menu_1_Ch1: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm index aabd41ce..92bb7558 100644 --- a/audio/sfx/start_menu_2.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_2_Ch1: ; 203d6 (8:43d6) +SFX_Start_Menu_2_Ch1: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm index 566f11f4..74c82cf3 100644 --- a/audio/sfx/start_menu_3.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,4 +1,4 @@ -SFX_Start_Menu_3_Ch1: ; 7c3c3 (1f:43c3) +SFX_Start_Menu_3_Ch1: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index 6759ef6a..70d7014a 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ -SFX_Super_Effective_Ch1: ; 20574 (8:4574) +SFX_Super_Effective_Ch1: unknownnoise0x20 4, 241, 52 unknownnoise0x20 15, 242, 100 endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index c96d8522..782dd3fb 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,10 +1,10 @@ -SFX_Swap_1_Ch1: ; 83f8 (2:43f8) +SFX_Swap_1_Ch1: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_1_Ch2: ; 83ff (2:43ff) +SFX_Swap_1_Ch2: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 95aa3f19..4fc1db1d 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -1,10 +1,10 @@ -SFX_Swap_3_Ch1: ; 7c3e1 (1f:43e1) +SFX_Swap_3_Ch1: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_Swap_3_Ch2: ; 7c3e8 (1f:43e8) +SFX_Swap_3_Ch2: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index 040e95aa..ac9fb680 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,4 +1,4 @@ -SFX_Switch_1_Ch1: ; 8569 (2:4569) +SFX_Switch_1_Ch1: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index cbe6c8b2..81b68d26 100644 --- a/audio/sfx/switch_3.asm +++ b/audio/sfx/switch_3.asm @@ -1,4 +1,4 @@ -SFX_Switch_3_Ch1: ; 7c546 (1f:4546) +SFX_Switch_3_Ch1: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index f9fc5ee2..0522ee16 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter1_1_Ch1: ; 85b0 (2:45b0) +SFX_Teleport_Enter1_1_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index 24220173..6518e416 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter1_3_Ch1: ; 7c58d (1f:458d) +SFX_Teleport_Enter1_3_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index c3c593b2..338c1c30 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter2_1_Ch1: ; 85e1 (2:45e1) +SFX_Teleport_Enter2_1_Ch1: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index 628bb9fa..f6cd103c 100644 --- a/audio/sfx/teleport_enter2_3.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Enter2_3_Ch1: ; 7c5be (1f:45be) +SFX_Teleport_Enter2_3_Ch1: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index 46ba29cf..f916d539 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit1_1_Ch1: ; 8595 (2:4595) +SFX_Teleport_Exit1_1_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index 8d203212..67739bd1 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit1_3_Ch1: ; 7c572 (1f:4572) +SFX_Teleport_Exit1_3_Ch1: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 37159083..1e1de5a5 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit2_1_Ch1: ; 85cb (2:45cb) +SFX_Teleport_Exit2_1_Ch1: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index c7ad054b..928e486e 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,4 +1,4 @@ -SFX_Teleport_Exit2_3_Ch1: ; 7c5a8 (1f:45a8) +SFX_Teleport_Exit2_3_Ch1: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index a8099ae1..e6eff9ac 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,4 +1,4 @@ -SFX_Tink_1_Ch1: ; 840a (2:440a) +SFX_Tink_1_Ch1: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index cca37381..fa06cf19 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,4 +1,4 @@ -SFX_Tink_2_Ch1: ; 203dd (8:43dd) +SFX_Tink_2_Ch1: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index 7299b7ae..d786d289 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,4 +1,4 @@ -SFX_Tink_3_Ch1: ; 7c3f3 (1f:43f3) +SFX_Tink_3_Ch1: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index ce2bbc0a..87993851 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,4 +1,4 @@ -SFX_Trade_Machine_1_Ch1: ; 84ee (2:44ee) +SFX_Trade_Machine_1_Ch1: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index f7515ffb..6b70d5da 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,4 +1,4 @@ -SFX_Trade_Machine_3_Ch1: ; 7c4c7 (1f:44c7) +SFX_Trade_Machine_3_Ch1: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm index fded5b94..94b61fe1 100644 --- a/audio/sfx/triangle1_1.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_1_Ch1: ; 8320 (2:4320) +SFX_Triangle1_1_Ch1: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm index 4f4474ee..1c9c1d29 100644 --- a/audio/sfx/triangle1_2.asm +++ b/audio/sfx/triangle1_2.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_2_Ch1: ; 20320 (8:4320) +SFX_Triangle1_2_Ch1: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm index d1ad9390..b900da7c 100644 --- a/audio/sfx/triangle1_3.asm +++ b/audio/sfx/triangle1_3.asm @@ -1,3 +1,3 @@ -SFX_Triangle1_3_Ch1: ; 7c320 (1f:4320) +SFX_Triangle1_3_Ch1: unknownnoise0x20 0, 81, 42 endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm index f9c4bc6a..0f648237 100644 --- a/audio/sfx/triangle2_1.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_1_Ch1: ; 8324 (2:4324) +SFX_Triangle2_1_Ch1: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm index feddf1af..cbc2a642 100644 --- a/audio/sfx/triangle2_2.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_2_Ch1: ; 20324 (8:4324) +SFX_Triangle2_2_Ch1: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm index a4acff1b..44fc95dd 100644 --- a/audio/sfx/triangle2_3.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle2_3_Ch1: ; 7c324 (1f:4324) +SFX_Triangle2_3_Ch1: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm index e4c3c919..f5622bd7 100644 --- a/audio/sfx/triangle3_1.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_1_Ch1: ; 834e (2:434e) +SFX_Triangle3_1_Ch1: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm index 7a642878..8b0b76e5 100644 --- a/audio/sfx/triangle3_2.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_2_Ch1: ; 2034e (8:434e) +SFX_Triangle3_2_Ch1: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm index 73ad42ce..d40779fb 100644 --- a/audio/sfx/triangle3_3.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,4 +1,4 @@ -SFX_Triangle3_3_Ch1: ; 7c34e (1f:434e) +SFX_Triangle3_3_Ch1: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index 7b4e999d..ca29a4cc 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Turn_Off_PC_1_Ch1: ; 8528 (2:4528) +SFX_Turn_Off_PC_1_Ch1: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index 057ab9a4..2ae0787b 100644 --- a/audio/sfx/turn_off_pc_3.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Turn_Off_PC_3_Ch1: ; 7c505 (1f:4505) +SFX_Turn_Off_PC_3_Ch1: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index b537791c..22433707 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,4 +1,4 @@ -SFX_Turn_On_PC_1_Ch1: ; 84fd (2:44fd) +SFX_Turn_On_PC_1_Ch1: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index df654cfa..d97dc1c7 100644 --- a/audio/sfx/turn_on_pc_3.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,4 +1,4 @@ -SFX_Turn_On_PC_3_Ch1: ; 7c4d6 (1f:44d6) +SFX_Turn_On_PC_3_Ch1: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm index 1eca4432..7e0350d4 100755 --- a/audio/sfx/unused2_2.asm +++ b/audio/sfx/unused2_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused2_Ch1: ; 2232f (8:632f) +SFX_08_unused2_Ch1: executemusic tempo 256 volume 7, 7 @@ -17,7 +17,7 @@ SFX_08_unused2_Ch1: ; 2232f (8:632f) endchannel -SFX_08_unused2_Ch2: ; 22347 (8:6347) +SFX_08_unused2_Ch2: executemusic vibrato 8, 2, 7 duty 2 @@ -33,7 +33,7 @@ SFX_08_unused2_Ch2: ; 22347 (8:6347) endchannel -SFX_08_unused2_Ch3: ; 22359 (8:6359) +SFX_08_unused2_Ch3: executemusic notetype 6, 1, 0 octave 4 diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index bd9bdfb3..d0bbfd59 100755 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,4 +1,4 @@ -SFX_02_unused_Ch1: ; 86e3 (2:46e3) +SFX_02_unused_Ch1: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_02_unused_Ch1: ; 86e3 (2:46e3) endchannel -SFX_02_unused_Ch2: ; 86fe (2:46fe) +SFX_02_unused_Ch2: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_02_unused_Ch2: ; 86fe (2:46fe) endchannel -SFX_02_unused_Ch3: ; 8719 (2:4719) +SFX_02_unused_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index 25e4840c..fd491b71 100755 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused_Ch1: ; 2098b (8:498b) +SFX_08_unused_Ch1: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_08_unused_Ch1: ; 2098b (8:498b) endchannel -SFX_08_unused_Ch2: ; 209a6 (8:49a6) +SFX_08_unused_Ch2: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_08_unused_Ch2: ; 209a6 (8:49a6) endchannel -SFX_08_unused_Ch3: ; 209c1 (8:49c1) +SFX_08_unused_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index dfb16ee1..b00e55f5 100755 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,4 +1,4 @@ -SFX_1f_unused_Ch1: ; 7c758 (1f:4758) +SFX_1f_unused_Ch1: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_1f_unused_Ch1: ; 7c758 (1f:4758) endchannel -SFX_1f_unused_Ch2: ; 7c773 (1f:4773) +SFX_1f_unused_Ch2: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_1f_unused_Ch2: ; 7c773 (1f:4773) endchannel -SFX_1f_unused_Ch3: ; 7c78e (1f:478e) +SFX_1f_unused_Ch3: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index c1e610b6..a8445131 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,4 +1,4 @@ -SFX_Vine_Whip_Ch1: ; 20533 (8:4533) +SFX_Vine_Whip_Ch1: unknownnoise0x20 1, 194, 51 unknownnoise0x20 2, 242, 33 unknownnoise0x20 1, 226, 51 diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index bb7a8d6e..59827ceb 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,4 +1,4 @@ -SFX_Withdraw_Deposit_1_Ch1: ; 86ab (2:46ab) +SFX_Withdraw_Deposit_1_Ch1: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index 99e47fee..0add48e1 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,4 +1,4 @@ -SFX_Withdraw_Deposit_3_Ch1: ; 7c688 (1f:4688) +SFX_Withdraw_Deposit_3_Ch1: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 |