diff options
308 files changed, 2687 insertions, 2687 deletions
diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index f36f9e1e..ad75c503 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,11 +1,11 @@ SFX_59_1_Ch4: duty 2 - unknownsfx0x20 4, 241, 128, 7 + squarenote 4, 241, 128, 7 endchannel SFX_59_1_Ch5: duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 161, 97, 7 + squarenote 1, 8, 0, 0 + squarenote 4, 161, 97, 7 endchannel diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm index 559318ba..13a8a6e4 100644 --- a/audio/sfx/59_3.asm +++ b/audio/sfx/59_3.asm @@ -1,11 +1,11 @@ SFX_59_3_Ch4: duty 2 - unknownsfx0x20 4, 241, 128, 7 + squarenote 4, 241, 128, 7 endchannel SFX_59_3_Ch5: duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 161, 97, 7 + squarenote 1, 8, 0, 0 + squarenote 4, 161, 97, 7 endchannel diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index c9ef1564..90f62f8b 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,6 +1,6 @@ SFX_Arrow_Tiles_1_Ch4: duty 0 - unknownsfx0x10 23 - unknownsfx0x20 15, 210, 0, 7 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 210, 0, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm index f88b9c83..ac1c79ff 100644 --- a/audio/sfx/arrow_tiles_3.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,6 +1,6 @@ SFX_Arrow_Tiles_3_Ch4: duty 0 - unknownsfx0x10 23 - unknownsfx0x20 15, 210, 0, 7 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 210, 0, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 7068c66c..3596baba 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,11 +1,11 @@ SFX_Ball_Poof_Ch4: duty 2 - unknownsfx0x10 22 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 + pitchenvelope 22 + squarenote 15, 242, 0, 4 + pitchenvelope 8 endchannel SFX_Ball_Poof_Ch7: - unknownnoise0x20 15, 162, 34 + noisenote 15, 162, 34 endchannel diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index e9beac77..b41aaec7 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ SFX_Ball_Toss_Ch4: duty 2 - unknownsfx0x10 47 - unknownsfx0x20 15, 242, 128, 7 + pitchenvelope 47 + squarenote 15, 242, 128, 7 endchannel SFX_Ball_Toss_Ch5: duty 2 - unknownsfx0x20 15, 194, 130, 7 + squarenote 15, 194, 130, 7 endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 11f156cb..3ab973e1 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,6 +1,6 @@ SFX_Battle_09_Ch4: duty 1 - unknownsfx0x10 151 - unknownsfx0x20 15, 242, 0, 5 - unknownsfx0x10 8 + pitchenvelope 151 + squarenote 15, 242, 0, 5 + pitchenvelope 8 endchannel diff --git a/audio/sfx/battle_0b.asm b/audio/sfx/battle_0b.asm index d6feba8e..83420396 100644 --- a/audio/sfx/battle_0b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,3 +1,3 @@ SFX_Battle_0B_Ch7: - unknownnoise0x20 8, 241, 84 + noisenote 8, 241, 84 endchannel diff --git a/audio/sfx/battle_0c.asm b/audio/sfx/battle_0c.asm index f193fc20..5c2b40f8 100644 --- a/audio/sfx/battle_0c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,5 +1,5 @@ SFX_Battle_0C_Ch7: - unknownnoise0x20 15, 143, 17 - unknownnoise0x20 4, 255, 18 - unknownnoise0x20 10, 241, 85 + noisenote 15, 143, 17 + noisenote 4, 255, 18 + noisenote 10, 241, 85 endchannel diff --git a/audio/sfx/battle_0d.asm b/audio/sfx/battle_0d.asm index f9d423ad..7460238e 100644 --- a/audio/sfx/battle_0d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,5 +1,5 @@ SFX_Battle_0D_Ch7: - unknownnoise0x20 15, 143, 52 - unknownnoise0x20 8, 242, 53 - unknownnoise0x20 10, 241, 85 + noisenote 15, 143, 52 + noisenote 8, 242, 53 + noisenote 10, 241, 85 endchannel diff --git a/audio/sfx/battle_0e.asm b/audio/sfx/battle_0e.asm index 92a660b2..7c7bebf0 100644 --- a/audio/sfx/battle_0e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,4 +1,4 @@ SFX_Battle_0E_Ch7: - unknownnoise0x20 15, 159, 35 - unknownnoise0x20 8, 241, 33 + noisenote 15, 159, 35 + noisenote 8, 241, 33 endchannel diff --git a/audio/sfx/battle_0f.asm b/audio/sfx/battle_0f.asm index 846a9053..124a9a1d 100644 --- a/audio/sfx/battle_0f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,6 +1,6 @@ SFX_Battle_0F_Ch7: - unknownnoise0x20 2, 225, 75 - unknownnoise0x20 10, 241, 68 - unknownnoise0x20 2, 225, 58 - unknownnoise0x20 6, 241, 52 + noisenote 2, 225, 75 + noisenote 10, 241, 68 + noisenote 2, 225, 58 + noisenote 6, 241, 52 endchannel diff --git a/audio/sfx/battle_12.asm b/audio/sfx/battle_12.asm index 77be75c0..680a93b8 100644 --- a/audio/sfx/battle_12.asm +++ b/audio/sfx/battle_12.asm @@ -1,6 +1,6 @@ SFX_Battle_12_Ch7: - unknownnoise0x20 8, 79, 35 - unknownnoise0x20 4, 196, 34 - unknownnoise0x20 6, 242, 35 + noisenote 8, 79, 35 + noisenote 4, 196, 34 + noisenote 6, 242, 35 loopchannel 4, SFX_Battle_12_Ch7 endchannel diff --git a/audio/sfx/battle_13.asm b/audio/sfx/battle_13.asm index 81e1a0ef..252da5f3 100644 --- a/audio/sfx/battle_13.asm +++ b/audio/sfx/battle_13.asm @@ -1,6 +1,6 @@ SFX_Battle_13_Ch7: - unknownnoise0x20 8, 79, 51 - unknownnoise0x20 4, 196, 34 - unknownnoise0x20 6, 242, 35 - unknownnoise0x20 15, 242, 34 + noisenote 8, 79, 51 + noisenote 4, 196, 34 + noisenote 6, 242, 35 + noisenote 15, 242, 34 endchannel diff --git a/audio/sfx/battle_14.asm b/audio/sfx/battle_14.asm index 8cecfb37..8aa099bf 100644 --- a/audio/sfx/battle_14.asm +++ b/audio/sfx/battle_14.asm @@ -1,6 +1,6 @@ SFX_Battle_14_Ch7: - unknownnoise0x20 8, 255, 50 - unknownnoise0x20 8, 244, 67 - unknownnoise0x20 8, 242, 84 - unknownnoise0x20 8, 241, 101 + noisenote 8, 255, 50 + noisenote 8, 244, 67 + noisenote 8, 242, 84 + noisenote 8, 241, 101 endchannel diff --git a/audio/sfx/battle_16.asm b/audio/sfx/battle_16.asm index dcc7014d..79c685b0 100644 --- a/audio/sfx/battle_16.asm +++ b/audio/sfx/battle_16.asm @@ -1,5 +1,5 @@ SFX_Battle_16_Ch7: - unknownnoise0x20 1, 148, 35 - unknownnoise0x20 1, 180, 34 - unknownnoise0x20 8, 241, 68 + noisenote 1, 148, 35 + noisenote 1, 180, 34 + noisenote 8, 241, 68 endchannel diff --git a/audio/sfx/battle_17.asm b/audio/sfx/battle_17.asm index 82bb2117..5164fdd6 100644 --- a/audio/sfx/battle_17.asm +++ b/audio/sfx/battle_17.asm @@ -1,6 +1,6 @@ SFX_Battle_17_Ch7: - unknownnoise0x20 2, 148, 51 - unknownnoise0x20 4, 180, 34 - unknownnoise0x20 4, 241, 68 - unknownnoise0x20 8, 241, 85 + noisenote 2, 148, 51 + noisenote 4, 180, 34 + noisenote 4, 241, 68 + noisenote 8, 241, 85 endchannel diff --git a/audio/sfx/battle_18.asm b/audio/sfx/battle_18.asm index 14aac5c1..eb6ff32c 100644 --- a/audio/sfx/battle_18.asm +++ b/audio/sfx/battle_18.asm @@ -1,4 +1,4 @@ SFX_Battle_18_Ch7: - unknownnoise0x20 4, 255, 85 - unknownnoise0x20 8, 241, 101 + noisenote 4, 255, 85 + noisenote 8, 241, 101 endchannel diff --git a/audio/sfx/battle_19.asm b/audio/sfx/battle_19.asm index 6bc1804d..47f742e4 100644 --- a/audio/sfx/battle_19.asm +++ b/audio/sfx/battle_19.asm @@ -1,5 +1,5 @@ SFX_Battle_19_Ch7: - unknownnoise0x20 2, 132, 67 - unknownnoise0x20 2, 196, 34 - unknownnoise0x20 8, 242, 52 + noisenote 2, 132, 67 + noisenote 2, 196, 34 + noisenote 8, 242, 52 endchannel diff --git a/audio/sfx/battle_1b.asm b/audio/sfx/battle_1b.asm index a4d8992b..694c90a5 100644 --- a/audio/sfx/battle_1b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,4 +1,4 @@ SFX_Battle_1B_Ch7: - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 15, 242, 18 + noisenote 2, 241, 34 + noisenote 15, 242, 18 endchannel diff --git a/audio/sfx/battle_1c.asm b/audio/sfx/battle_1c.asm index 05cdd091..cb87f3d5 100644 --- a/audio/sfx/battle_1c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,5 +1,5 @@ SFX_Battle_1C_Ch7: - unknownnoise0x20 2, 194, 1 - unknownnoise0x20 15, 244, 1 - unknownnoise0x20 15, 242, 1 + noisenote 2, 194, 1 + noisenote 15, 244, 1 + noisenote 15, 242, 1 endchannel diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index 8d3f4745..eaea0543 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,16 +1,16 @@ SFX_Battle_1E_Ch4: duty 0 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 + pitchenvelope 58 + squarenote 4, 242, 0, 2 + pitchenvelope 34 + squarenote 8, 226, 0, 2 + pitchenvelope 8 endchannel SFX_Battle_1E_Ch7: - unknownnoise0x20 0, 209, 66 - unknownnoise0x20 4, 161, 50 - unknownnoise0x20 0, 209, 34 - unknownnoise0x20 6, 161, 50 + noisenote 0, 209, 66 + noisenote 4, 161, 50 + noisenote 0, 209, 34 + noisenote 6, 161, 50 endchannel diff --git a/audio/sfx/battle_20.asm b/audio/sfx/battle_20.asm index f7413e63..b80c1e03 100644 --- a/audio/sfx/battle_20.asm +++ b/audio/sfx/battle_20.asm @@ -1,4 +1,4 @@ SFX_Battle_20_Ch7: - unknownnoise0x20 12, 241, 84 - unknownnoise0x20 8, 241, 100 + noisenote 12, 241, 84 + noisenote 8, 241, 100 endchannel diff --git a/audio/sfx/battle_21.asm b/audio/sfx/battle_21.asm index a6b63a6c..954a3091 100644 --- a/audio/sfx/battle_21.asm +++ b/audio/sfx/battle_21.asm @@ -1,7 +1,7 @@ SFX_Battle_21_Ch7: - unknownnoise0x20 2, 241, 51 - unknownnoise0x20 2, 193, 50 - unknownnoise0x20 2, 161, 49 - unknownnoise0x20 15, 130, 50 - unknownnoise0x20 8, 241, 52 + noisenote 2, 241, 51 + noisenote 2, 193, 50 + noisenote 2, 161, 49 + noisenote 15, 130, 50 + noisenote 8, 241, 52 endchannel diff --git a/audio/sfx/battle_22.asm b/audio/sfx/battle_22.asm index 6a20c3ae..82022661 100644 --- a/audio/sfx/battle_22.asm +++ b/audio/sfx/battle_22.asm @@ -1,4 +1,4 @@ SFX_Battle_22_Ch7: - unknownnoise0x20 2, 210, 50 - unknownnoise0x20 15, 242, 67 + noisenote 2, 210, 50 + noisenote 15, 242, 67 endchannel diff --git a/audio/sfx/battle_23.asm b/audio/sfx/battle_23.asm index e532cf08..e8214c80 100644 --- a/audio/sfx/battle_23.asm +++ b/audio/sfx/battle_23.asm @@ -1,7 +1,7 @@ SFX_Battle_23_Ch7: - unknownnoise0x20 2, 242, 67 - unknownnoise0x20 4, 181, 50 - unknownnoise0x20 9, 134, 49 - unknownnoise0x20 7, 100, 0 - unknownnoise0x20 15, 242, 85 + noisenote 2, 242, 67 + noisenote 4, 181, 50 + noisenote 9, 134, 49 + noisenote 7, 100, 0 + noisenote 15, 242, 85 endchannel diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 46e9d29f..95765daf 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,12 +1,12 @@ SFX_Battle_24_Ch4: duty 1 - unknownsfx0x10 151 - unknownsfx0x20 15, 242, 0, 7 - unknownsfx0x10 8 + pitchenvelope 151 + squarenote 15, 242, 0, 7 + pitchenvelope 8 endchannel SFX_Battle_24_Ch7: - unknownnoise0x20 15, 63, 34 - unknownnoise0x20 15, 242, 33 + noisenote 15, 63, 34 + noisenote 15, 242, 33 endchannel diff --git a/audio/sfx/battle_25.asm b/audio/sfx/battle_25.asm index 3a46e505..70612976 100644 --- a/audio/sfx/battle_25.asm +++ b/audio/sfx/battle_25.asm @@ -1,7 +1,7 @@ SFX_Battle_25_Ch7: - unknownnoise0x20 15, 79, 65 - unknownnoise0x20 8, 143, 65 - unknownnoise0x20 8, 207, 65 - unknownnoise0x20 8, 242, 66 - unknownnoise0x20 15, 242, 65 + noisenote 15, 79, 65 + noisenote 8, 143, 65 + noisenote 8, 207, 65 + noisenote 8, 242, 66 + noisenote 15, 242, 65 endchannel diff --git a/audio/sfx/battle_26.asm b/audio/sfx/battle_26.asm index ce1ac2f9..08837de3 100644 --- a/audio/sfx/battle_26.asm +++ b/audio/sfx/battle_26.asm @@ -1,9 +1,9 @@ SFX_Battle_26_Ch7: - unknownnoise0x20 10, 255, 80 - unknownnoise0x20 15, 255, 81 - unknownnoise0x20 8, 242, 81 - unknownnoise0x20 6, 255, 82 - unknownnoise0x20 6, 255, 83 - unknownnoise0x20 8, 255, 84 - unknownnoise0x20 15, 242, 84 + noisenote 10, 255, 80 + noisenote 15, 255, 81 + noisenote 8, 242, 81 + noisenote 6, 255, 82 + noisenote 6, 255, 83 + noisenote 8, 255, 84 + noisenote 15, 242, 84 endchannel diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index 1e662c29..f4e9f2e3 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,27 +1,27 @@ SFX_Battle_27_Ch4: duty 2 - unknownsfx0x20 15, 63, 192, 7 + squarenote 15, 63, 192, 7 SFX_Battle_27_branch_2062a: - unknownsfx0x20 15, 223, 192, 7 + squarenote 15, 223, 192, 7 loopchannel 4, SFX_Battle_27_branch_2062a - unknownsfx0x20 15, 209, 192, 7 + squarenote 15, 209, 192, 7 endchannel SFX_Battle_27_Ch5: dutycycle 179 - unknownsfx0x20 15, 47, 200, 7 + squarenote 15, 47, 200, 7 SFX_Battle_27_branch_2063d: - unknownsfx0x20 15, 207, 199, 7 + squarenote 15, 207, 199, 7 loopchannel 4, SFX_Battle_27_branch_2063d - unknownsfx0x20 15, 193, 200, 7 + squarenote 15, 193, 200, 7 endchannel SFX_Battle_27_Ch7: - unknownnoise0x20 3, 151, 18 - unknownnoise0x20 3, 161, 17 + noisenote 3, 151, 18 + noisenote 3, 161, 17 loopchannel 10, SFX_Battle_27_Ch7 endchannel diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index 298ddb7a..cb96b5ca 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,21 +1,21 @@ SFX_Battle_28_Ch4: duty 0 - unknownsfx0x20 0, 241, 192, 7 - unknownsfx0x20 0, 241, 0, 7 + squarenote 0, 241, 192, 7 + squarenote 0, 241, 0, 7 loopchannel 12, SFX_Battle_28_Ch4 endchannel SFX_Battle_28_Ch5: dutycycle 179 - unknownsfx0x20 0, 225, 193, 7 - unknownsfx0x20 0, 225, 1, 7 + squarenote 0, 225, 193, 7 + squarenote 0, 225, 1, 7 loopchannel 12, SFX_Battle_28_Ch5 endchannel SFX_Battle_28_Ch7: - unknownnoise0x20 1, 209, 73 - unknownnoise0x20 1, 209, 41 + noisenote 1, 209, 73 + noisenote 1, 209, 41 loopchannel 6, SFX_Battle_28_Ch7 endchannel diff --git a/audio/sfx/battle_29.asm b/audio/sfx/battle_29.asm index e36c18dc..a873eed8 100644 --- a/audio/sfx/battle_29.asm +++ b/audio/sfx/battle_29.asm @@ -1,18 +1,18 @@ SFX_Battle_29_Ch4: dutycycle 201 - unknownsfx0x20 11, 243, 32, 1 - unknownsfx0x20 9, 211, 80, 1 + squarenote 11, 243, 32, 1 + squarenote 9, 211, 80, 1 loopchannel 5, SFX_Battle_29_Ch4 - unknownsfx0x20 8, 227, 48, 1 - unknownsfx0x20 15, 194, 16, 1 + squarenote 8, 227, 48, 1 + squarenote 15, 194, 16, 1 endchannel SFX_Battle_29_Ch7: - unknownnoise0x20 10, 243, 53 - unknownnoise0x20 14, 246, 69 + noisenote 10, 243, 53 + noisenote 14, 246, 69 loopchannel 4, SFX_Battle_29_Ch7 - unknownnoise0x20 12, 244, 188 - unknownnoise0x20 12, 245, 156 - unknownnoise0x20 15, 244, 172 + noisenote 12, 244, 188 + noisenote 12, 245, 156 + noisenote 15, 244, 172 endchannel diff --git a/audio/sfx/battle_2a.asm b/audio/sfx/battle_2a.asm index 710a45f1..2168f90d 100644 --- a/audio/sfx/battle_2a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,28 +1,28 @@ SFX_Battle_2A_Ch4: dutycycle 57 - unknownsfx0x20 4, 244, 0, 6 - unknownsfx0x20 3, 196, 0, 5 - unknownsfx0x20 5, 181, 0, 6 - unknownsfx0x20 13, 226, 192, 6 + squarenote 4, 244, 0, 6 + squarenote 3, 196, 0, 5 + squarenote 5, 181, 0, 6 + squarenote 13, 226, 192, 6 loopchannel 3, SFX_Battle_2A_Ch4 - unknownsfx0x20 8, 209, 0, 6 + squarenote 8, 209, 0, 6 endchannel SFX_Battle_2A_Ch5: dutycycle 141 - unknownsfx0x20 5, 228, 224, 5 - unknownsfx0x20 4, 180, 224, 4 - unknownsfx0x20 6, 165, 232, 5 - unknownsfx0x20 14, 209, 160, 6 + squarenote 5, 228, 224, 5 + squarenote 4, 180, 224, 4 + squarenote 6, 165, 232, 5 + squarenote 14, 209, 160, 6 loopchannel 3, SFX_Battle_2A_Ch5 endchannel SFX_Battle_2A_Ch7: - unknownnoise0x20 5, 195, 51 - unknownnoise0x20 3, 146, 67 - unknownnoise0x20 10, 181, 51 - unknownnoise0x20 15, 195, 50 + noisenote 5, 195, 51 + noisenote 3, 146, 67 + noisenote 10, 181, 51 + noisenote 15, 195, 50 loopchannel 2, SFX_Battle_2A_Ch7 endchannel diff --git a/audio/sfx/battle_2b.asm b/audio/sfx/battle_2b.asm index da57c7a7..94d11f3f 100644 --- a/audio/sfx/battle_2b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,21 +1,21 @@ SFX_Battle_2B_Ch4: dutycycle 210 - unknownsfx0x20 3, 129, 0, 3 - unknownsfx0x20 3, 193, 0, 4 - unknownsfx0x20 3, 241, 0, 5 - unknownsfx0x20 3, 177, 0, 4 - unknownsfx0x20 3, 113, 0, 3 + squarenote 3, 129, 0, 3 + squarenote 3, 193, 0, 4 + squarenote 3, 241, 0, 5 + squarenote 3, 177, 0, 4 + squarenote 3, 113, 0, 3 loopchannel 5, SFX_Battle_2B_Ch4 - unknownsfx0x20 8, 129, 0, 4 + squarenote 8, 129, 0, 4 endchannel SFX_Battle_2B_Ch7: - unknownnoise0x20 3, 98, 34 - unknownnoise0x20 3, 162, 50 - unknownnoise0x20 3, 210, 51 - unknownnoise0x20 3, 146, 35 - unknownnoise0x20 3, 82, 18 + noisenote 3, 98, 34 + noisenote 3, 162, 50 + noisenote 3, 210, 51 + noisenote 3, 146, 35 + noisenote 3, 82, 18 loopchannel 5, SFX_Battle_2B_Ch7 - unknownnoise0x20 8, 129, 18 + noisenote 8, 129, 18 endchannel diff --git a/audio/sfx/battle_2c.asm b/audio/sfx/battle_2c.asm index 2f8bdc49..63be0d0f 100644 --- a/audio/sfx/battle_2c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,25 +1,25 @@ SFX_Battle_2C_Ch4: dutycycle 57 - unknownsfx0x20 15, 244, 0, 5 - unknownsfx0x20 15, 196, 0, 4 - unknownsfx0x20 15, 226, 192, 5 + squarenote 15, 244, 0, 5 + squarenote 15, 196, 0, 4 + squarenote 15, 226, 192, 5 loopchannel 3, SFX_Battle_2C_Ch4 endchannel SFX_Battle_2C_Ch5: dutycycle 141 - unknownsfx0x20 7, 228, 48, 4 - unknownsfx0x20 15, 180, 48, 3 - unknownsfx0x20 15, 162, 56, 4 + squarenote 7, 228, 48, 4 + squarenote 15, 180, 48, 3 + squarenote 15, 162, 56, 4 loopchannel 4, SFX_Battle_2C_Ch5 endchannel SFX_Battle_2C_Ch7: - unknownnoise0x20 9, 244, 68 - unknownnoise0x20 9, 242, 67 - unknownnoise0x20 15, 244, 66 - unknownnoise0x20 15, 244, 65 + noisenote 9, 244, 68 + noisenote 9, 242, 67 + noisenote 15, 244, 66 + noisenote 15, 244, 65 loopchannel 3, SFX_Battle_2C_Ch7 endchannel diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index 20c86033..a1f8916b 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,27 +1,27 @@ SFX_Battle_2E_Ch4: duty 0 - unknownsfx0x20 2, 241, 0, 2 - unknownsfx0x20 3, 241, 0, 7 - unknownsfx0x20 4, 241, 0, 5 - unknownsfx0x20 5, 241, 240, 7 + squarenote 2, 241, 0, 2 + squarenote 3, 241, 0, 7 + squarenote 4, 241, 0, 5 + squarenote 5, 241, 240, 7 loopchannel 8, SFX_Battle_2E_Ch4 endchannel SFX_Battle_2E_Ch5: dutycycle 179 - unknownsfx0x20 2, 225, 2, 3 - unknownsfx0x20 3, 225, 242, 7 - unknownsfx0x20 4, 225, 2, 6 - unknownsfx0x20 5, 225, 2, 7 + squarenote 2, 225, 2, 3 + squarenote 3, 225, 242, 7 + squarenote 4, 225, 2, 6 + squarenote 5, 225, 2, 7 loopchannel 8, SFX_Battle_2E_Ch5 endchannel SFX_Battle_2E_Ch7: - unknownnoise0x20 2, 211, 16 - unknownnoise0x20 3, 211, 17 - unknownnoise0x20 2, 210, 16 - unknownnoise0x20 5, 210, 18 + noisenote 2, 211, 16 + noisenote 3, 211, 17 + noisenote 2, 210, 16 + noisenote 5, 210, 18 loopchannel 9, SFX_Battle_2E_Ch7 endchannel diff --git a/audio/sfx/battle_2f.asm b/audio/sfx/battle_2f.asm index fb4c7a14..2fde88a8 100644 --- a/audio/sfx/battle_2f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,21 +1,21 @@ SFX_Battle_2F_Ch4: dutycycle 43 - unknownsfx0x20 3, 241, 240, 7 - unknownsfx0x20 4, 242, 0, 2 + squarenote 3, 241, 240, 7 + squarenote 4, 242, 0, 2 loopchannel 8, SFX_Battle_2F_Ch4 endchannel SFX_Battle_2F_Ch5: dutycycle 179 - unknownsfx0x20 4, 226, 2, 2 - unknownsfx0x20 4, 225, 226, 7 + squarenote 4, 226, 2, 2 + squarenote 4, 225, 226, 7 loopchannel 9, SFX_Battle_2F_Ch5 endchannel SFX_Battle_2F_Ch7: - unknownnoise0x20 4, 255, 67 - unknownnoise0x20 4, 242, 68 + noisenote 4, 255, 67 + noisenote 4, 242, 68 loopchannel 9, SFX_Battle_2F_Ch7 endchannel diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index cc1169eb..09b08271 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,18 +1,18 @@ SFX_Battle_31_Ch4: duty 2 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 255, 224, 7 - unknownsfx0x20 15, 242, 224, 7 + squarenote 15, 255, 224, 7 + squarenote 15, 255, 224, 7 + squarenote 15, 255, 224, 7 + squarenote 15, 255, 224, 7 + squarenote 15, 242, 224, 7 endchannel SFX_Battle_31_Ch5: duty 3 - unknownsfx0x20 15, 255, 226, 7 - unknownsfx0x20 15, 255, 225, 7 - unknownsfx0x20 15, 255, 226, 7 - unknownsfx0x20 15, 255, 225, 7 - unknownsfx0x20 15, 242, 226, 7 + squarenote 15, 255, 226, 7 + squarenote 15, 255, 225, 7 + squarenote 15, 255, 226, 7 + squarenote 15, 255, 225, 7 + squarenote 15, 242, 226, 7 endchannel diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index c7bff4b2..28084fe5 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,12 +1,12 @@ SFX_Battle_32_Ch4: duty 2 - unknownsfx0x10 175 - unknownsfx0x20 8, 241, 0, 7 - unknownsfx0x10 8 + pitchenvelope 175 + squarenote 8, 241, 0, 7 + pitchenvelope 8 endchannel SFX_Battle_32_Ch5: duty 3 - unknownsfx0x20 8, 241, 1, 7 + squarenote 8, 241, 1, 7 endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index c92b5482..740b8b43 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,18 +1,18 @@ SFX_Battle_33_Ch4: duty 2 - unknownsfx0x20 6, 241, 0, 5 - unknownsfx0x20 6, 241, 128, 5 - unknownsfx0x20 6, 241, 0, 6 - unknownsfx0x20 6, 241, 128, 6 - unknownsfx0x20 8, 241, 0, 7 + squarenote 6, 241, 0, 5 + squarenote 6, 241, 128, 5 + squarenote 6, 241, 0, 6 + squarenote 6, 241, 128, 6 + squarenote 8, 241, 0, 7 endchannel SFX_Battle_33_Ch5: duty 3 - unknownsfx0x20 6, 225, 16, 5 - unknownsfx0x20 6, 225, 144, 5 - unknownsfx0x20 6, 225, 16, 6 - unknownsfx0x20 6, 225, 144, 6 - unknownsfx0x20 8, 225, 16, 7 + squarenote 6, 225, 16, 5 + squarenote 6, 225, 144, 5 + squarenote 6, 225, 16, 6 + squarenote 6, 225, 144, 6 + squarenote 8, 225, 16, 7 endchannel diff --git a/audio/sfx/battle_34.asm b/audio/sfx/battle_34.asm index 38576ecb..329c941b 100644 --- a/audio/sfx/battle_34.asm +++ b/audio/sfx/battle_34.asm @@ -1,22 +1,22 @@ SFX_Battle_34_Ch4: dutycycle 237 - unknownsfx0x20 8, 255, 248, 3 - unknownsfx0x20 15, 255, 0, 4 - unknownsfx0x20 15, 243, 0, 4 + squarenote 8, 255, 248, 3 + squarenote 15, 255, 0, 4 + squarenote 15, 243, 0, 4 endchannel SFX_Battle_34_Ch5: dutycycle 180 - unknownsfx0x20 8, 239, 192, 3 - unknownsfx0x20 15, 239, 192, 3 - unknownsfx0x20 15, 227, 192, 3 + squarenote 8, 239, 192, 3 + squarenote 15, 239, 192, 3 + squarenote 15, 227, 192, 3 endchannel SFX_Battle_34_Ch7: - unknownnoise0x20 4, 255, 81 - unknownnoise0x20 8, 255, 84 - unknownnoise0x20 15, 255, 85 - unknownnoise0x20 15, 243, 86 + noisenote 4, 255, 81 + noisenote 8, 255, 84 + noisenote 15, 255, 85 + noisenote 15, 243, 86 endchannel diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index df23fb37..983687e3 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,47 +1,47 @@ SFX_Battle_36_Ch4: duty 0 - unknownsfx0x20 2, 241, 128, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 144, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 160, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 176, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 192, 7 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 208, 7 + squarenote 2, 241, 128, 7 + squarenote 2, 241, 0, 7 + squarenote 2, 241, 144, 7 + squarenote 2, 241, 0, 7 + squarenote 2, 241, 160, 7 + squarenote 2, 241, 0, 7 + squarenote 2, 241, 176, 7 + squarenote 2, 241, 0, 7 + squarenote 2, 241, 192, 7 + squarenote 2, 241, 0, 7 + squarenote 2, 241, 208, 7 SFX_Battle_36_branch_20930: - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 2, 241, 224, 7 + squarenote 2, 241, 0, 7 + squarenote 2, 241, 224, 7 loopchannel 12, SFX_Battle_36_branch_20930 - unknownsfx0x20 15, 241, 0, 7 + squarenote 15, 241, 0, 7 endchannel SFX_Battle_36_Ch5: dutycycle 179 - unknownsfx0x20 2, 241, 129, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 145, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 161, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 177, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 193, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 209, 7 - unknownsfx0x20 2, 241, 1, 7 - unknownsfx0x20 2, 241, 225, 7 + squarenote 2, 241, 129, 7 + squarenote 2, 241, 1, 7 + squarenote 2, 241, 145, 7 + squarenote 2, 241, 1, 7 + squarenote 2, 241, 161, 7 + squarenote 2, 241, 1, 7 + squarenote 2, 241, 177, 7 + squarenote 2, 241, 1, 7 + squarenote 2, 241, 193, 7 + squarenote 2, 241, 1, 7 + squarenote 2, 241, 209, 7 + squarenote 2, 241, 1, 7 + squarenote 2, 241, 225, 7 loopchannel 12, SFX_Battle_36_branch_20930 - unknownsfx0x20 15, 241, 1, 7 + squarenote 15, 241, 1, 7 endchannel SFX_Battle_36_Ch7: - unknownnoise0x20 1, 209, 73 - unknownnoise0x20 1, 209, 41 + noisenote 1, 209, 73 + noisenote 1, 209, 41 loopchannel 26, SFX_Battle_36_Ch7 endchannel diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index 241a5e68..41e99a35 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,6 +1,6 @@ SFX_Collision_1_Ch4: duty 2 - unknownsfx0x10 90 - unknownsfx0x20 15, 241, 0, 3 - unknownsfx0x10 8 + pitchenvelope 90 + squarenote 15, 241, 0, 3 + pitchenvelope 8 endchannel diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm index 649792eb..aa741e0e 100644 --- a/audio/sfx/collision_3.asm +++ b/audio/sfx/collision_3.asm @@ -1,6 +1,6 @@ SFX_Collision_3_Ch4: duty 2 - unknownsfx0x10 90 - unknownsfx0x20 15, 241, 0, 3 - unknownsfx0x10 8 + pitchenvelope 90 + squarenote 15, 241, 0, 3 + pitchenvelope 8 endchannel diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm index 98920dfc..bc4e64aa 100644 --- a/audio/sfx/cry00_1.asm +++ b/audio/sfx/cry00_1.asm @@ -1,21 +1,21 @@ SFX_Cry00_1_Ch4: dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 + squarenote 4, 243, 24, 7 + squarenote 15, 229, 152, 7 + squarenote 8, 145, 88, 7 endchannel SFX_Cry00_1_Ch5: dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 + squarenote 5, 179, 8, 7 + squarenote 15, 197, 136, 7 + squarenote 8, 113, 72, 7 endchannel SFX_Cry00_1_Ch7: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 + noisenote 3, 161, 28 + noisenote 14, 148, 44 + noisenote 8, 129, 28 endchannel diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm index 17a9207e..37e2a7b3 100644 --- a/audio/sfx/cry00_2.asm +++ b/audio/sfx/cry00_2.asm @@ -1,21 +1,21 @@ SFX_Cry00_2_Ch4: dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 + squarenote 4, 243, 24, 7 + squarenote 15, 229, 152, 7 + squarenote 8, 145, 88, 7 endchannel SFX_Cry00_2_Ch5: dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 + squarenote 5, 179, 8, 7 + squarenote 15, 197, 136, 7 + squarenote 8, 113, 72, 7 endchannel SFX_Cry00_2_Ch7: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 + noisenote 3, 161, 28 + noisenote 14, 148, 44 + noisenote 8, 129, 28 endchannel diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm index 81ad7edf..3a434193 100644 --- a/audio/sfx/cry00_3.asm +++ b/audio/sfx/cry00_3.asm @@ -1,21 +1,21 @@ SFX_Cry00_3_Ch4: dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 + squarenote 4, 243, 24, 7 + squarenote 15, 229, 152, 7 + squarenote 8, 145, 88, 7 endchannel SFX_Cry00_3_Ch5: dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 + squarenote 5, 179, 8, 7 + squarenote 15, 197, 136, 7 + squarenote 8, 113, 72, 7 endchannel SFX_Cry00_3_Ch7: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 + noisenote 3, 161, 28 + noisenote 14, 148, 44 + noisenote 8, 129, 28 endchannel diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm index 392adbe3..56b8d441 100644 --- a/audio/sfx/cry01_1.asm +++ b/audio/sfx/cry01_1.asm @@ -1,24 +1,24 @@ SFX_Cry01_1_Ch4: dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 + squarenote 4, 243, 0, 6 + squarenote 8, 213, 96, 7 + squarenote 3, 226, 32, 7 + squarenote 8, 209, 16, 7 endchannel SFX_Cry01_1_Ch5: dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 + squarenote 5, 179, 241, 6 + squarenote 7, 197, 82, 7 + squarenote 3, 162, 17, 7 + squarenote 8, 177, 1, 6 endchannel SFX_Cry01_1_Ch7: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 + noisenote 3, 162, 60 + noisenote 12, 148, 44 + noisenote 3, 130, 28 + noisenote 8, 113, 44 endchannel diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm index a7397fd8..43db8130 100644 --- a/audio/sfx/cry01_2.asm +++ b/audio/sfx/cry01_2.asm @@ -1,24 +1,24 @@ SFX_Cry01_2_Ch4: dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 + squarenote 4, 243, 0, 6 + squarenote 8, 213, 96, 7 + squarenote 3, 226, 32, 7 + squarenote 8, 209, 16, 7 endchannel SFX_Cry01_2_Ch5: dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 + squarenote 5, 179, 241, 6 + squarenote 7, 197, 82, 7 + squarenote 3, 162, 17, 7 + squarenote 8, 177, 1, 6 endchannel SFX_Cry01_2_Ch7: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 + noisenote 3, 162, 60 + noisenote 12, 148, 44 + noisenote 3, 130, 28 + noisenote 8, 113, 44 endchannel diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm index 19235f9e..69728006 100644 --- a/audio/sfx/cry01_3.asm +++ b/audio/sfx/cry01_3.asm @@ -1,24 +1,24 @@ SFX_Cry01_3_Ch4: dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 + squarenote 4, 243, 0, 6 + squarenote 8, 213, 96, 7 + squarenote 3, 226, 32, 7 + squarenote 8, 209, 16, 7 endchannel SFX_Cry01_3_Ch5: dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 + squarenote 5, 179, 241, 6 + squarenote 7, 197, 82, 7 + squarenote 3, 162, 17, 7 + squarenote 8, 177, 1, 6 endchannel SFX_Cry01_3_Ch7: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 + noisenote 3, 162, 60 + noisenote 12, 148, 44 + noisenote 3, 130, 28 + noisenote 8, 113, 44 endchannel diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm index 62834724..c210c673 100644 --- a/audio/sfx/cry02_1.asm +++ b/audio/sfx/cry02_1.asm @@ -1,16 +1,16 @@ SFX_Cry02_1_Ch4: duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 + squarenote 8, 245, 128, 4 + squarenote 2, 225, 224, 5 + squarenote 8, 209, 220, 5 endchannel SFX_Cry02_1_Ch5: dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 + squarenote 7, 149, 65, 4 + squarenote 2, 129, 33, 5 + squarenote 8, 97, 26, 5 SFX_Cry02_1_Ch7: diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm index ae40372a..79e90a8c 100644 --- a/audio/sfx/cry02_2.asm +++ b/audio/sfx/cry02_2.asm @@ -1,16 +1,16 @@ SFX_Cry02_2_Ch4: duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 + squarenote 8, 245, 128, 4 + squarenote 2, 225, 224, 5 + squarenote 8, 209, 220, 5 endchannel SFX_Cry02_2_Ch5: dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 + squarenote 7, 149, 65, 4 + squarenote 2, 129, 33, 5 + squarenote 8, 97, 26, 5 SFX_Cry02_2_Ch7: diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm index 32be5608..8d069ce0 100644 --- a/audio/sfx/cry02_3.asm +++ b/audio/sfx/cry02_3.asm @@ -1,16 +1,16 @@ SFX_Cry02_3_Ch4: duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 + squarenote 8, 245, 128, 4 + squarenote 2, 225, 224, 5 + squarenote 8, 209, 220, 5 endchannel SFX_Cry02_3_Ch5: dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 + squarenote 7, 149, 65, 4 + squarenote 2, 129, 33, 5 + squarenote 8, 97, 26, 5 SFX_Cry02_3_Ch7: diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm index 706d2325..6a37c5c0 100644 --- a/audio/sfx/cry03_1.asm +++ b/audio/sfx/cry03_1.asm @@ -1,30 +1,30 @@ SFX_Cry03_1_Ch4: dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 + squarenote 4, 247, 8, 6 + squarenote 6, 230, 0, 6 + squarenote 6, 215, 240, 5 + squarenote 6, 196, 224, 5 + squarenote 5, 211, 192, 5 + squarenote 4, 211, 160, 5 + squarenote 8, 225, 128, 5 endchannel SFX_Cry03_1_Ch5: dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 + squarenote 4, 199, 4, 5 + squarenote 6, 166, 2, 5 + squarenote 6, 151, 241, 4 + squarenote 4, 180, 225, 4 + squarenote 5, 163, 194, 4 + squarenote 4, 179, 163, 4 + squarenote 8, 193, 130, 4 endchannel SFX_Cry03_1_Ch7: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 + noisenote 12, 228, 76 + noisenote 10, 199, 92 + noisenote 12, 182, 76 + noisenote 15, 162, 92 endchannel diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm index 89e98ae4..0915e513 100644 --- a/audio/sfx/cry03_2.asm +++ b/audio/sfx/cry03_2.asm @@ -1,30 +1,30 @@ SFX_Cry03_2_Ch4: dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 + squarenote 4, 247, 8, 6 + squarenote 6, 230, 0, 6 + squarenote 6, 215, 240, 5 + squarenote 6, 196, 224, 5 + squarenote 5, 211, 192, 5 + squarenote 4, 211, 160, 5 + squarenote 8, 225, 128, 5 endchannel SFX_Cry03_2_Ch5: dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 + squarenote 4, 199, 4, 5 + squarenote 6, 166, 2, 5 + squarenote 6, 151, 241, 4 + squarenote 4, 180, 225, 4 + squarenote 5, 163, 194, 4 + squarenote 4, 179, 163, 4 + squarenote 8, 193, 130, 4 endchannel SFX_Cry03_2_Ch7: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 + noisenote 12, 228, 76 + noisenote 10, 199, 92 + noisenote 12, 182, 76 + noisenote 15, 162, 92 endchannel diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm index d472d37b..c4a959eb 100644 --- a/audio/sfx/cry03_3.asm +++ b/audio/sfx/cry03_3.asm @@ -1,30 +1,30 @@ SFX_Cry03_3_Ch4: dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 + squarenote 4, 247, 8, 6 + squarenote 6, 230, 0, 6 + squarenote 6, 215, 240, 5 + squarenote 6, 196, 224, 5 + squarenote 5, 211, 192, 5 + squarenote 4, 211, 160, 5 + squarenote 8, 225, 128, 5 endchannel SFX_Cry03_3_Ch5: dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 + squarenote 4, 199, 4, 5 + squarenote 6, 166, 2, 5 + squarenote 6, 151, 241, 4 + squarenote 4, 180, 225, 4 + squarenote 5, 163, 194, 4 + squarenote 4, 179, 163, 4 + squarenote 8, 193, 130, 4 endchannel SFX_Cry03_3_Ch7: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 + noisenote 12, 228, 76 + noisenote 10, 199, 92 + noisenote 12, 182, 76 + noisenote 15, 162, 92 endchannel diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm index d1bb26c6..28c068e3 100644 --- a/audio/sfx/cry04_1.asm +++ b/audio/sfx/cry04_1.asm @@ -1,32 +1,32 @@ SFX_Cry04_1_Ch4: dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 + squarenote 4, 247, 160, 6 + squarenote 8, 230, 164, 6 + squarenote 4, 214, 160, 6 + squarenote 12, 211, 32, 6 + squarenote 8, 195, 36, 6 + squarenote 4, 194, 32, 6 + squarenote 8, 177, 16, 6 endchannel SFX_Cry04_1_Ch5: dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 + squarenote 4, 231, 1, 6 + squarenote 8, 214, 3, 6 + squarenote 4, 198, 1, 6 + squarenote 12, 195, 129, 5 + squarenote 8, 179, 131, 5 + squarenote 4, 178, 130, 5 + squarenote 8, 161, 113, 5 endchannel SFX_Cry04_1_Ch7: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 + noisenote 7, 214, 92 + noisenote 8, 230, 76 + noisenote 4, 212, 92 + noisenote 4, 212, 76 + noisenote 7, 195, 76 + noisenote 8, 161, 92 endchannel diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm index aa5baf29..0d438c4e 100644 --- a/audio/sfx/cry04_2.asm +++ b/audio/sfx/cry04_2.asm @@ -1,32 +1,32 @@ SFX_Cry04_2_Ch4: dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 + squarenote 4, 247, 160, 6 + squarenote 8, 230, 164, 6 + squarenote 4, 214, 160, 6 + squarenote 12, 211, 32, 6 + squarenote 8, 195, 36, 6 + squarenote 4, 194, 32, 6 + squarenote 8, 177, 16, 6 endchannel SFX_Cry04_2_Ch5: dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 + squarenote 4, 231, 1, 6 + squarenote 8, 214, 3, 6 + squarenote 4, 198, 1, 6 + squarenote 12, 195, 129, 5 + squarenote 8, 179, 131, 5 + squarenote 4, 178, 130, 5 + squarenote 8, 161, 113, 5 endchannel SFX_Cry04_2_Ch7: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 + noisenote 7, 214, 92 + noisenote 8, 230, 76 + noisenote 4, 212, 92 + noisenote 4, 212, 76 + noisenote 7, 195, 76 + noisenote 8, 161, 92 endchannel diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm index b4d9cf2e..23011f51 100644 --- a/audio/sfx/cry04_3.asm +++ b/audio/sfx/cry04_3.asm @@ -1,32 +1,32 @@ SFX_Cry04_3_Ch4: dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 + squarenote 4, 247, 160, 6 + squarenote 8, 230, 164, 6 + squarenote 4, 214, 160, 6 + squarenote 12, 211, 32, 6 + squarenote 8, 195, 36, 6 + squarenote 4, 194, 32, 6 + squarenote 8, 177, 16, 6 endchannel SFX_Cry04_3_Ch5: dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 + squarenote 4, 231, 1, 6 + squarenote 8, 214, 3, 6 + squarenote 4, 198, 1, 6 + squarenote 12, 195, 129, 5 + squarenote 8, 179, 131, 5 + squarenote 4, 178, 130, 5 + squarenote 8, 161, 113, 5 endchannel SFX_Cry04_3_Ch7: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 + noisenote 7, 214, 92 + noisenote 8, 230, 76 + noisenote 4, 212, 92 + noisenote 4, 212, 76 + noisenote 7, 195, 76 + noisenote 8, 161, 92 endchannel diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm index dc68e77d..00a32ac1 100644 --- a/audio/sfx/cry05_1.asm +++ b/audio/sfx/cry05_1.asm @@ -1,18 +1,18 @@ SFX_Cry05_1_Ch4: dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 + squarenote 6, 226, 0, 5 + squarenote 6, 227, 128, 5 + squarenote 6, 211, 112, 5 + squarenote 8, 161, 96, 5 endchannel SFX_Cry05_1_Ch5: dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 + squarenote 6, 226, 130, 4 + squarenote 6, 211, 1, 5 + squarenote 6, 178, 226, 4 + squarenote 8, 129, 193, 4 SFX_Cry05_1_Ch7: diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm index f7e09dcc..c6039d1e 100644 --- a/audio/sfx/cry05_2.asm +++ b/audio/sfx/cry05_2.asm @@ -1,18 +1,18 @@ SFX_Cry05_2_Ch4: dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 + squarenote 6, 226, 0, 5 + squarenote 6, 227, 128, 5 + squarenote 6, 211, 112, 5 + squarenote 8, 161, 96, 5 endchannel SFX_Cry05_2_Ch5: dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 + squarenote 6, 226, 130, 4 + squarenote 6, 211, 1, 5 + squarenote 6, 178, 226, 4 + squarenote 8, 129, 193, 4 SFX_Cry05_2_Ch7: diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm index 2e8839c9..dec9a99f 100644 --- a/audio/sfx/cry05_3.asm +++ b/audio/sfx/cry05_3.asm @@ -1,18 +1,18 @@ SFX_Cry05_3_Ch4: dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 + squarenote 6, 226, 0, 5 + squarenote 6, 227, 128, 5 + squarenote 6, 211, 112, 5 + squarenote 8, 161, 96, 5 endchannel SFX_Cry05_3_Ch5: dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 + squarenote 6, 226, 130, 4 + squarenote 6, 211, 1, 5 + squarenote 6, 178, 226, 4 + squarenote 8, 129, 193, 4 SFX_Cry05_3_Ch7: diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm index d3b051c8..5adf4058 100644 --- a/audio/sfx/cry06_1.asm +++ b/audio/sfx/cry06_1.asm @@ -1,11 +1,11 @@ SFX_Cry06_1_Ch4: dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 + squarenote 6, 131, 71, 2 + squarenote 15, 98, 38, 2 + squarenote 4, 82, 69, 2 + squarenote 9, 99, 6, 2 + squarenote 15, 130, 37, 2 + squarenote 15, 66, 7, 2 SFX_Cry06_1_Ch5: @@ -13,10 +13,10 @@ SFX_Cry06_1_Ch5: SFX_Cry06_1_Ch7: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 + noisenote 8, 212, 140 + noisenote 4, 226, 156 + noisenote 15, 198, 140 + noisenote 8, 228, 172 + noisenote 15, 215, 156 + noisenote 15, 242, 172 endchannel diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm index 6a46246c..e4b62370 100644 --- a/audio/sfx/cry06_2.asm +++ b/audio/sfx/cry06_2.asm @@ -1,11 +1,11 @@ SFX_Cry06_2_Ch4: dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 + squarenote 6, 131, 71, 2 + squarenote 15, 98, 38, 2 + squarenote 4, 82, 69, 2 + squarenote 9, 99, 6, 2 + squarenote 15, 130, 37, 2 + squarenote 15, 66, 7, 2 SFX_Cry06_2_Ch5: @@ -13,10 +13,10 @@ SFX_Cry06_2_Ch5: SFX_Cry06_2_Ch7: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 + noisenote 8, 212, 140 + noisenote 4, 226, 156 + noisenote 15, 198, 140 + noisenote 8, 228, 172 + noisenote 15, 215, 156 + noisenote 15, 242, 172 endchannel diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm index 692cd1cf..dd2fef77 100644 --- a/audio/sfx/cry06_3.asm +++ b/audio/sfx/cry06_3.asm @@ -1,11 +1,11 @@ SFX_Cry06_3_Ch4: dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 + squarenote 6, 131, 71, 2 + squarenote 15, 98, 38, 2 + squarenote 4, 82, 69, 2 + squarenote 9, 99, 6, 2 + squarenote 15, 130, 37, 2 + squarenote 15, 66, 7, 2 SFX_Cry06_3_Ch5: @@ -13,10 +13,10 @@ SFX_Cry06_3_Ch5: SFX_Cry06_3_Ch7: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 + noisenote 8, 212, 140 + noisenote 4, 226, 156 + noisenote 15, 198, 140 + noisenote 8, 228, 172 + noisenote 15, 215, 156 + noisenote 15, 242, 172 endchannel diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm index 2eebb7f9..d3a9ef92 100644 --- a/audio/sfx/cry07_1.asm +++ b/audio/sfx/cry07_1.asm @@ -1,21 +1,21 @@ SFX_Cry07_1_Ch4: dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 + squarenote 4, 243, 224, 6 + squarenote 15, 228, 64, 6 + squarenote 8, 193, 32, 6 endchannel SFX_Cry07_1_Ch5: dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 + squarenote 3, 195, 131, 6 + squarenote 14, 180, 2, 6 + squarenote 8, 161, 1, 6 endchannel SFX_Cry07_1_Ch7: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 + noisenote 4, 211, 92 + noisenote 15, 230, 76 + noisenote 8, 177, 92 endchannel diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm index e0381424..5f464588 100644 --- a/audio/sfx/cry07_2.asm +++ b/audio/sfx/cry07_2.asm @@ -1,21 +1,21 @@ SFX_Cry07_2_Ch4: dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 + squarenote 4, 243, 224, 6 + squarenote 15, 228, 64, 6 + squarenote 8, 193, 32, 6 endchannel SFX_Cry07_2_Ch5: dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 + squarenote 3, 195, 131, 6 + squarenote 14, 180, 2, 6 + squarenote 8, 161, 1, 6 endchannel SFX_Cry07_2_Ch7: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 + noisenote 4, 211, 92 + noisenote 15, 230, 76 + noisenote 8, 177, 92 endchannel diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm index 92a401a9..ab6c19c8 100644 --- a/audio/sfx/cry07_3.asm +++ b/audio/sfx/cry07_3.asm @@ -1,21 +1,21 @@ SFX_Cry07_3_Ch4: dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 + squarenote 4, 243, 224, 6 + squarenote 15, 228, 64, 6 + squarenote 8, 193, 32, 6 endchannel SFX_Cry07_3_Ch5: dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 + squarenote 3, 195, 131, 6 + squarenote 14, 180, 2, 6 + squarenote 8, 161, 1, 6 endchannel SFX_Cry07_3_Ch7: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 + noisenote 4, 211, 92 + noisenote 15, 230, 76 + noisenote 8, 177, 92 endchannel diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm index 91901faa..6ca12371 100644 --- a/audio/sfx/cry08_1.asm +++ b/audio/sfx/cry08_1.asm @@ -1,23 +1,23 @@ SFX_Cry08_1_Ch4: dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 + squarenote 15, 246, 101, 5 + squarenote 10, 228, 124, 5 + squarenote 3, 194, 92, 5 + squarenote 15, 178, 60, 5 endchannel SFX_Cry08_1_Ch5: dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 + squarenote 14, 214, 3, 5 + squarenote 9, 180, 27, 5 + squarenote 4, 146, 250, 4 + squarenote 15, 162, 219, 4 endchannel SFX_Cry08_1_Ch7: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 + noisenote 12, 230, 76 + noisenote 11, 215, 92 + noisenote 15, 194, 76 endchannel diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm index 45d12f38..f864e596 100644 --- a/audio/sfx/cry08_2.asm +++ b/audio/sfx/cry08_2.asm @@ -1,23 +1,23 @@ SFX_Cry08_2_Ch4: dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 + squarenote 15, 246, 101, 5 + squarenote 10, 228, 124, 5 + squarenote 3, 194, 92, 5 + squarenote 15, 178, 60, 5 endchannel SFX_Cry08_2_Ch5: dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 + squarenote 14, 214, 3, 5 + squarenote 9, 180, 27, 5 + squarenote 4, 146, 250, 4 + squarenote 15, 162, 219, 4 endchannel SFX_Cry08_2_Ch7: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 + noisenote 12, 230, 76 + noisenote 11, 215, 92 + noisenote 15, 194, 76 endchannel diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm index 8f1ec3fb..37b8b900 100644 --- a/audio/sfx/cry08_3.asm +++ b/audio/sfx/cry08_3.asm @@ -1,23 +1,23 @@ SFX_Cry08_3_Ch4: dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 + squarenote 15, 246, 101, 5 + squarenote 10, 228, 124, 5 + squarenote 3, 194, 92, 5 + squarenote 15, 178, 60, 5 endchannel SFX_Cry08_3_Ch5: dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 + squarenote 14, 214, 3, 5 + squarenote 9, 180, 27, 5 + squarenote 4, 146, 250, 4 + squarenote 15, 162, 219, 4 endchannel SFX_Cry08_3_Ch7: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 + noisenote 12, 230, 76 + noisenote 11, 215, 92 + noisenote 15, 194, 76 endchannel diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm index 11b4ab55..c09e6b72 100644 --- a/audio/sfx/cry09_1.asm +++ b/audio/sfx/cry09_1.asm @@ -1,35 +1,35 @@ SFX_Cry09_1_Ch4: dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 + squarenote 15, 247, 160, 7 + squarenote 6, 230, 163, 7 + squarenote 10, 244, 160, 7 dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 + squarenote 10, 246, 216, 7 + squarenote 4, 227, 215, 7 + squarenote 15, 242, 216, 7 endchannel SFX_Cry09_1_Ch5: dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 + squarenote 2, 8, 0, 0 + squarenote 15, 167, 161, 6 + squarenote 6, 134, 162, 6 + squarenote 10, 116, 161, 6 dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 + squarenote 10, 118, 214, 6 + squarenote 4, 131, 217, 6 + squarenote 15, 162, 215, 6 endchannel SFX_Cry09_1_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 + noisenote 2, 242, 60 + noisenote 8, 228, 62 + noisenote 15, 215, 60 + noisenote 6, 197, 59 + noisenote 6, 228, 61 + noisenote 8, 182, 60 + noisenote 6, 212, 61 + noisenote 8, 193, 59 endchannel diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm index ac4b1f74..93faf91e 100644 --- a/audio/sfx/cry09_2.asm +++ b/audio/sfx/cry09_2.asm @@ -1,35 +1,35 @@ SFX_Cry09_2_Ch4: dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 + squarenote 15, 247, 160, 7 + squarenote 6, 230, 163, 7 + squarenote 10, 244, 160, 7 dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 + squarenote 10, 246, 216, 7 + squarenote 4, 227, 215, 7 + squarenote 15, 242, 216, 7 endchannel SFX_Cry09_2_Ch5: dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 + squarenote 2, 8, 0, 0 + squarenote 15, 167, 161, 6 + squarenote 6, 134, 162, 6 + squarenote 10, 116, 161, 6 dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 + squarenote 10, 118, 214, 6 + squarenote 4, 131, 217, 6 + squarenote 15, 162, 215, 6 endchannel SFX_Cry09_2_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 + noisenote 2, 242, 60 + noisenote 8, 228, 62 + noisenote 15, 215, 60 + noisenote 6, 197, 59 + noisenote 6, 228, 61 + noisenote 8, 182, 60 + noisenote 6, 212, 61 + noisenote 8, 193, 59 endchannel diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm index 1d3856cc..4edaf511 100644 --- a/audio/sfx/cry09_3.asm +++ b/audio/sfx/cry09_3.asm @@ -1,35 +1,35 @@ SFX_Cry09_3_Ch4: dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 + squarenote 15, 247, 160, 7 + squarenote 6, 230, 163, 7 + squarenote 10, 244, 160, 7 dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 + squarenote 10, 246, 216, 7 + squarenote 4, 227, 215, 7 + squarenote 15, 242, 216, 7 endchannel SFX_Cry09_3_Ch5: dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 + squarenote 2, 8, 0, 0 + squarenote 15, 167, 161, 6 + squarenote 6, 134, 162, 6 + squarenote 10, 116, 161, 6 dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 + squarenote 10, 118, 214, 6 + squarenote 4, 131, 217, 6 + squarenote 15, 162, 215, 6 endchannel SFX_Cry09_3_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 + noisenote 2, 242, 60 + noisenote 8, 228, 62 + noisenote 15, 215, 60 + noisenote 6, 197, 59 + noisenote 6, 228, 61 + noisenote 8, 182, 60 + noisenote 6, 212, 61 + noisenote 8, 193, 59 endchannel diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm index 051a5d73..e05821c5 100644 --- a/audio/sfx/cry0a_1.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,35 +1,35 @@ SFX_Cry0A_1_Ch4: dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 + squarenote 8, 247, 224, 6 + squarenote 6, 230, 229, 6 + squarenote 3, 244, 224, 6 + squarenote 3, 246, 208, 6 + squarenote 3, 227, 192, 6 + squarenote 4, 242, 176, 6 + squarenote 15, 162, 200, 6 endchannel SFX_Cry0A_1_Ch5: dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 + squarenote 3, 8, 0, 0 + squarenote 8, 167, 161, 6 + squarenote 6, 134, 163, 6 + squarenote 3, 116, 161, 6 + squarenote 3, 118, 145, 6 + squarenote 3, 131, 130, 6 + squarenote 4, 162, 113, 6 + squarenote 15, 114, 137, 6 endchannel SFX_Cry0A_1_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 + noisenote 2, 242, 60 + noisenote 8, 228, 62 + noisenote 8, 215, 60 + noisenote 5, 197, 59 + noisenote 3, 212, 44 + noisenote 2, 182, 60 + noisenote 3, 164, 44 + noisenote 8, 145, 60 endchannel diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm index d7fdd264..81653447 100644 --- a/audio/sfx/cry0a_2.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,35 +1,35 @@ SFX_Cry0A_2_Ch4: dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 + squarenote 8, 247, 224, 6 + squarenote 6, 230, 229, 6 + squarenote 3, 244, 224, 6 + squarenote 3, 246, 208, 6 + squarenote 3, 227, 192, 6 + squarenote 4, 242, 176, 6 + squarenote 15, 162, 200, 6 endchannel SFX_Cry0A_2_Ch5: dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 + squarenote 3, 8, 0, 0 + squarenote 8, 167, 161, 6 + squarenote 6, 134, 163, 6 + squarenote 3, 116, 161, 6 + squarenote 3, 118, 145, 6 + squarenote 3, 131, 130, 6 + squarenote 4, 162, 113, 6 + squarenote 15, 114, 137, 6 endchannel SFX_Cry0A_2_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 + noisenote 2, 242, 60 + noisenote 8, 228, 62 + noisenote 8, 215, 60 + noisenote 5, 197, 59 + noisenote 3, 212, 44 + noisenote 2, 182, 60 + noisenote 3, 164, 44 + noisenote 8, 145, 60 endchannel diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm index e16287c4..6cc94434 100644 --- a/audio/sfx/cry0a_3.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,35 +1,35 @@ SFX_Cry0A_3_Ch4: dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 + squarenote 8, 247, 224, 6 + squarenote 6, 230, 229, 6 + squarenote 3, 244, 224, 6 + squarenote 3, 246, 208, 6 + squarenote 3, 227, 192, 6 + squarenote 4, 242, 176, 6 + squarenote 15, 162, 200, 6 endchannel SFX_Cry0A_3_Ch5: dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 + squarenote 3, 8, 0, 0 + squarenote 8, 167, 161, 6 + squarenote 6, 134, 163, 6 + squarenote 3, 116, 161, 6 + squarenote 3, 118, 145, 6 + squarenote 3, 131, 130, 6 + squarenote 4, 162, 113, 6 + squarenote 15, 114, 137, 6 endchannel SFX_Cry0A_3_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 + noisenote 2, 242, 60 + noisenote 8, 228, 62 + noisenote 8, 215, 60 + noisenote 5, 197, 59 + noisenote 3, 212, 44 + noisenote 2, 182, 60 + noisenote 3, 164, 44 + noisenote 8, 145, 60 endchannel diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm index 5ee9b81c..612be214 100644 --- a/audio/sfx/cry0b_1.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,37 +1,37 @@ SFX_Cry0B_1_Ch4: dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 + squarenote 4, 241, 0, 7 + squarenote 4, 225, 128, 7 + squarenote 4, 209, 64, 7 + squarenote 4, 225, 64, 7 + squarenote 4, 241, 128, 7 + squarenote 4, 209, 0, 7 + squarenote 4, 241, 1, 7 + squarenote 4, 209, 130, 7 + squarenote 4, 193, 66, 7 + squarenote 8, 177, 65, 7 endchannel SFX_Cry0B_1_Ch5: dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 + squarenote 12, 8, 0, 0 + squarenote 4, 241, 1, 7 + squarenote 4, 225, 130, 7 + squarenote 4, 209, 65, 7 + squarenote 4, 225, 65, 7 + squarenote 4, 241, 130, 7 + squarenote 8, 209, 1, 7 endchannel SFX_Cry0B_1_Ch7: - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 + noisenote 15, 8, 0 + noisenote 4, 8, 0 + noisenote 4, 209, 76 + noisenote 4, 177, 44 + noisenote 4, 209, 60 + noisenote 4, 177, 60 + noisenote 4, 193, 44 + noisenote 8, 161, 76 endchannel diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm index f762ea02..88a7fdc8 100644 --- a/audio/sfx/cry0b_2.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,37 +1,37 @@ SFX_Cry0B_2_Ch4: dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 + squarenote 4, 241, 0, 7 + squarenote 4, 225, 128, 7 + squarenote 4, 209, 64, 7 + squarenote 4, 225, 64, 7 + squarenote 4, 241, 128, 7 + squarenote 4, 209, 0, 7 + squarenote 4, 241, 1, 7 + squarenote 4, 209, 130, 7 + squarenote 4, 193, 66, 7 + squarenote 8, 177, 65, 7 endchannel SFX_Cry0B_2_Ch5: dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 + squarenote 12, 8, 0, 0 + squarenote 4, 241, 1, 7 + squarenote 4, 225, 130, 7 + squarenote 4, 209, 65, 7 + squarenote 4, 225, 65, 7 + squarenote 4, 241, 130, 7 + squarenote 8, 209, 1, 7 endchannel SFX_Cry0B_2_Ch7: - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 + noisenote 15, 8, 0 + noisenote 4, 8, 0 + noisenote 4, 209, 76 + noisenote 4, 177, 44 + noisenote 4, 209, 60 + noisenote 4, 177, 60 + noisenote 4, 193, 44 + noisenote 8, 161, 76 endchannel diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm index 22420974..ccc9728a 100644 --- a/audio/sfx/cry0b_3.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,37 +1,37 @@ SFX_Cry0B_3_Ch4: dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 + squarenote 4, 241, 0, 7 + squarenote 4, 225, 128, 7 + squarenote 4, 209, 64, 7 + squarenote 4, 225, 64, 7 + squarenote 4, 241, 128, 7 + squarenote 4, 209, 0, 7 + squarenote 4, 241, 1, 7 + squarenote 4, 209, 130, 7 + squarenote 4, 193, 66, 7 + squarenote 8, 177, 65, 7 endchannel SFX_Cry0B_3_Ch5: dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 + squarenote 12, 8, 0, 0 + squarenote 4, 241, 1, 7 + squarenote 4, 225, 130, 7 + squarenote 4, 209, 65, 7 + squarenote 4, 225, 65, 7 + squarenote 4, 241, 130, 7 + squarenote 8, 209, 1, 7 endchannel SFX_Cry0B_3_Ch7: - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 + noisenote 15, 8, 0 + noisenote 4, 8, 0 + noisenote 4, 209, 76 + noisenote 4, 177, 44 + noisenote 4, 209, 60 + noisenote 4, 177, 60 + noisenote 4, 193, 44 + noisenote 8, 161, 76 endchannel diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm index dfbf0283..3b31ec94 100644 --- a/audio/sfx/cry0c_1.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,28 +1,28 @@ SFX_Cry0C_1_Ch4: dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 + squarenote 8, 245, 0, 6 + squarenote 2, 210, 56, 6 + squarenote 2, 194, 48, 6 + squarenote 2, 194, 40, 6 + squarenote 2, 178, 32, 6 + squarenote 2, 178, 16, 6 + squarenote 2, 162, 24, 6 + squarenote 2, 178, 16, 6 + squarenote 8, 193, 32, 6 endchannel SFX_Cry0C_1_Ch5: dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 + squarenote 12, 195, 192, 5 + squarenote 3, 177, 249, 5 + squarenote 2, 161, 241, 5 + squarenote 2, 161, 233, 5 + squarenote 2, 145, 225, 5 + squarenote 2, 145, 217, 5 + squarenote 2, 129, 209, 5 + squarenote 2, 145, 217, 5 + squarenote 8, 145, 225, 5 SFX_Cry0C_1_Ch7: diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm index 11e0d06a..78695578 100644 --- a/audio/sfx/cry0c_2.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,28 +1,28 @@ SFX_Cry0C_2_Ch4: dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 + squarenote 8, 245, 0, 6 + squarenote 2, 210, 56, 6 + squarenote 2, 194, 48, 6 + squarenote 2, 194, 40, 6 + squarenote 2, 178, 32, 6 + squarenote 2, 178, 16, 6 + squarenote 2, 162, 24, 6 + squarenote 2, 178, 16, 6 + squarenote 8, 193, 32, 6 endchannel SFX_Cry0C_2_Ch5: dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 + squarenote 12, 195, 192, 5 + squarenote 3, 177, 249, 5 + squarenote 2, 161, 241, 5 + squarenote 2, 161, 233, 5 + squarenote 2, 145, 225, 5 + squarenote 2, 145, 217, 5 + squarenote 2, 129, 209, 5 + squarenote 2, 145, 217, 5 + squarenote 8, 145, 225, 5 SFX_Cry0C_2_Ch7: diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm index 6fc798f2..7b8b0c41 100644 --- a/audio/sfx/cry0c_3.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,28 +1,28 @@ SFX_Cry0C_3_Ch4: dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 + squarenote 8, 245, 0, 6 + squarenote 2, 210, 56, 6 + squarenote 2, 194, 48, 6 + squarenote 2, 194, 40, 6 + squarenote 2, 178, 32, 6 + squarenote 2, 178, 16, 6 + squarenote 2, 162, 24, 6 + squarenote 2, 178, 16, 6 + squarenote 8, 193, 32, 6 endchannel SFX_Cry0C_3_Ch5: dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 + squarenote 12, 195, 192, 5 + squarenote 3, 177, 249, 5 + squarenote 2, 161, 241, 5 + squarenote 2, 161, 233, 5 + squarenote 2, 145, 225, 5 + squarenote 2, 145, 217, 5 + squarenote 2, 129, 209, 5 + squarenote 2, 145, 217, 5 + squarenote 8, 145, 225, 5 SFX_Cry0C_3_Ch7: diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm index 2864fa01..b4fd1344 100644 --- a/audio/sfx/cry0d_1.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,40 +1,40 @@ SFX_Cry0D_1_Ch4: dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 + squarenote 5, 242, 80, 6 + squarenote 9, 209, 96, 6 + squarenote 5, 226, 18, 6 + squarenote 9, 193, 34, 6 + squarenote 5, 242, 16, 6 + squarenote 6, 209, 32, 6 loopchannel 2, SFX_Cry0D_1_Ch4 endchannel SFX_Cry0D_1_Ch5: dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 + squarenote 4, 8, 0, 0 + squarenote 5, 242, 81, 6 + squarenote 9, 209, 97, 6 + squarenote 5, 226, 20, 6 + squarenote 8, 193, 36, 6 + squarenote 5, 242, 17, 6 + squarenote 12, 209, 33, 6 + squarenote 5, 226, 20, 6 + squarenote 8, 193, 36, 6 + squarenote 5, 242, 17, 6 + squarenote 4, 209, 33, 6 endchannel SFX_Cry0D_1_Ch7: - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 + noisenote 6, 210, 28 + noisenote 9, 177, 44 + noisenote 8, 194, 44 + noisenote 9, 177, 60 + noisenote 6, 194, 44 + noisenote 9, 162, 60 + noisenote 7, 194, 44 + noisenote 5, 161, 60 + noisenote 9, 194, 44 + noisenote 4, 161, 60 endchannel diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm index ef4a0eb6..76ca2392 100644 --- a/audio/sfx/cry0d_2.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,40 +1,40 @@ SFX_Cry0D_2_Ch4: dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 + squarenote 5, 242, 80, 6 + squarenote 9, 209, 96, 6 + squarenote 5, 226, 18, 6 + squarenote 9, 193, 34, 6 + squarenote 5, 242, 16, 6 + squarenote 6, 209, 32, 6 loopchannel 2, SFX_Cry0D_2_Ch4 endchannel SFX_Cry0D_2_Ch5: dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 + squarenote 4, 8, 0, 0 + squarenote 5, 242, 81, 6 + squarenote 9, 209, 97, 6 + squarenote 5, 226, 20, 6 + squarenote 8, 193, 36, 6 + squarenote 5, 242, 17, 6 + squarenote 12, 209, 33, 6 + squarenote 5, 226, 20, 6 + squarenote 8, 193, 36, 6 + squarenote 5, 242, 17, 6 + squarenote 4, 209, 33, 6 endchannel SFX_Cry0D_2_Ch7: - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 + noisenote 6, 210, 28 + noisenote 9, 177, 44 + noisenote 8, 194, 44 + noisenote 9, 177, 60 + noisenote 6, 194, 44 + noisenote 9, 162, 60 + noisenote 7, 194, 44 + noisenote 5, 161, 60 + noisenote 9, 194, 44 + noisenote 4, 161, 60 endchannel diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm index 1fbc40b5..56d1a5c6 100644 --- a/audio/sfx/cry0d_3.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,40 +1,40 @@ SFX_Cry0D_3_Ch4: dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 + squarenote 5, 242, 80, 6 + squarenote 9, 209, 96, 6 + squarenote 5, 226, 18, 6 + squarenote 9, 193, 34, 6 + squarenote 5, 242, 16, 6 + squarenote 6, 209, 32, 6 loopchannel 2, SFX_Cry0D_3_Ch4 endchannel SFX_Cry0D_3_Ch5: dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 + squarenote 4, 8, 0, 0 + squarenote 5, 242, 81, 6 + squarenote 9, 209, 97, 6 + squarenote 5, 226, 20, 6 + squarenote 8, 193, 36, 6 + squarenote 5, 242, 17, 6 + squarenote 12, 209, 33, 6 + squarenote 5, 226, 20, 6 + squarenote 8, 193, 36, 6 + squarenote 5, 242, 17, 6 + squarenote 4, 209, 33, 6 endchannel SFX_Cry0D_3_Ch7: - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 + noisenote 6, 210, 28 + noisenote 9, 177, 44 + noisenote 8, 194, 44 + noisenote 9, 177, 60 + noisenote 6, 194, 44 + noisenote 9, 162, 60 + noisenote 7, 194, 44 + noisenote 5, 161, 60 + noisenote 9, 194, 44 + noisenote 4, 161, 60 endchannel diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm index 37cabb7c..fb4a8d53 100644 --- a/audio/sfx/cry0e_1.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,23 +1,23 @@ SFX_Cry0E_1_Ch4: dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 + squarenote 4, 225, 0, 7 + squarenote 4, 242, 128, 7 + squarenote 2, 146, 64, 7 + squarenote 8, 225, 0, 6 endchannel SFX_Cry0E_1_Ch5: dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 + squarenote 4, 177, 225, 6 + squarenote 3, 194, 225, 6 + squarenote 3, 98, 129, 6 + squarenote 8, 177, 225, 5 endchannel SFX_Cry0E_1_Ch7: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 + noisenote 2, 97, 50 + noisenote 2, 97, 33 + noisenote 8, 97, 17 endchannel diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm index 5f6f481f..3a5e7f58 100644 --- a/audio/sfx/cry0e_2.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,23 +1,23 @@ SFX_Cry0E_2_Ch4: dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 + squarenote 4, 225, 0, 7 + squarenote 4, 242, 128, 7 + squarenote 2, 146, 64, 7 + squarenote 8, 225, 0, 6 endchannel SFX_Cry0E_2_Ch5: dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 + squarenote 4, 177, 225, 6 + squarenote 3, 194, 225, 6 + squarenote 3, 98, 129, 6 + squarenote 8, 177, 225, 5 endchannel SFX_Cry0E_2_Ch7: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 + noisenote 2, 97, 50 + noisenote 2, 97, 33 + noisenote 8, 97, 17 endchannel diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm index 13cf9405..15bea347 100644 --- a/audio/sfx/cry0e_3.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,23 +1,23 @@ SFX_Cry0E_3_Ch4: dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 + squarenote 4, 225, 0, 7 + squarenote 4, 242, 128, 7 + squarenote 2, 146, 64, 7 + squarenote 8, 225, 0, 6 endchannel SFX_Cry0E_3_Ch5: dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 + squarenote 4, 177, 225, 6 + squarenote 3, 194, 225, 6 + squarenote 3, 98, 129, 6 + squarenote 8, 177, 225, 5 endchannel SFX_Cry0E_3_Ch7: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 + noisenote 2, 97, 50 + noisenote 2, 97, 33 + noisenote 8, 97, 17 endchannel diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm index 81abdc09..8c260c93 100644 --- a/audio/sfx/cry0f_1.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,29 +1,29 @@ SFX_Cry0F_1_Ch4: dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 + squarenote 4, 247, 192, 7 + squarenote 12, 230, 194, 7 + squarenote 6, 181, 128, 6 + squarenote 4, 196, 112, 6 + squarenote 4, 181, 96, 6 + squarenote 8, 193, 64, 6 endchannel SFX_Cry0F_1_Ch5: dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 + squarenote 3, 199, 129, 7 + squarenote 12, 182, 128, 7 + squarenote 6, 165, 65, 6 + squarenote 4, 196, 50, 6 + squarenote 6, 181, 33, 6 + squarenote 8, 161, 2, 6 endchannel SFX_Cry0F_1_Ch7: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 + noisenote 3, 228, 60 + noisenote 12, 214, 44 + noisenote 4, 228, 60 + noisenote 8, 183, 92 + noisenote 15, 194, 93 endchannel diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm index 112b9e8b..4812e0fb 100644 --- a/audio/sfx/cry0f_2.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,29 +1,29 @@ SFX_Cry0F_2_Ch4: dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 + squarenote 4, 247, 192, 7 + squarenote 12, 230, 194, 7 + squarenote 6, 181, 128, 6 + squarenote 4, 196, 112, 6 + squarenote 4, 181, 96, 6 + squarenote 8, 193, 64, 6 endchannel SFX_Cry0F_2_Ch5: dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 + squarenote 3, 199, 129, 7 + squarenote 12, 182, 128, 7 + squarenote 6, 165, 65, 6 + squarenote 4, 196, 50, 6 + squarenote 6, 181, 33, 6 + squarenote 8, 161, 2, 6 endchannel SFX_Cry0F_2_Ch7: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 + noisenote 3, 228, 60 + noisenote 12, 214, 44 + noisenote 4, 228, 60 + noisenote 8, 183, 92 + noisenote 15, 194, 93 endchannel diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm index 08abd131..3f612b84 100644 --- a/audio/sfx/cry0f_3.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,29 +1,29 @@ SFX_Cry0F_3_Ch4: dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 + squarenote 4, 247, 192, 7 + squarenote 12, 230, 194, 7 + squarenote 6, 181, 128, 6 + squarenote 4, 196, 112, 6 + squarenote 4, 181, 96, 6 + squarenote 8, 193, 64, 6 endchannel SFX_Cry0F_3_Ch5: dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 + squarenote 3, 199, 129, 7 + squarenote 12, 182, 128, 7 + squarenote 6, 165, 65, 6 + squarenote 4, 196, 50, 6 + squarenote 6, 181, 33, 6 + squarenote 8, 161, 2, 6 endchannel SFX_Cry0F_3_Ch7: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 + noisenote 3, 228, 60 + noisenote 12, 214, 44 + noisenote 4, 228, 60 + noisenote 8, 183, 92 + noisenote 15, 194, 93 endchannel diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm index eef13d3d..46a1498b 100644 --- a/audio/sfx/cry10_1.asm +++ b/audio/sfx/cry10_1.asm @@ -1,31 +1,31 @@ SFX_Cry10_1_Ch4: dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 + squarenote 8, 247, 128, 6 + squarenote 2, 247, 96, 6 + squarenote 1, 231, 64, 6 + squarenote 1, 231, 32, 6 + squarenote 15, 209, 0, 6 + squarenote 4, 199, 64, 7 + squarenote 4, 167, 48, 7 + squarenote 15, 145, 32, 7 endchannel SFX_Cry10_1_Ch5: dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 + squarenote 10, 231, 130, 6 + squarenote 2, 231, 98, 6 + squarenote 1, 215, 66, 6 + squarenote 1, 215, 34, 6 + squarenote 15, 193, 2, 6 + squarenote 4, 183, 66, 7 + squarenote 2, 151, 50, 7 + squarenote 15, 129, 34, 7 endchannel SFX_Cry10_1_Ch7: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 + noisenote 4, 116, 33 + noisenote 4, 116, 16 + noisenote 4, 113, 32 endchannel diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm index dd468979..047413ae 100644 --- a/audio/sfx/cry10_2.asm +++ b/audio/sfx/cry10_2.asm @@ -1,31 +1,31 @@ SFX_Cry10_2_Ch4: dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 + squarenote 8, 247, 128, 6 + squarenote 2, 247, 96, 6 + squarenote 1, 231, 64, 6 + squarenote 1, 231, 32, 6 + squarenote 15, 209, 0, 6 + squarenote 4, 199, 64, 7 + squarenote 4, 167, 48, 7 + squarenote 15, 145, 32, 7 endchannel SFX_Cry10_2_Ch5: dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 + squarenote 10, 231, 130, 6 + squarenote 2, 231, 98, 6 + squarenote 1, 215, 66, 6 + squarenote 1, 215, 34, 6 + squarenote 15, 193, 2, 6 + squarenote 4, 183, 66, 7 + squarenote 2, 151, 50, 7 + squarenote 15, 129, 34, 7 endchannel SFX_Cry10_2_Ch7: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 + noisenote 4, 116, 33 + noisenote 4, 116, 16 + noisenote 4, 113, 32 endchannel diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm index e9a5200d..ecebe7e4 100644 --- a/audio/sfx/cry10_3.asm +++ b/audio/sfx/cry10_3.asm @@ -1,31 +1,31 @@ SFX_Cry10_3_Ch4: dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 + squarenote 8, 247, 128, 6 + squarenote 2, 247, 96, 6 + squarenote 1, 231, 64, 6 + squarenote 1, 231, 32, 6 + squarenote 15, 209, 0, 6 + squarenote 4, 199, 64, 7 + squarenote 4, 167, 48, 7 + squarenote 15, 145, 32, 7 endchannel SFX_Cry10_3_Ch5: dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 + squarenote 10, 231, 130, 6 + squarenote 2, 231, 98, 6 + squarenote 1, 215, 66, 6 + squarenote 1, 215, 34, 6 + squarenote 15, 193, 2, 6 + squarenote 4, 183, 66, 7 + squarenote 2, 151, 50, 7 + squarenote 15, 129, 34, 7 endchannel SFX_Cry10_3_Ch7: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 + noisenote 4, 116, 33 + noisenote 4, 116, 16 + noisenote 4, 113, 32 endchannel diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm index f7c314ef..0b632a02 100644 --- a/audio/sfx/cry11_1.asm +++ b/audio/sfx/cry11_1.asm @@ -1,34 +1,34 @@ SFX_Cry11_1_Ch4: dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 + squarenote 6, 247, 160, 7 + squarenote 8, 230, 164, 7 + squarenote 4, 214, 160, 7 + squarenote 15, 211, 32, 7 + squarenote 8, 195, 35, 7 + squarenote 2, 194, 40, 7 + squarenote 8, 177, 48, 7 endchannel SFX_Cry11_1_Ch5: dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 + squarenote 4, 8, 0, 0 + squarenote 6, 167, 65, 7 + squarenote 8, 134, 67, 7 + squarenote 4, 118, 65, 7 + squarenote 13, 131, 194, 6 + squarenote 7, 115, 193, 6 + squarenote 3, 130, 204, 6 + squarenote 8, 113, 216, 6 endchannel SFX_Cry11_1_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 + noisenote 2, 242, 76 + noisenote 6, 230, 58 + noisenote 4, 215, 58 + noisenote 6, 214, 44 + noisenote 8, 229, 60 + noisenote 12, 210, 61 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm index 0009a0ec..2bf5a547 100644 --- a/audio/sfx/cry11_2.asm +++ b/audio/sfx/cry11_2.asm @@ -1,34 +1,34 @@ SFX_Cry11_2_Ch4: dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 + squarenote 6, 247, 160, 7 + squarenote 8, 230, 164, 7 + squarenote 4, 214, 160, 7 + squarenote 15, 211, 32, 7 + squarenote 8, 195, 35, 7 + squarenote 2, 194, 40, 7 + squarenote 8, 177, 48, 7 endchannel SFX_Cry11_2_Ch5: dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 + squarenote 4, 8, 0, 0 + squarenote 6, 167, 65, 7 + squarenote 8, 134, 67, 7 + squarenote 4, 118, 65, 7 + squarenote 13, 131, 194, 6 + squarenote 7, 115, 193, 6 + squarenote 3, 130, 204, 6 + squarenote 8, 113, 216, 6 endchannel SFX_Cry11_2_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 + noisenote 2, 242, 76 + noisenote 6, 230, 58 + noisenote 4, 215, 58 + noisenote 6, 214, 44 + noisenote 8, 229, 60 + noisenote 12, 210, 61 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm index a8af19f6..6fe2c7d0 100644 --- a/audio/sfx/cry11_3.asm +++ b/audio/sfx/cry11_3.asm @@ -1,34 +1,34 @@ SFX_Cry11_3_Ch4: dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 + squarenote 6, 247, 160, 7 + squarenote 8, 230, 164, 7 + squarenote 4, 214, 160, 7 + squarenote 15, 211, 32, 7 + squarenote 8, 195, 35, 7 + squarenote 2, 194, 40, 7 + squarenote 8, 177, 48, 7 endchannel SFX_Cry11_3_Ch5: dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 + squarenote 4, 8, 0, 0 + squarenote 6, 167, 65, 7 + squarenote 8, 134, 67, 7 + squarenote 4, 118, 65, 7 + squarenote 13, 131, 194, 6 + squarenote 7, 115, 193, 6 + squarenote 3, 130, 204, 6 + squarenote 8, 113, 216, 6 endchannel SFX_Cry11_3_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 + noisenote 2, 242, 76 + noisenote 6, 230, 58 + noisenote 4, 215, 58 + noisenote 6, 214, 44 + noisenote 8, 229, 60 + noisenote 12, 210, 61 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm index 29d93eff..c919ddd0 100644 --- a/audio/sfx/cry12_1.asm +++ b/audio/sfx/cry12_1.asm @@ -1,24 +1,24 @@ SFX_Cry12_1_Ch4: dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 + squarenote 12, 242, 64, 4 + squarenote 15, 227, 160, 4 + squarenote 4, 210, 144, 4 + squarenote 8, 209, 128, 4 endchannel SFX_Cry12_1_Ch5: dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 + squarenote 11, 210, 56, 4 + squarenote 14, 198, 152, 4 + squarenote 3, 178, 136, 4 + squarenote 8, 177, 120, 4 endchannel SFX_Cry12_1_Ch7: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 + noisenote 10, 230, 108 + noisenote 15, 210, 92 + noisenote 3, 194, 108 + noisenote 8, 209, 92 endchannel diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm index 90f373c0..4715c969 100644 --- a/audio/sfx/cry12_2.asm +++ b/audio/sfx/cry12_2.asm @@ -1,24 +1,24 @@ SFX_Cry12_2_Ch4: dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 + squarenote 12, 242, 64, 4 + squarenote 15, 227, 160, 4 + squarenote 4, 210, 144, 4 + squarenote 8, 209, 128, 4 endchannel SFX_Cry12_2_Ch5: dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 + squarenote 11, 210, 56, 4 + squarenote 14, 198, 152, 4 + squarenote 3, 178, 136, 4 + squarenote 8, 177, 120, 4 endchannel SFX_Cry12_2_Ch7: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 + noisenote 10, 230, 108 + noisenote 15, 210, 92 + noisenote 3, 194, 108 + noisenote 8, 209, 92 endchannel diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm index f2c012ae..10d067ef 100644 --- a/audio/sfx/cry12_3.asm +++ b/audio/sfx/cry12_3.asm @@ -1,24 +1,24 @@ SFX_Cry12_3_Ch4: dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 + squarenote 12, 242, 64, 4 + squarenote 15, 227, 160, 4 + squarenote 4, 210, 144, 4 + squarenote 8, 209, 128, 4 endchannel SFX_Cry12_3_Ch5: dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 + squarenote 11, 210, 56, 4 + squarenote 14, 198, 152, 4 + squarenote 3, 178, 136, 4 + squarenote 8, 177, 120, 4 endchannel SFX_Cry12_3_Ch7: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 + noisenote 10, 230, 108 + noisenote 15, 210, 92 + noisenote 3, 194, 108 + noisenote 8, 209, 92 endchannel diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm index 703db728..3d2b192e 100644 --- a/audio/sfx/cry13_1.asm +++ b/audio/sfx/cry13_1.asm @@ -1,30 +1,30 @@ SFX_Cry13_1_Ch4: dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 + squarenote 15, 246, 192, 5 + squarenote 8, 227, 188, 5 + squarenote 6, 210, 208, 5 + squarenote 6, 178, 224, 5 + squarenote 6, 194, 240, 5 + squarenote 8, 177, 0, 6 endchannel SFX_Cry13_1_Ch5: dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 + squarenote 14, 198, 177, 4 + squarenote 7, 195, 173, 4 + squarenote 5, 178, 193, 4 + squarenote 8, 146, 209, 4 + squarenote 6, 162, 225, 4 + squarenote 8, 145, 241, 4 endchannel SFX_Cry13_1_Ch7: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 + noisenote 10, 230, 92 + noisenote 10, 214, 108 + noisenote 4, 194, 76 + noisenote 6, 211, 92 + noisenote 8, 179, 76 + noisenote 8, 161, 92 endchannel diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm index 7d75853c..650533ed 100644 --- a/audio/sfx/cry13_2.asm +++ b/audio/sfx/cry13_2.asm @@ -1,30 +1,30 @@ SFX_Cry13_2_Ch4: dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 + squarenote 15, 246, 192, 5 + squarenote 8, 227, 188, 5 + squarenote 6, 210, 208, 5 + squarenote 6, 178, 224, 5 + squarenote 6, 194, 240, 5 + squarenote 8, 177, 0, 6 endchannel SFX_Cry13_2_Ch5: dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 + squarenote 14, 198, 177, 4 + squarenote 7, 195, 173, 4 + squarenote 5, 178, 193, 4 + squarenote 8, 146, 209, 4 + squarenote 6, 162, 225, 4 + squarenote 8, 145, 241, 4 endchannel SFX_Cry13_2_Ch7: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 + noisenote 10, 230, 92 + noisenote 10, 214, 108 + noisenote 4, 194, 76 + noisenote 6, 211, 92 + noisenote 8, 179, 76 + noisenote 8, 161, 92 endchannel diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm index 53296f1a..5d84bb87 100644 --- a/audio/sfx/cry13_3.asm +++ b/audio/sfx/cry13_3.asm @@ -1,30 +1,30 @@ SFX_Cry13_3_Ch4: dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 + squarenote 15, 246, 192, 5 + squarenote 8, 227, 188, 5 + squarenote 6, 210, 208, 5 + squarenote 6, 178, 224, 5 + squarenote 6, 194, 240, 5 + squarenote 8, 177, 0, 6 endchannel SFX_Cry13_3_Ch5: dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 + squarenote 14, 198, 177, 4 + squarenote 7, 195, 173, 4 + squarenote 5, 178, 193, 4 + squarenote 8, 146, 209, 4 + squarenote 6, 162, 225, 4 + squarenote 8, 145, 241, 4 endchannel SFX_Cry13_3_Ch7: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 + noisenote 10, 230, 92 + noisenote 10, 214, 108 + noisenote 4, 194, 76 + noisenote 6, 211, 92 + noisenote 8, 179, 76 + noisenote 8, 161, 92 endchannel diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm index fa8964de..58d5082d 100644 --- a/audio/sfx/cry14_1.asm +++ b/audio/sfx/cry14_1.asm @@ -1,21 +1,21 @@ SFX_Cry14_1_Ch4: dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 + squarenote 8, 228, 144, 7 + squarenote 15, 245, 192, 7 + squarenote 8, 209, 216, 7 endchannel SFX_Cry14_1_Ch5: dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 + squarenote 10, 196, 113, 7 + squarenote 15, 182, 162, 7 + squarenote 8, 161, 183, 7 endchannel SFX_Cry14_1_Ch7: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 + noisenote 8, 228, 76 + noisenote 14, 196, 60 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm index 1f70dca8..7e326054 100644 --- a/audio/sfx/cry14_2.asm +++ b/audio/sfx/cry14_2.asm @@ -1,21 +1,21 @@ SFX_Cry14_2_Ch4: dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 + squarenote 8, 228, 144, 7 + squarenote 15, 245, 192, 7 + squarenote 8, 209, 216, 7 endchannel SFX_Cry14_2_Ch5: dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 + squarenote 10, 196, 113, 7 + squarenote 15, 182, 162, 7 + squarenote 8, 161, 183, 7 endchannel SFX_Cry14_2_Ch7: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 + noisenote 8, 228, 76 + noisenote 14, 196, 60 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm index 3bab2100..42dc084d 100644 --- a/audio/sfx/cry14_3.asm +++ b/audio/sfx/cry14_3.asm @@ -1,21 +1,21 @@ SFX_Cry14_3_Ch4: dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 + squarenote 8, 228, 144, 7 + squarenote 15, 245, 192, 7 + squarenote 8, 209, 216, 7 endchannel SFX_Cry14_3_Ch5: dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 + squarenote 10, 196, 113, 7 + squarenote 15, 182, 162, 7 + squarenote 8, 161, 183, 7 endchannel SFX_Cry14_3_Ch7: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 + noisenote 8, 228, 76 + noisenote 14, 196, 60 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm index 0220ad4f..1a1e1a47 100644 --- a/audio/sfx/cry15_1.asm +++ b/audio/sfx/cry15_1.asm @@ -1,30 +1,30 @@ SFX_Cry15_1_Ch4: dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 + squarenote 4, 243, 128, 7 + squarenote 15, 231, 0, 7 + squarenote 8, 211, 16, 7 + squarenote 4, 194, 0, 7 + squarenote 4, 210, 240, 6 + squarenote 8, 193, 224, 6 endchannel SFX_Cry15_1_Ch5: dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 + squarenote 6, 195, 1, 7 + squarenote 14, 183, 129, 6 + squarenote 7, 179, 146, 6 + squarenote 3, 162, 129, 6 + squarenote 4, 178, 114, 6 + squarenote 8, 161, 97, 6 endchannel SFX_Cry15_1_Ch7: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 + noisenote 6, 227, 92 + noisenote 14, 214, 76 + noisenote 6, 198, 60 + noisenote 3, 179, 76 + noisenote 3, 162, 92 + noisenote 8, 177, 108 endchannel diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm index 2ebd7ab0..29153506 100644 --- a/audio/sfx/cry15_2.asm +++ b/audio/sfx/cry15_2.asm @@ -1,30 +1,30 @@ SFX_Cry15_2_Ch4: dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 + squarenote 4, 243, 128, 7 + squarenote 15, 231, 0, 7 + squarenote 8, 211, 16, 7 + squarenote 4, 194, 0, 7 + squarenote 4, 210, 240, 6 + squarenote 8, 193, 224, 6 endchannel SFX_Cry15_2_Ch5: dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 + squarenote 6, 195, 1, 7 + squarenote 14, 183, 129, 6 + squarenote 7, 179, 146, 6 + squarenote 3, 162, 129, 6 + squarenote 4, 178, 114, 6 + squarenote 8, 161, 97, 6 endchannel SFX_Cry15_2_Ch7: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 + noisenote 6, 227, 92 + noisenote 14, 214, 76 + noisenote 6, 198, 60 + noisenote 3, 179, 76 + noisenote 3, 162, 92 + noisenote 8, 177, 108 endchannel diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm index 39ba7a74..090b18b2 100644 --- a/audio/sfx/cry15_3.asm +++ b/audio/sfx/cry15_3.asm @@ -1,30 +1,30 @@ SFX_Cry15_3_Ch4: dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 + squarenote 4, 243, 128, 7 + squarenote 15, 231, 0, 7 + squarenote 8, 211, 16, 7 + squarenote 4, 194, 0, 7 + squarenote 4, 210, 240, 6 + squarenote 8, 193, 224, 6 endchannel SFX_Cry15_3_Ch5: dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 + squarenote 6, 195, 1, 7 + squarenote 14, 183, 129, 6 + squarenote 7, 179, 146, 6 + squarenote 3, 162, 129, 6 + squarenote 4, 178, 114, 6 + squarenote 8, 161, 97, 6 endchannel SFX_Cry15_3_Ch7: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 + noisenote 6, 227, 92 + noisenote 14, 214, 76 + noisenote 6, 198, 60 + noisenote 3, 179, 76 + noisenote 3, 162, 92 + noisenote 8, 177, 108 endchannel diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm index 34d6f6d9..2009a8b4 100644 --- a/audio/sfx/cry16_1.asm +++ b/audio/sfx/cry16_1.asm @@ -1,21 +1,21 @@ SFX_Cry16_1_Ch4: dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 + squarenote 15, 215, 128, 7 + squarenote 4, 230, 160, 7 + squarenote 15, 210, 64, 7 endchannel SFX_Cry16_1_Ch5: dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 + squarenote 15, 199, 83, 7 + squarenote 5, 182, 114, 7 + squarenote 15, 194, 17, 7 endchannel SFX_Cry16_1_Ch7: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 + noisenote 13, 246, 76 + noisenote 4, 230, 60 + noisenote 15, 242, 76 endchannel diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm index 8948cd29..7baabb45 100644 --- a/audio/sfx/cry16_2.asm +++ b/audio/sfx/cry16_2.asm @@ -1,21 +1,21 @@ SFX_Cry16_2_Ch4: dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 + squarenote 15, 215, 128, 7 + squarenote 4, 230, 160, 7 + squarenote 15, 210, 64, 7 endchannel SFX_Cry16_2_Ch5: dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 + squarenote 15, 199, 83, 7 + squarenote 5, 182, 114, 7 + squarenote 15, 194, 17, 7 endchannel SFX_Cry16_2_Ch7: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 + noisenote 13, 246, 76 + noisenote 4, 230, 60 + noisenote 15, 242, 76 endchannel diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm index 026ee67b..b86e9fb3 100644 --- a/audio/sfx/cry16_3.asm +++ b/audio/sfx/cry16_3.asm @@ -1,21 +1,21 @@ SFX_Cry16_3_Ch4: dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 + squarenote 15, 215, 128, 7 + squarenote 4, 230, 160, 7 + squarenote 15, 210, 64, 7 endchannel SFX_Cry16_3_Ch5: dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 + squarenote 15, 199, 83, 7 + squarenote 5, 182, 114, 7 + squarenote 15, 194, 17, 7 endchannel SFX_Cry16_3_Ch7: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 + noisenote 13, 246, 76 + noisenote 4, 230, 60 + noisenote 15, 242, 76 endchannel diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm index 97dec764..1b754064 100644 --- a/audio/sfx/cry17_1.asm +++ b/audio/sfx/cry17_1.asm @@ -1,24 +1,24 @@ SFX_Cry17_1_Ch4: dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 + squarenote 15, 247, 0, 5 + squarenote 15, 231, 8, 5 + squarenote 8, 180, 128, 4 + squarenote 15, 162, 96, 4 endchannel SFX_Cry17_1_Ch5: dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 + squarenote 14, 215, 129, 4 + squarenote 14, 199, 137, 4 + squarenote 10, 180, 1, 4 + squarenote 15, 194, 225, 3 endchannel SFX_Cry17_1_Ch7: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 + noisenote 14, 247, 124 + noisenote 12, 246, 108 + noisenote 9, 228, 124 + noisenote 15, 226, 108 endchannel diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm index a6ab03a2..8e40e269 100644 --- a/audio/sfx/cry17_2.asm +++ b/audio/sfx/cry17_2.asm @@ -1,24 +1,24 @@ SFX_Cry17_2_Ch4: dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 + squarenote 15, 247, 0, 5 + squarenote 15, 231, 8, 5 + squarenote 8, 180, 128, 4 + squarenote 15, 162, 96, 4 endchannel SFX_Cry17_2_Ch5: dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 + squarenote 14, 215, 129, 4 + squarenote 14, 199, 137, 4 + squarenote 10, 180, 1, 4 + squarenote 15, 194, 225, 3 endchannel SFX_Cry17_2_Ch7: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 + noisenote 14, 247, 124 + noisenote 12, 246, 108 + noisenote 9, 228, 124 + noisenote 15, 226, 108 endchannel diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm index 53555206..a8aa3d26 100644 --- a/audio/sfx/cry17_3.asm +++ b/audio/sfx/cry17_3.asm @@ -1,24 +1,24 @@ SFX_Cry17_3_Ch4: dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 + squarenote 15, 247, 0, 5 + squarenote 15, 231, 8, 5 + squarenote 8, 180, 128, 4 + squarenote 15, 162, 96, 4 endchannel SFX_Cry17_3_Ch5: dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 + squarenote 14, 215, 129, 4 + squarenote 14, 199, 137, 4 + squarenote 10, 180, 1, 4 + squarenote 15, 194, 225, 3 endchannel SFX_Cry17_3_Ch7: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 + noisenote 14, 247, 124 + noisenote 12, 246, 108 + noisenote 9, 228, 124 + noisenote 15, 226, 108 endchannel diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm index 8cb3283f..cd6ea771 100644 --- a/audio/sfx/cry18_1.asm +++ b/audio/sfx/cry18_1.asm @@ -1,34 +1,34 @@ SFX_Cry18_1_Ch4: dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 + squarenote 10, 245, 128, 6 + squarenote 3, 226, 160, 6 + squarenote 3, 242, 192, 6 + squarenote 3, 226, 224, 6 + squarenote 3, 210, 0, 7 + squarenote 3, 194, 224, 6 + squarenote 3, 210, 192, 6 + squarenote 8, 193, 160, 6 endchannel SFX_Cry18_1_Ch5: dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 + squarenote 9, 213, 49, 6 + squarenote 3, 210, 82, 6 + squarenote 3, 226, 113, 6 + squarenote 3, 178, 145, 6 + squarenote 3, 194, 178, 6 + squarenote 3, 178, 145, 6 + squarenote 3, 194, 113, 6 + squarenote 8, 177, 81, 6 endchannel SFX_Cry18_1_Ch7: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 + noisenote 6, 227, 76 + noisenote 4, 195, 60 + noisenote 5, 212, 60 + noisenote 4, 196, 44 + noisenote 6, 180, 60 + noisenote 8, 193, 44 endchannel diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm index 01dacd5f..5d44d5c0 100644 --- a/audio/sfx/cry18_2.asm +++ b/audio/sfx/cry18_2.asm @@ -1,34 +1,34 @@ SFX_Cry18_2_Ch4: dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 + squarenote 10, 245, 128, 6 + squarenote 3, 226, 160, 6 + squarenote 3, 242, 192, 6 + squarenote 3, 226, 224, 6 + squarenote 3, 210, 0, 7 + squarenote 3, 194, 224, 6 + squarenote 3, 210, 192, 6 + squarenote 8, 193, 160, 6 endchannel SFX_Cry18_2_Ch5: dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 + squarenote 9, 213, 49, 6 + squarenote 3, 210, 82, 6 + squarenote 3, 226, 113, 6 + squarenote 3, 178, 145, 6 + squarenote 3, 194, 178, 6 + squarenote 3, 178, 145, 6 + squarenote 3, 194, 113, 6 + squarenote 8, 177, 81, 6 endchannel SFX_Cry18_2_Ch7: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 + noisenote 6, 227, 76 + noisenote 4, 195, 60 + noisenote 5, 212, 60 + noisenote 4, 196, 44 + noisenote 6, 180, 60 + noisenote 8, 193, 44 endchannel diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm index 23d2d6a6..edd0eda4 100644 --- a/audio/sfx/cry18_3.asm +++ b/audio/sfx/cry18_3.asm @@ -1,34 +1,34 @@ SFX_Cry18_3_Ch4: dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 + squarenote 10, 245, 128, 6 + squarenote 3, 226, 160, 6 + squarenote 3, 242, 192, 6 + squarenote 3, 226, 224, 6 + squarenote 3, 210, 0, 7 + squarenote 3, 194, 224, 6 + squarenote 3, 210, 192, 6 + squarenote 8, 193, 160, 6 endchannel SFX_Cry18_3_Ch5: dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 + squarenote 9, 213, 49, 6 + squarenote 3, 210, 82, 6 + squarenote 3, 226, 113, 6 + squarenote 3, 178, 145, 6 + squarenote 3, 194, 178, 6 + squarenote 3, 178, 145, 6 + squarenote 3, 194, 113, 6 + squarenote 8, 177, 81, 6 endchannel SFX_Cry18_3_Ch7: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 + noisenote 6, 227, 76 + noisenote 4, 195, 60 + noisenote 5, 212, 60 + noisenote 4, 196, 44 + noisenote 6, 180, 60 + noisenote 8, 193, 44 endchannel diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm index 2e6790e5..badcd4f9 100644 --- a/audio/sfx/cry19_1.asm +++ b/audio/sfx/cry19_1.asm @@ -1,17 +1,17 @@ SFX_Cry19_1_Ch4: dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 + squarenote 7, 210, 64, 7 + squarenote 15, 229, 96, 7 + squarenote 15, 193, 48, 7 endchannel SFX_Cry19_1_Ch5: dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 + squarenote 2, 194, 1, 7 + squarenote 4, 194, 8, 7 + squarenote 15, 215, 65, 7 + squarenote 15, 162, 1, 7 SFX_Cry19_1_Ch7: diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm index f412ec14..baba2a1f 100644 --- a/audio/sfx/cry19_2.asm +++ b/audio/sfx/cry19_2.asm @@ -1,17 +1,17 @@ SFX_Cry19_2_Ch4: dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 + squarenote 7, 210, 64, 7 + squarenote 15, 229, 96, 7 + squarenote 15, 193, 48, 7 endchannel SFX_Cry19_2_Ch5: dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 + squarenote 2, 194, 1, 7 + squarenote 4, 194, 8, 7 + squarenote 15, 215, 65, 7 + squarenote 15, 162, 1, 7 SFX_Cry19_2_Ch7: diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm index 2baff05e..c2ef3f66 100644 --- a/audio/sfx/cry19_3.asm +++ b/audio/sfx/cry19_3.asm @@ -1,17 +1,17 @@ SFX_Cry19_3_Ch4: dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 + squarenote 7, 210, 64, 7 + squarenote 15, 229, 96, 7 + squarenote 15, 193, 48, 7 endchannel SFX_Cry19_3_Ch5: dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 + squarenote 2, 194, 1, 7 + squarenote 4, 194, 8, 7 + squarenote 15, 215, 65, 7 + squarenote 15, 162, 1, 7 SFX_Cry19_3_Ch7: diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm index 5d03596e..db8dee74 100644 --- a/audio/sfx/cry1a_1.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,30 +1,30 @@ SFX_Cry1A_1_Ch4: dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 + squarenote 6, 247, 64, 7 + squarenote 12, 230, 68, 7 + squarenote 6, 213, 80, 7 + squarenote 4, 195, 96, 7 + squarenote 3, 195, 128, 7 + squarenote 8, 209, 160, 7 endchannel SFX_Cry1A_1_Ch5: dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 + squarenote 6, 199, 1, 7 + squarenote 11, 182, 2, 7 + squarenote 6, 165, 17, 7 + squarenote 4, 147, 33, 7 + squarenote 3, 163, 65, 7 + squarenote 8, 145, 98, 7 endchannel SFX_Cry1A_1_Ch7: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 + noisenote 3, 226, 60 + noisenote 8, 214, 76 + noisenote 5, 212, 60 + noisenote 12, 199, 76 + noisenote 2, 226, 60 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm index 4dcf2a42..6b2a3a9f 100644 --- a/audio/sfx/cry1a_2.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,30 +1,30 @@ SFX_Cry1A_2_Ch4: dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 + squarenote 6, 247, 64, 7 + squarenote 12, 230, 68, 7 + squarenote 6, 213, 80, 7 + squarenote 4, 195, 96, 7 + squarenote 3, 195, 128, 7 + squarenote 8, 209, 160, 7 endchannel SFX_Cry1A_2_Ch5: dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 + squarenote 6, 199, 1, 7 + squarenote 11, 182, 2, 7 + squarenote 6, 165, 17, 7 + squarenote 4, 147, 33, 7 + squarenote 3, 163, 65, 7 + squarenote 8, 145, 98, 7 endchannel SFX_Cry1A_2_Ch7: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 + noisenote 3, 226, 60 + noisenote 8, 214, 76 + noisenote 5, 212, 60 + noisenote 12, 199, 76 + noisenote 2, 226, 60 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm index 274ce438..7ec2f544 100644 --- a/audio/sfx/cry1a_3.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,30 +1,30 @@ SFX_Cry1A_3_Ch4: dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 + squarenote 6, 247, 64, 7 + squarenote 12, 230, 68, 7 + squarenote 6, 213, 80, 7 + squarenote 4, 195, 96, 7 + squarenote 3, 195, 128, 7 + squarenote 8, 209, 160, 7 endchannel SFX_Cry1A_3_Ch5: dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 + squarenote 6, 199, 1, 7 + squarenote 11, 182, 2, 7 + squarenote 6, 165, 17, 7 + squarenote 4, 147, 33, 7 + squarenote 3, 163, 65, 7 + squarenote 8, 145, 98, 7 endchannel SFX_Cry1A_3_Ch7: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 + noisenote 3, 226, 60 + noisenote 8, 214, 76 + noisenote 5, 212, 60 + noisenote 12, 199, 76 + noisenote 2, 226, 60 + noisenote 8, 209, 44 endchannel diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm index 562239c7..7eb1a301 100644 --- a/audio/sfx/cry1b_1.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,26 +1,26 @@ SFX_Cry1B_1_Ch4: dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 + squarenote 6, 247, 192, 6 + squarenote 15, 231, 0, 7 + squarenote 4, 244, 240, 6 + squarenote 4, 228, 224, 6 + squarenote 8, 209, 208, 6 endchannel SFX_Cry1B_1_Ch5: dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 + squarenote 7, 230, 129, 6 + squarenote 14, 213, 193, 6 + squarenote 4, 196, 177, 6 + squarenote 4, 212, 161, 6 + squarenote 8, 193, 145, 6 endchannel SFX_Cry1B_1_Ch7: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 + noisenote 10, 166, 60 + noisenote 14, 148, 44 + noisenote 5, 163, 60 + noisenote 8, 145, 44 endchannel diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm index 45bb41a2..c3ff4c8e 100644 --- a/audio/sfx/cry1b_2.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,26 +1,26 @@ SFX_Cry1B_2_Ch4: dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 + squarenote 6, 247, 192, 6 + squarenote 15, 231, 0, 7 + squarenote 4, 244, 240, 6 + squarenote 4, 228, 224, 6 + squarenote 8, 209, 208, 6 endchannel SFX_Cry1B_2_Ch5: dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 + squarenote 7, 230, 129, 6 + squarenote 14, 213, 193, 6 + squarenote 4, 196, 177, 6 + squarenote 4, 212, 161, 6 + squarenote 8, 193, 145, 6 endchannel SFX_Cry1B_2_Ch7: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 + noisenote 10, 166, 60 + noisenote 14, 148, 44 + noisenote 5, 163, 60 + noisenote 8, 145, 44 endchannel diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm index e6e31b00..eb1cc9df 100644 --- a/audio/sfx/cry1b_3.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,26 +1,26 @@ SFX_Cry1B_3_Ch4: dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 + squarenote 6, 247, 192, 6 + squarenote 15, 231, 0, 7 + squarenote 4, 244, 240, 6 + squarenote 4, 228, 224, 6 + squarenote 8, 209, 208, 6 endchannel SFX_Cry1B_3_Ch5: dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 + squarenote 7, 230, 129, 6 + squarenote 14, 213, 193, 6 + squarenote 4, 196, 177, 6 + squarenote 4, 212, 161, 6 + squarenote 8, 193, 145, 6 endchannel SFX_Cry1B_3_Ch7: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 + noisenote 10, 166, 60 + noisenote 14, 148, 44 + noisenote 5, 163, 60 + noisenote 8, 145, 44 endchannel diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm index 332b7da8..66c9e397 100644 --- a/audio/sfx/cry1c_1.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,31 +1,31 @@ SFX_Cry1C_1_Ch4: dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 + squarenote 7, 214, 225, 7 + squarenote 6, 198, 226, 7 + squarenote 9, 214, 225, 7 + squarenote 7, 198, 224, 7 + squarenote 5, 182, 226, 7 + squarenote 7, 198, 225, 7 + squarenote 6, 182, 224, 7 + squarenote 8, 161, 223, 7 endchannel SFX_Cry1C_1_Ch5: dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 + squarenote 6, 195, 201, 7 + squarenote 6, 179, 199, 7 + squarenote 10, 196, 195, 7 + squarenote 8, 180, 199, 7 + squarenote 6, 195, 201, 7 + squarenote 15, 162, 197, 7 endchannel SFX_Cry1C_1_Ch7: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 + noisenote 13, 25, 124 + noisenote 13, 247, 140 + noisenote 12, 214, 124 + noisenote 8, 196, 108 + noisenote 15, 179, 92 endchannel diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm index aee95be5..12096df3 100644 --- a/audio/sfx/cry1c_2.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,31 +1,31 @@ SFX_Cry1C_2_Ch4: dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 + squarenote 7, 214, 225, 7 + squarenote 6, 198, 226, 7 + squarenote 9, 214, 225, 7 + squarenote 7, 198, 224, 7 + squarenote 5, 182, 226, 7 + squarenote 7, 198, 225, 7 + squarenote 6, 182, 224, 7 + squarenote 8, 161, 223, 7 endchannel SFX_Cry1C_2_Ch5: dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 + squarenote 6, 195, 201, 7 + squarenote 6, 179, 199, 7 + squarenote 10, 196, 195, 7 + squarenote 8, 180, 199, 7 + squarenote 6, 195, 201, 7 + squarenote 15, 162, 197, 7 endchannel SFX_Cry1C_2_Ch7: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 + noisenote 13, 25, 124 + noisenote 13, 247, 140 + noisenote 12, 214, 124 + noisenote 8, 196, 108 + noisenote 15, 179, 92 endchannel diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm index 13e687f6..b126abb0 100644 --- a/audio/sfx/cry1c_3.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,31 +1,31 @@ SFX_Cry1C_3_Ch4: dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 + squarenote 7, 214, 225, 7 + squarenote 6, 198, 226, 7 + squarenote 9, 214, 225, 7 + squarenote 7, 198, 224, 7 + squarenote 5, 182, 226, 7 + squarenote 7, 198, 225, 7 + squarenote 6, 182, 224, 7 + squarenote 8, 161, 223, 7 endchannel SFX_Cry1C_3_Ch5: dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 + squarenote 6, 195, 201, 7 + squarenote 6, 179, 199, 7 + squarenote 10, 196, 195, 7 + squarenote 8, 180, 199, 7 + squarenote 6, 195, 201, 7 + squarenote 15, 162, 197, 7 endchannel SFX_Cry1C_3_Ch7: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 + noisenote 13, 25, 124 + noisenote 13, 247, 140 + noisenote 12, 214, 124 + noisenote 8, 196, 108 + noisenote 15, 179, 92 endchannel diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm index 4e7b6308..056ed408 100644 --- a/audio/sfx/cry1d_1.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,29 +1,29 @@ SFX_Cry1D_1_Ch4: dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 + squarenote 15, 240, 5, 7 + squarenote 10, 224, 0, 7 + squarenote 6, 180, 16, 7 + squarenote 4, 211, 0, 7 + squarenote 6, 178, 32, 6 + squarenote 8, 161, 36, 6 endchannel SFX_Cry1D_1_Ch5: dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 + squarenote 15, 176, 195, 6 + squarenote 10, 160, 193, 6 + squarenote 6, 132, 210, 6 + squarenote 4, 147, 193, 6 + squarenote 6, 130, 225, 5 + squarenote 8, 97, 232, 5 endchannel SFX_Cry1D_1_Ch7: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 + noisenote 6, 230, 76 + noisenote 15, 214, 60 + noisenote 10, 197, 74 + noisenote 1, 178, 91 + noisenote 15, 194, 76 endchannel diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm index 9ee56bf8..bfce7c66 100644 --- a/audio/sfx/cry1d_2.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,29 +1,29 @@ SFX_Cry1D_2_Ch4: dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 + squarenote 15, 240, 5, 7 + squarenote 10, 224, 0, 7 + squarenote 6, 180, 16, 7 + squarenote 4, 211, 0, 7 + squarenote 6, 178, 32, 6 + squarenote 8, 161, 36, 6 endchannel SFX_Cry1D_2_Ch5: dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 + squarenote 15, 176, 195, 6 + squarenote 10, 160, 193, 6 + squarenote 6, 132, 210, 6 + squarenote 4, 147, 193, 6 + squarenote 6, 130, 225, 5 + squarenote 8, 97, 232, 5 endchannel SFX_Cry1D_2_Ch7: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 + noisenote 6, 230, 76 + noisenote 15, 214, 60 + noisenote 10, 197, 74 + noisenote 1, 178, 91 + noisenote 15, 194, 76 endchannel diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm index e2e5fae3..8b05e3cb 100644 --- a/audio/sfx/cry1d_3.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,29 +1,29 @@ SFX_Cry1D_3_Ch4: dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 + squarenote 15, 240, 5, 7 + squarenote 10, 224, 0, 7 + squarenote 6, 180, 16, 7 + squarenote 4, 211, 0, 7 + squarenote 6, 178, 32, 6 + squarenote 8, 161, 36, 6 endchannel SFX_Cry1D_3_Ch5: dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 + squarenote 15, 176, 195, 6 + squarenote 10, 160, 193, 6 + squarenote 6, 132, 210, 6 + squarenote 4, 147, 193, 6 + squarenote 6, 130, 225, 5 + squarenote 8, 97, 232, 5 endchannel SFX_Cry1D_3_Ch7: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 + noisenote 6, 230, 76 + noisenote 15, 214, 60 + noisenote 10, 197, 74 + noisenote 1, 178, 91 + noisenote 15, 194, 76 endchannel diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm index 56d97001..d6bf2450 100644 --- a/audio/sfx/cry1e_1.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,38 +1,38 @@ SFX_Cry1E_1_Ch4: dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 + squarenote 6, 242, 0, 6 + squarenote 6, 226, 64, 6 + squarenote 6, 210, 128, 6 + squarenote 6, 226, 192, 6 + squarenote 6, 210, 0, 7 + squarenote 6, 194, 64, 7 + squarenote 6, 178, 128, 7 + squarenote 8, 161, 192, 7 endchannel SFX_Cry1E_1_Ch5: dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 + squarenote 3, 8, 1, 0 + squarenote 6, 194, 193, 5 + squarenote 6, 178, 2, 6 + squarenote 6, 162, 65, 6 + squarenote 6, 178, 130, 6 + squarenote 6, 162, 194, 6 + squarenote 6, 146, 1, 7 + squarenote 6, 162, 66, 7 + squarenote 8, 129, 129, 7 endchannel SFX_Cry1E_1_Ch7: - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 + noisenote 6, 8, 1 + noisenote 5, 226, 92 + noisenote 5, 194, 76 + noisenote 5, 210, 60 + noisenote 5, 178, 44 + noisenote 5, 194, 28 + noisenote 5, 162, 27 + noisenote 5, 146, 26 + noisenote 8, 129, 24 endchannel diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm index 7ed25afe..c9f7a2ed 100644 --- a/audio/sfx/cry1e_2.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,38 +1,38 @@ SFX_Cry1E_2_Ch4: dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 + squarenote 6, 242, 0, 6 + squarenote 6, 226, 64, 6 + squarenote 6, 210, 128, 6 + squarenote 6, 226, 192, 6 + squarenote 6, 210, 0, 7 + squarenote 6, 194, 64, 7 + squarenote 6, 178, 128, 7 + squarenote 8, 161, 192, 7 endchannel SFX_Cry1E_2_Ch5: dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 + squarenote 3, 8, 1, 0 + squarenote 6, 194, 193, 5 + squarenote 6, 178, 2, 6 + squarenote 6, 162, 65, 6 + squarenote 6, 178, 130, 6 + squarenote 6, 162, 194, 6 + squarenote 6, 146, 1, 7 + squarenote 6, 162, 66, 7 + squarenote 8, 129, 129, 7 endchannel SFX_Cry1E_2_Ch7: - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 + noisenote 6, 8, 1 + noisenote 5, 226, 92 + noisenote 5, 194, 76 + noisenote 5, 210, 60 + noisenote 5, 178, 44 + noisenote 5, 194, 28 + noisenote 5, 162, 27 + noisenote 5, 146, 26 + noisenote 8, 129, 24 endchannel diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm index 82dbdfcc..d54c72c9 100644 --- a/audio/sfx/cry1e_3.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,38 +1,38 @@ SFX_Cry1E_3_Ch4: dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 + squarenote 6, 242, 0, 6 + squarenote 6, 226, 64, 6 + squarenote 6, 210, 128, 6 + squarenote 6, 226, 192, 6 + squarenote 6, 210, 0, 7 + squarenote 6, 194, 64, 7 + squarenote 6, 178, 128, 7 + squarenote 8, 161, 192, 7 endchannel SFX_Cry1E_3_Ch5: dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 + squarenote 3, 8, 1, 0 + squarenote 6, 194, 193, 5 + squarenote 6, 178, 2, 6 + squarenote 6, 162, 65, 6 + squarenote 6, 178, 130, 6 + squarenote 6, 162, 194, 6 + squarenote 6, 146, 1, 7 + squarenote 6, 162, 66, 7 + squarenote 8, 129, 129, 7 endchannel SFX_Cry1E_3_Ch7: - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 + noisenote 6, 8, 1 + noisenote 5, 226, 92 + noisenote 5, 194, 76 + noisenote 5, 210, 60 + noisenote 5, 178, 44 + noisenote 5, 194, 28 + noisenote 5, 162, 27 + noisenote 5, 146, 26 + noisenote 8, 129, 24 endchannel diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm index a38bd975..a636c051 100644 --- a/audio/sfx/cry1f_1.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,24 +1,24 @@ SFX_Cry1F_1_Ch4: dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 + squarenote 3, 244, 65, 6 + squarenote 13, 214, 33, 7 + squarenote 8, 244, 25, 7 + squarenote 8, 193, 26, 7 endchannel SFX_Cry1F_1_Ch5: dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 + squarenote 4, 244, 128, 5 + squarenote 14, 230, 224, 6 + squarenote 8, 213, 216, 6 + squarenote 8, 209, 220, 6 endchannel SFX_Cry1F_1_Ch7: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 + noisenote 5, 196, 70 + noisenote 13, 165, 68 + noisenote 8, 196, 69 + noisenote 8, 177, 68 endchannel diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm index 3d261bb2..efda76fa 100644 --- a/audio/sfx/cry1f_2.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,24 +1,24 @@ SFX_Cry1F_2_Ch4: dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 + squarenote 3, 244, 65, 6 + squarenote 13, 214, 33, 7 + squarenote 8, 244, 25, 7 + squarenote 8, 193, 26, 7 endchannel SFX_Cry1F_2_Ch5: dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 + squarenote 4, 244, 128, 5 + squarenote 14, 230, 224, 6 + squarenote 8, 213, 216, 6 + squarenote 8, 209, 220, 6 endchannel SFX_Cry1F_2_Ch7: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 + noisenote 5, 196, 70 + noisenote 13, 165, 68 + noisenote 8, 196, 69 + noisenote 8, 177, 68 endchannel diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm index 2bdfe24b..ea2403a5 100644 --- a/audio/sfx/cry1f_3.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,24 +1,24 @@ SFX_Cry1F_3_Ch4: dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 + squarenote 3, 244, 65, 6 + squarenote 13, 214, 33, 7 + squarenote 8, 244, 25, 7 + squarenote 8, 193, 26, 7 endchannel SFX_Cry1F_3_Ch5: dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 + squarenote 4, 244, 128, 5 + squarenote 14, 230, 224, 6 + squarenote 8, 213, 216, 6 + squarenote 8, 209, 220, 6 endchannel SFX_Cry1F_3_Ch7: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 + noisenote 5, 196, 70 + noisenote 13, 165, 68 + noisenote 8, 196, 69 + noisenote 8, 177, 68 endchannel diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm index 14ec6942..2ba98882 100644 --- a/audio/sfx/cry20_1.asm +++ b/audio/sfx/cry20_1.asm @@ -1,24 +1,24 @@ SFX_Cry20_1_Ch4: dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 + squarenote 13, 241, 17, 5 + squarenote 13, 225, 21, 5 + squarenote 13, 225, 17, 5 + squarenote 8, 209, 17, 5 endchannel SFX_Cry20_1_Ch5: dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 + squarenote 12, 225, 12, 5 + squarenote 12, 209, 16, 5 + squarenote 14, 193, 12, 5 + squarenote 8, 193, 10, 5 endchannel SFX_Cry20_1_Ch7: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 + noisenote 14, 242, 101 + noisenote 13, 226, 85 + noisenote 14, 210, 86 + noisenote 8, 209, 102 endchannel diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm index bcbf27a6..ae3ae4de 100644 --- a/audio/sfx/cry20_2.asm +++ b/audio/sfx/cry20_2.asm @@ -1,24 +1,24 @@ SFX_Cry20_2_Ch4: dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 + squarenote 13, 241, 17, 5 + squarenote 13, 225, 21, 5 + squarenote 13, 225, 17, 5 + squarenote 8, 209, 17, 5 endchannel SFX_Cry20_2_Ch5: dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 + squarenote 12, 225, 12, 5 + squarenote 12, 209, 16, 5 + squarenote 14, 193, 12, 5 + squarenote 8, 193, 10, 5 endchannel SFX_Cry20_2_Ch7: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 + noisenote 14, 242, 101 + noisenote 13, 226, 85 + noisenote 14, 210, 86 + noisenote 8, 209, 102 endchannel diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm index 12e42d7f..1587a0aa 100644 --- a/audio/sfx/cry20_3.asm +++ b/audio/sfx/cry20_3.asm @@ -1,24 +1,24 @@ SFX_Cry20_3_Ch4: dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 + squarenote 13, 241, 17, 5 + squarenote 13, 225, 21, 5 + squarenote 13, 225, 17, 5 + squarenote 8, 209, 17, 5 endchannel SFX_Cry20_3_Ch5: dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 + squarenote 12, 225, 12, 5 + squarenote 12, 209, 16, 5 + squarenote 14, 193, 12, 5 + squarenote 8, 193, 10, 5 endchannel SFX_Cry20_3_Ch7: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 + noisenote 14, 242, 101 + noisenote 13, 226, 85 + noisenote 14, 210, 86 + noisenote 8, 209, 102 endchannel diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm index c08704d7..0d099839 100644 --- a/audio/sfx/cry21_1.asm +++ b/audio/sfx/cry21_1.asm @@ -1,26 +1,26 @@ SFX_Cry21_1_Ch4: dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 + squarenote 3, 243, 100, 5 + squarenote 2, 226, 68, 5 + squarenote 5, 209, 34, 5 + squarenote 2, 178, 132, 4 + squarenote 8, 209, 162, 4 + squarenote 3, 243, 36, 5 + squarenote 4, 228, 228, 4 + squarenote 8, 209, 2, 5 endchannel SFX_Cry21_1_Ch5: dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 + squarenote 3, 211, 96, 5 + squarenote 2, 194, 64, 5 + squarenote 5, 193, 32, 5 + squarenote 2, 146, 128, 4 + squarenote 8, 193, 160, 4 + squarenote 3, 211, 32, 5 + squarenote 3, 196, 224, 4 + squarenote 8, 193, 0, 5 SFX_Cry21_1_Ch7: diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm index b8f68dbd..a4ec20b2 100644 --- a/audio/sfx/cry21_2.asm +++ b/audio/sfx/cry21_2.asm @@ -1,26 +1,26 @@ SFX_Cry21_2_Ch4: dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 + squarenote 3, 243, 100, 5 + squarenote 2, 226, 68, 5 + squarenote 5, 209, 34, 5 + squarenote 2, 178, 132, 4 + squarenote 8, 209, 162, 4 + squarenote 3, 243, 36, 5 + squarenote 4, 228, 228, 4 + squarenote 8, 209, 2, 5 endchannel SFX_Cry21_2_Ch5: dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 + squarenote 3, 211, 96, 5 + squarenote 2, 194, 64, 5 + squarenote 5, 193, 32, 5 + squarenote 2, 146, 128, 4 + squarenote 8, 193, 160, 4 + squarenote 3, 211, 32, 5 + squarenote 3, 196, 224, 4 + squarenote 8, 193, 0, 5 SFX_Cry21_2_Ch7: diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm index 4a549af9..9fa85b11 100644 --- a/audio/sfx/cry21_3.asm +++ b/audio/sfx/cry21_3.asm @@ -1,26 +1,26 @@ SFX_Cry21_3_Ch4: dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 + squarenote 3, 243, 100, 5 + squarenote 2, 226, 68, 5 + squarenote 5, 209, 34, 5 + squarenote 2, 178, 132, 4 + squarenote 8, 209, 162, 4 + squarenote 3, 243, 36, 5 + squarenote 4, 228, 228, 4 + squarenote 8, 209, 2, 5 endchannel SFX_Cry21_3_Ch5: dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 + squarenote 3, 211, 96, 5 + squarenote 2, 194, 64, 5 + squarenote 5, 193, 32, 5 + squarenote 2, 146, 128, 4 + squarenote 8, 193, 160, 4 + squarenote 3, 211, 32, 5 + squarenote 3, 196, 224, 4 + squarenote 8, 193, 0, 5 SFX_Cry21_3_Ch7: diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm index 0da8dbd2..71f026b6 100644 --- a/audio/sfx/cry22_1.asm +++ b/audio/sfx/cry22_1.asm @@ -1,24 +1,24 @@ SFX_Cry22_1_Ch4: dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 + squarenote 2, 61, 129, 3 + squarenote 7, 245, 1, 6 + squarenote 1, 194, 129, 4 + squarenote 8, 145, 129, 3 endchannel SFX_Cry22_1_Ch5: dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 + squarenote 2, 62, 176, 5 + squarenote 7, 213, 93, 7 + squarenote 1, 178, 176, 6 + squarenote 8, 97, 176, 5 endchannel SFX_Cry22_1_Ch7: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 + noisenote 2, 146, 73 + noisenote 7, 181, 41 + noisenote 1, 162, 57 + noisenote 8, 145, 73 endchannel diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm index d7456dbc..e47021e4 100644 --- a/audio/sfx/cry22_2.asm +++ b/audio/sfx/cry22_2.asm @@ -1,24 +1,24 @@ SFX_Cry22_2_Ch4: dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 + squarenote 2, 61, 129, 3 + squarenote 7, 245, 1, 6 + squarenote 1, 194, 129, 4 + squarenote 8, 145, 129, 3 endchannel SFX_Cry22_2_Ch5: dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 + squarenote 2, 62, 176, 5 + squarenote 7, 213, 93, 7 + squarenote 1, 178, 176, 6 + squarenote 8, 97, 176, 5 endchannel SFX_Cry22_2_Ch7: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 + noisenote 2, 146, 73 + noisenote 7, 181, 41 + noisenote 1, 162, 57 + noisenote 8, 145, 73 endchannel diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm index 927c174c..19ee38a5 100644 --- a/audio/sfx/cry22_3.asm +++ b/audio/sfx/cry22_3.asm @@ -1,24 +1,24 @@ SFX_Cry22_3_Ch4: dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 + squarenote 2, 61, 129, 3 + squarenote 7, 245, 1, 6 + squarenote 1, 194, 129, 4 + squarenote 8, 145, 129, 3 endchannel SFX_Cry22_3_Ch5: dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 + squarenote 2, 62, 176, 5 + squarenote 7, 213, 93, 7 + squarenote 1, 178, 176, 6 + squarenote 8, 97, 176, 5 endchannel SFX_Cry22_3_Ch7: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 + noisenote 2, 146, 73 + noisenote 7, 181, 41 + noisenote 1, 162, 57 + noisenote 8, 145, 73 endchannel diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm index cc0587d7..87bcf9c5 100644 --- a/audio/sfx/cry23_1.asm +++ b/audio/sfx/cry23_1.asm @@ -1,25 +1,25 @@ SFX_Cry23_1_Ch4: dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 + squarenote 15, 247, 192, 7 + squarenote 6, 228, 193, 7 + squarenote 10, 246, 192, 7 + squarenote 4, 211, 194, 7 + squarenote 8, 193, 192, 7 endchannel SFX_Cry23_1_Ch5: dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 + squarenote 15, 151, 129, 7 + squarenote 6, 132, 128, 7 + squarenote 10, 150, 129, 7 + squarenote 15, 131, 129, 7 endchannel SFX_Cry23_1_Ch7: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 + noisenote 3, 242, 60 + noisenote 13, 230, 44 + noisenote 15, 215, 60 + noisenote 8, 193, 44 endchannel diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm index 5d130aa5..d53448ea 100644 --- a/audio/sfx/cry23_2.asm +++ b/audio/sfx/cry23_2.asm @@ -1,25 +1,25 @@ SFX_Cry23_2_Ch4: dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 + squarenote 15, 247, 192, 7 + squarenote 6, 228, 193, 7 + squarenote 10, 246, 192, 7 + squarenote 4, 211, 194, 7 + squarenote 8, 193, 192, 7 endchannel SFX_Cry23_2_Ch5: dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 + squarenote 15, 151, 129, 7 + squarenote 6, 132, 128, 7 + squarenote 10, 150, 129, 7 + squarenote 15, 131, 129, 7 endchannel SFX_Cry23_2_Ch7: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 + noisenote 3, 242, 60 + noisenote 13, 230, 44 + noisenote 15, 215, 60 + noisenote 8, 193, 44 endchannel diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm index 8ada0c63..c8f76727 100644 --- a/audio/sfx/cry23_3.asm +++ b/audio/sfx/cry23_3.asm @@ -1,25 +1,25 @@ SFX_Cry23_3_Ch4: dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 + squarenote 15, 247, 192, 7 + squarenote 6, 228, 193, 7 + squarenote 10, 246, 192, 7 + squarenote 4, 211, 194, 7 + squarenote 8, 193, 192, 7 endchannel SFX_Cry23_3_Ch5: dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 + squarenote 15, 151, 129, 7 + squarenote 6, 132, 128, 7 + squarenote 10, 150, 129, 7 + squarenote 15, 131, 129, 7 endchannel SFX_Cry23_3_Ch7: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 + noisenote 3, 242, 60 + noisenote 13, 230, 44 + noisenote 15, 215, 60 + noisenote 8, 193, 44 endchannel diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm index f79dc72c..0beb9ce5 100644 --- a/audio/sfx/cry24_1.asm +++ b/audio/sfx/cry24_1.asm @@ -1,33 +1,33 @@ SFX_Cry24_1_Ch4: dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 + squarenote 15, 247, 128, 6 + squarenote 10, 230, 132, 6 + squarenote 15, 215, 144, 6 + squarenote 8, 213, 144, 6 + squarenote 6, 196, 136, 6 + squarenote 5, 211, 112, 6 + squarenote 4, 211, 96, 6 + squarenote 8, 193, 64, 6 endchannel SFX_Cry24_1_Ch5: dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 + squarenote 15, 183, 65, 6 + squarenote 10, 150, 66, 6 + squarenote 15, 167, 81, 6 + squarenote 8, 165, 81, 6 + squarenote 6, 148, 71, 6 + squarenote 5, 163, 49, 6 + squarenote 4, 147, 34, 6 + squarenote 8, 113, 1, 6 endchannel SFX_Cry24_1_Ch7: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 + noisenote 15, 228, 60 + noisenote 10, 199, 76 + noisenote 10, 199, 60 + noisenote 12, 183, 76 + noisenote 15, 162, 92 endchannel diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm index aede2b95..67d8c45e 100644 --- a/audio/sfx/cry24_2.asm +++ b/audio/sfx/cry24_2.asm @@ -1,33 +1,33 @@ SFX_Cry24_2_Ch4: dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 + squarenote 15, 247, 128, 6 + squarenote 10, 230, 132, 6 + squarenote 15, 215, 144, 6 + squarenote 8, 213, 144, 6 + squarenote 6, 196, 136, 6 + squarenote 5, 211, 112, 6 + squarenote 4, 211, 96, 6 + squarenote 8, 193, 64, 6 endchannel SFX_Cry24_2_Ch5: dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 + squarenote 15, 183, 65, 6 + squarenote 10, 150, 66, 6 + squarenote 15, 167, 81, 6 + squarenote 8, 165, 81, 6 + squarenote 6, 148, 71, 6 + squarenote 5, 163, 49, 6 + squarenote 4, 147, 34, 6 + squarenote 8, 113, 1, 6 endchannel SFX_Cry24_2_Ch7: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 + noisenote 15, 228, 60 + noisenote 10, 199, 76 + noisenote 10, 199, 60 + noisenote 12, 183, 76 + noisenote 15, 162, 92 endchannel diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm index cad3ada1..10f87daf 100644 --- a/audio/sfx/cry24_3.asm +++ b/audio/sfx/cry24_3.asm @@ -1,33 +1,33 @@ SFX_Cry24_3_Ch4: dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 + squarenote 15, 247, 128, 6 + squarenote 10, 230, 132, 6 + squarenote 15, 215, 144, 6 + squarenote 8, 213, 144, 6 + squarenote 6, 196, 136, 6 + squarenote 5, 211, 112, 6 + squarenote 4, 211, 96, 6 + squarenote 8, 193, 64, 6 endchannel SFX_Cry24_3_Ch5: dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 + squarenote 15, 183, 65, 6 + squarenote 10, 150, 66, 6 + squarenote 15, 167, 81, 6 + squarenote 8, 165, 81, 6 + squarenote 6, 148, 71, 6 + squarenote 5, 163, 49, 6 + squarenote 4, 147, 34, 6 + squarenote 8, 113, 1, 6 endchannel SFX_Cry24_3_Ch7: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 + noisenote 15, 228, 60 + noisenote 10, 199, 76 + noisenote 10, 199, 60 + noisenote 12, 183, 76 + noisenote 15, 162, 92 endchannel diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm index f3ae46ae..35de0e60 100644 --- a/audio/sfx/cry25_1.asm +++ b/audio/sfx/cry25_1.asm @@ -1,26 +1,26 @@ SFX_Cry25_1_Ch4: dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 + squarenote 6, 244, 64, 7 + squarenote 15, 227, 48, 7 + squarenote 4, 244, 64, 7 + squarenote 5, 179, 72, 7 + squarenote 8, 209, 80, 7 endchannel SFX_Cry25_1_Ch5: dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 + squarenote 6, 195, 18, 7 + squarenote 15, 179, 4, 7 + squarenote 3, 195, 18, 7 + squarenote 4, 195, 33, 7 + squarenote 8, 177, 50, 7 endchannel SFX_Cry25_1_Ch7: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 + noisenote 8, 214, 44 + noisenote 12, 198, 60 + noisenote 10, 182, 44 + noisenote 8, 145, 28 endchannel diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm index 9b976b4e..cef33546 100644 --- a/audio/sfx/cry25_2.asm +++ b/audio/sfx/cry25_2.asm @@ -1,26 +1,26 @@ SFX_Cry25_2_Ch4: dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 + squarenote 6, 244, 64, 7 + squarenote 15, 227, 48, 7 + squarenote 4, 244, 64, 7 + squarenote 5, 179, 72, 7 + squarenote 8, 209, 80, 7 endchannel SFX_Cry25_2_Ch5: dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 + squarenote 6, 195, 18, 7 + squarenote 15, 179, 4, 7 + squarenote 3, 195, 18, 7 + squarenote 4, 195, 33, 7 + squarenote 8, 177, 50, 7 endchannel SFX_Cry25_2_Ch7: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 + noisenote 8, 214, 44 + noisenote 12, 198, 60 + noisenote 10, 182, 44 + noisenote 8, 145, 28 endchannel diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm index e76feb9e..a21fd708 100644 --- a/audio/sfx/cry25_3.asm +++ b/audio/sfx/cry25_3.asm @@ -1,26 +1,26 @@ SFX_Cry25_3_Ch4: dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 + squarenote 6, 244, 64, 7 + squarenote 15, 227, 48, 7 + squarenote 4, 244, 64, 7 + squarenote 5, 179, 72, 7 + squarenote 8, 209, 80, 7 endchannel SFX_Cry25_3_Ch5: dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 + squarenote 6, 195, 18, 7 + squarenote 15, 179, 4, 7 + squarenote 3, 195, 18, 7 + squarenote 4, 195, 33, 7 + squarenote 8, 177, 50, 7 endchannel SFX_Cry25_3_Ch7: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 + noisenote 8, 214, 44 + noisenote 12, 198, 60 + noisenote 10, 182, 44 + noisenote 8, 145, 28 endchannel diff --git a/audio/sfx/cut_1.asm b/audio/sfx/cut_1.asm index 73510fd7..c7a39215 100644 --- a/audio/sfx/cut_1.asm +++ b/audio/sfx/cut_1.asm @@ -1,7 +1,7 @@ SFX_Cut_1_Ch7: - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 + noisenote 2, 247, 36 + noisenote 2, 247, 52 + noisenote 4, 247, 68 + noisenote 8, 244, 85 + noisenote 8, 241, 68 endchannel diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm index 6e7d8951..3e2746eb 100644 --- a/audio/sfx/cut_3.asm +++ b/audio/sfx/cut_3.asm @@ -1,7 +1,7 @@ SFX_Cut_3_Ch7: - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 + noisenote 2, 247, 36 + noisenote 2, 247, 52 + noisenote 4, 247, 68 + noisenote 8, 244, 85 + noisenote 8, 241, 68 endchannel diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm index 35cae4df..9d8a0841 100644 --- a/audio/sfx/cymbal1_1.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,3 +1,3 @@ SFX_Cymbal1_1_Ch7: - unknownnoise0x20 0, 161, 16 + noisenote 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm index bffe7690..cc98561c 100644 --- a/audio/sfx/cymbal1_2.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,3 +1,3 @@ SFX_Cymbal1_2_Ch7: - unknownnoise0x20 0, 161, 16 + noisenote 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm index 0f03f455..300e2971 100644 --- a/audio/sfx/cymbal1_3.asm +++ b/audio/sfx/cymbal1_3.asm @@ -1,3 +1,3 @@ SFX_Cymbal1_3_Ch7: - unknownnoise0x20 0, 161, 16 + noisenote 0, 161, 16 endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm index ce19bb6b..5de9ab16 100644 --- a/audio/sfx/cymbal2_1.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,3 +1,3 @@ SFX_Cymbal2_1_Ch7: - unknownnoise0x20 0, 162, 17 + noisenote 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm index f45dec5b..33b904d4 100644 --- a/audio/sfx/cymbal2_2.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,3 +1,3 @@ SFX_Cymbal2_2_Ch7: - unknownnoise0x20 0, 162, 17 + noisenote 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm index 2d2ebf1c..97d60589 100644 --- a/audio/sfx/cymbal2_3.asm +++ b/audio/sfx/cymbal2_3.asm @@ -1,3 +1,3 @@ SFX_Cymbal2_3_Ch7: - unknownnoise0x20 0, 162, 17 + noisenote 0, 162, 17 endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm index 98f3977d..a788cca2 100644 --- a/audio/sfx/cymbal3_1.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,3 +1,3 @@ SFX_Cymbal3_1_Ch7: - unknownnoise0x20 0, 162, 80 + noisenote 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm index 2a2cb997..b67984c6 100644 --- a/audio/sfx/cymbal3_2.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,3 +1,3 @@ SFX_Cymbal3_2_Ch7: - unknownnoise0x20 0, 162, 80 + noisenote 0, 162, 80 endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm index 60b96278..06b7f218 100644 --- a/audio/sfx/cymbal3_3.asm +++ b/audio/sfx/cymbal3_3.asm @@ -1,3 +1,3 @@ SFX_Cymbal3_3_Ch7: - unknownnoise0x20 0, 162, 80 + noisenote 0, 162, 80 endchannel diff --git a/audio/sfx/damage.asm b/audio/sfx/damage.asm index 452fd5ed..525f9170 100644 --- a/audio/sfx/damage.asm +++ b/audio/sfx/damage.asm @@ -1,5 +1,5 @@ SFX_Damage_Ch7: - unknownnoise0x20 2, 244, 68 - unknownnoise0x20 2, 244, 20 - unknownnoise0x20 15, 241, 50 + noisenote 2, 244, 68 + noisenote 2, 244, 20 + noisenote 15, 241, 50 endchannel diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index e7d5a8ca..6c9c2336 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,18 +1,18 @@ SFX_Denied_1_Ch4: duty 3 - unknownsfx0x10 90 - unknownsfx0x20 4, 240, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 1, 0, 0, 0 + pitchenvelope 90 + squarenote 4, 240, 0, 5 + pitchenvelope 8 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 0, 5 + squarenote 1, 0, 0, 0 endchannel SFX_Denied_1_Ch5: duty 3 - unknownsfx0x20 4, 240, 1, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 1, 4 - unknownsfx0x20 1, 0, 0, 0 + squarenote 4, 240, 1, 4 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 1, 4 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm index cf3b2a20..0e7768cc 100644 --- a/audio/sfx/denied_3.asm +++ b/audio/sfx/denied_3.asm @@ -1,18 +1,18 @@ SFX_Denied_3_Ch4: duty 3 - unknownsfx0x10 90 - unknownsfx0x20 4, 240, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 1, 0, 0, 0 + pitchenvelope 90 + squarenote 4, 240, 0, 5 + pitchenvelope 8 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 0, 5 + squarenote 1, 0, 0, 0 endchannel SFX_Denied_3_Ch5: duty 3 - unknownsfx0x20 4, 240, 1, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 1, 4 - unknownsfx0x20 1, 0, 0, 0 + squarenote 4, 240, 1, 4 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 1, 4 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 08180071..f5fa966b 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,15 +1,15 @@ SFX_Dex_Page_Added_Ch4: duty 2 - unknownsfx0x10 68 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 + pitchenvelope 68 + squarenote 15, 240, 240, 4 + pitchenvelope 23 + squarenote 15, 242, 80, 6 + pitchenvelope 8 endchannel SFX_Dex_Page_Added_Ch5: duty 2 - unknownsfx0x20 15, 146, 0, 6 - unknownsfx0x20 15, 146, 130, 7 + squarenote 15, 146, 0, 6 + squarenote 15, 146, 130, 7 endchannel diff --git a/audio/sfx/doubleslap.asm b/audio/sfx/doubleslap.asm index 4e71ac36..732c9ac5 100644 --- a/audio/sfx/doubleslap.asm +++ b/audio/sfx/doubleslap.asm @@ -1,4 +1,4 @@ SFX_Doubleslap_Ch7: - unknownnoise0x20 8, 241, 50 - unknownnoise0x20 8, 241, 51 + noisenote 8, 241, 50 + noisenote 8, 241, 51 endchannel diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index 338c32ab..3d615458 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,7 +1,7 @@ SFX_Enter_PC_1_Ch4: duty 2 - unknownsfx0x20 6, 240, 0, 7 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 6, 240, 0, 7 - unknownsfx0x20 1, 0, 0, 0 + squarenote 6, 240, 0, 7 + squarenote 4, 0, 0, 0 + squarenote 6, 240, 0, 7 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm index f34ed9d0..7b6dc02e 100644 --- a/audio/sfx/enter_pc_3.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,7 +1,7 @@ SFX_Enter_PC_3_Ch4: duty 2 - unknownsfx0x20 4, 240, 0, 7 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 4, 240, 0, 7 - unknownsfx0x20 1, 0, 0, 0 + squarenote 4, 240, 0, 7 + squarenote 4, 0, 0, 0 + squarenote 4, 240, 0, 7 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index cd403485..60e997a0 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,6 +1,6 @@ SFX_Faint_Fall_Ch4: duty 1 - unknownsfx0x10 175 - unknownsfx0x20 15, 242, 128, 7 - unknownsfx0x10 8 + pitchenvelope 175 + squarenote 15, 242, 128, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/faint_thud.asm b/audio/sfx/faint_thud.asm index 479efab3..1892a81f 100644 --- a/audio/sfx/faint_thud.asm +++ b/audio/sfx/faint_thud.asm @@ -1,11 +1,11 @@ SFX_Faint_Thud_Ch4: - unknownsfx0x20 15, 209, 0, 2 - unknownsfx0x10 8 + squarenote 15, 209, 0, 2 + pitchenvelope 8 endchannel SFX_Faint_Thud_Ch7: - unknownnoise0x20 4, 245, 51 - unknownnoise0x20 8, 244, 34 - unknownnoise0x20 15, 242, 33 + noisenote 4, 245, 51 + noisenote 8, 244, 34 + noisenote 15, 242, 33 endchannel diff --git a/audio/sfx/fly_1.asm b/audio/sfx/fly_1.asm index ededef48..76b0f2f3 100644 --- a/audio/sfx/fly_1.asm +++ b/audio/sfx/fly_1.asm @@ -1,18 +1,18 @@ SFX_Fly_1_Ch7: - unknownnoise0x20 2, 241, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 161, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 209, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 129, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 177, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 97, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 145, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 65, 18 - unknownnoise0x20 2, 0, 0 + noisenote 2, 241, 18 + noisenote 2, 0, 0 + noisenote 2, 161, 18 + noisenote 2, 0, 0 + noisenote 2, 209, 18 + noisenote 2, 0, 0 + noisenote 2, 129, 18 + noisenote 2, 0, 0 + noisenote 2, 177, 18 + noisenote 2, 0, 0 + noisenote 2, 97, 18 + noisenote 2, 0, 0 + noisenote 2, 145, 18 + noisenote 2, 0, 0 + noisenote 2, 65, 18 + noisenote 2, 0, 0 endchannel diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm index 084c8b4c..5337f8d3 100644 --- a/audio/sfx/fly_3.asm +++ b/audio/sfx/fly_3.asm @@ -1,18 +1,18 @@ SFX_Fly_3_Ch7: - unknownnoise0x20 2, 241, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 161, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 209, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 129, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 177, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 97, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 145, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 65, 18 - unknownnoise0x20 2, 0, 0 + noisenote 2, 241, 18 + noisenote 2, 0, 0 + noisenote 2, 161, 18 + noisenote 2, 0, 0 + noisenote 2, 209, 18 + noisenote 2, 0, 0 + noisenote 2, 129, 18 + noisenote 2, 0, 0 + noisenote 2, 177, 18 + noisenote 2, 0, 0 + noisenote 2, 97, 18 + noisenote 2, 0, 0 + noisenote 2, 145, 18 + noisenote 2, 0, 0 + noisenote 2, 65, 18 + noisenote 2, 0, 0 endchannel diff --git a/audio/sfx/go_inside_1.asm b/audio/sfx/go_inside_1.asm index aa523774..e3ce983e 100644 --- a/audio/sfx/go_inside_1.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,4 +1,4 @@ SFX_Go_Inside_1_Ch7: - unknownnoise0x20 9, 241, 68 - unknownnoise0x20 8, 209, 67 + noisenote 9, 241, 68 + noisenote 8, 209, 67 endchannel diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm index 9939ba6d..467dfe0d 100644 --- a/audio/sfx/go_inside_3.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,4 +1,4 @@ SFX_Go_Inside_3_Ch7: - unknownnoise0x20 9, 241, 68 - unknownnoise0x20 8, 209, 67 + noisenote 9, 241, 68 + noisenote 8, 209, 67 endchannel diff --git a/audio/sfx/go_outside_1.asm b/audio/sfx/go_outside_1.asm index c60bb592..edf384e0 100644 --- a/audio/sfx/go_outside_1.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,7 +1,7 @@ SFX_Go_Outside_1_Ch7: - unknownnoise0x20 2, 241, 84 - unknownnoise0x20 12, 113, 35 - unknownnoise0x20 2, 177, 84 - unknownnoise0x20 12, 97, 35 - unknownnoise0x20 6, 65, 84 + noisenote 2, 241, 84 + noisenote 12, 113, 35 + noisenote 2, 177, 84 + noisenote 12, 97, 35 + noisenote 6, 65, 84 endchannel diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm index 30b9884c..25284c5c 100644 --- a/audio/sfx/go_outside_3.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,7 +1,7 @@ SFX_Go_Outside_3_Ch7: - unknownnoise0x20 2, 241, 84 - unknownnoise0x20 12, 113, 35 - unknownnoise0x20 2, 177, 84 - unknownnoise0x20 12, 97, 35 - unknownnoise0x20 6, 65, 84 + noisenote 2, 241, 84 + noisenote 12, 113, 35 + noisenote 2, 177, 84 + noisenote 12, 97, 35 + noisenote 6, 65, 84 endchannel diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index ca703c09..1166676e 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,9 +1,9 @@ SFX_Heal_Ailment_1_Ch4: duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 + pitchenvelope 20 + squarenote 4, 242, 0, 6 + squarenote 4, 242, 0, 6 + pitchenvelope 23 + squarenote 15, 242, 0, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm index b06abe62..3c768ce7 100644 --- a/audio/sfx/heal_ailment_2.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,9 +1,9 @@ SFX_Heal_Ailment_2_Ch4: duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 + pitchenvelope 20 + squarenote 4, 242, 0, 6 + squarenote 4, 242, 0, 6 + pitchenvelope 23 + squarenote 15, 242, 0, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm index c13d74fd..727000de 100644 --- a/audio/sfx/heal_ailment_3.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,9 +1,9 @@ SFX_Heal_Ailment_3_Ch4: duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 + pitchenvelope 20 + squarenote 4, 242, 0, 6 + squarenote 4, 242, 0, 6 + pitchenvelope 23 + squarenote 15, 242, 0, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index 75400957..6a0cdabf 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,7 +1,7 @@ SFX_Heal_HP_1_Ch4: duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 240, 240, 4 + squarenote 15, 242, 80, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm index 182937cd..a9a441b2 100644 --- a/audio/sfx/heal_hp_2.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,7 +1,7 @@ SFX_Heal_HP_2_Ch4: duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 240, 240, 4 + squarenote 15, 242, 80, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm index c238013a..d1ae5279 100644 --- a/audio/sfx/heal_hp_3.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,7 +1,7 @@ SFX_Heal_HP_3_Ch4: duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 240, 240, 4 + squarenote 15, 242, 80, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index ebaee990..49c40392 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,9 +1,9 @@ SFX_Healing_Machine_1_Ch4: duty 2 - unknownsfx0x10 44 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 2, 241, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 1, 0, 0, 0 + pitchenvelope 44 + squarenote 4, 242, 0, 5 + pitchenvelope 34 + squarenote 2, 241, 0, 5 + pitchenvelope 8 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm index ac11fee4..91f35fa4 100644 --- a/audio/sfx/healing_machine_3.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,9 +1,9 @@ SFX_Healing_Machine_3_Ch4: duty 2 - unknownsfx0x10 44 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 2, 241, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 1, 0, 0, 0 + pitchenvelope 44 + squarenote 4, 242, 0, 5 + pitchenvelope 34 + squarenote 2, 241, 0, 5 + pitchenvelope 8 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/horn_drill.asm b/audio/sfx/horn_drill.asm index 12ca5da6..6eccae73 100644 --- a/audio/sfx/horn_drill.asm +++ b/audio/sfx/horn_drill.asm @@ -1,6 +1,6 @@ SFX_Horn_Drill_Ch7: - unknownnoise0x20 3, 146, 49 - unknownnoise0x20 3, 178, 50 - unknownnoise0x20 3, 194, 51 - unknownnoise0x20 8, 241, 84 + noisenote 3, 146, 49 + noisenote 3, 178, 50 + noisenote 3, 194, 51 + noisenote 8, 241, 84 endchannel diff --git a/audio/sfx/intro_crash.asm b/audio/sfx/intro_crash.asm index 82c58356..79b2c019 100644 --- a/audio/sfx/intro_crash.asm +++ b/audio/sfx/intro_crash.asm @@ -1,4 +1,4 @@ SFX_Intro_Crash_Ch7: - unknownnoise0x20 2, 210, 50 - unknownnoise0x20 15, 242, 67 + noisenote 2, 210, 50 + noisenote 15, 242, 67 endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 0d450e21..6434f0a8 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,6 +1,6 @@ SFX_Intro_Hip_Ch4: duty 2 - unknownsfx0x10 38 - unknownsfx0x20 12, 194, 64, 7 - unknownsfx0x10 8 + pitchenvelope 38 + squarenote 12, 194, 64, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 1bd9faec..89be1bfd 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,6 +1,6 @@ SFX_Intro_Hop_Ch4: duty 2 - unknownsfx0x10 38 - unknownsfx0x20 12, 194, 128, 6 - unknownsfx0x10 8 + pitchenvelope 38 + squarenote 12, 194, 128, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/intro_lunge.asm b/audio/sfx/intro_lunge.asm index bb534a70..c7b4d3ee 100644 --- a/audio/sfx/intro_lunge.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,10 +1,10 @@ SFX_Intro_Lunge_Ch7: - unknownnoise0x20 6, 32, 16 - unknownnoise0x20 6, 47, 64 - unknownnoise0x20 6, 79, 65 - unknownnoise0x20 6, 143, 65 - unknownnoise0x20 6, 207, 66 - unknownnoise0x20 8, 215, 66 - unknownnoise0x20 15, 231, 67 - unknownnoise0x20 15, 242, 67 + noisenote 6, 32, 16 + noisenote 6, 47, 64 + noisenote 6, 79, 65 + noisenote 6, 143, 65 + noisenote 6, 207, 66 + noisenote 8, 215, 66 + noisenote 15, 231, 67 + noisenote 15, 242, 67 endchannel diff --git a/audio/sfx/intro_raise.asm b/audio/sfx/intro_raise.asm index 060ef09a..f9c5b278 100644 --- a/audio/sfx/intro_raise.asm +++ b/audio/sfx/intro_raise.asm @@ -1,5 +1,5 @@ SFX_Intro_Raise_Ch7: - unknownnoise0x20 2, 111, 33 - unknownnoise0x20 2, 175, 49 - unknownnoise0x20 15, 242, 65 + noisenote 2, 111, 33 + noisenote 2, 175, 49 + noisenote 15, 242, 65 endchannel diff --git a/audio/sfx/intro_whoosh.asm b/audio/sfx/intro_whoosh.asm index e874e773..93e6b7bc 100644 --- a/audio/sfx/intro_whoosh.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,7 +1,7 @@ SFX_Intro_Whoosh_Ch7: - unknownnoise0x20 4, 44, 32 - unknownnoise0x20 3, 160, 32 - unknownnoise0x20 3, 176, 33 - unknownnoise0x20 3, 192, 34 - unknownnoise0x20 15, 210, 36 + noisenote 4, 44, 32 + noisenote 3, 160, 32 + noisenote 3, 176, 33 + noisenote 3, 192, 34 + noisenote 15, 210, 36 endchannel diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index 26acaf1b..d9626b09 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,6 +1,6 @@ SFX_Ledge_1_Ch4: duty 2 - unknownsfx0x10 149 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 + pitchenvelope 149 + squarenote 15, 242, 0, 4 + pitchenvelope 8 endchannel diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm index 623e56ce..466ada0b 100644 --- a/audio/sfx/ledge_3.asm +++ b/audio/sfx/ledge_3.asm @@ -1,6 +1,6 @@ SFX_Ledge_3_Ch4: duty 2 - unknownsfx0x10 149 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 + pitchenvelope 149 + squarenote 15, 242, 0, 4 + pitchenvelope 8 endchannel diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm index 4b205470..b6b0f7ab 100644 --- a/audio/sfx/muted_snare1_1.asm +++ b/audio/sfx/muted_snare1_1.asm @@ -1,4 +1,4 @@ SFX_Muted_Snare1_1_Ch7: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 + noisenote 0, 161, 24 + noisenote 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm index d530bd89..60b6c43a 100644 --- a/audio/sfx/muted_snare1_2.asm +++ b/audio/sfx/muted_snare1_2.asm @@ -1,4 +1,4 @@ SFX_Muted_Snare1_2_Ch7: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 + noisenote 0, 161, 24 + noisenote 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm index 8b5c2c6d..9657aadf 100644 --- a/audio/sfx/muted_snare1_3.asm +++ b/audio/sfx/muted_snare1_3.asm @@ -1,4 +1,4 @@ SFX_Muted_Snare1_3_Ch7: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 + noisenote 0, 161, 24 + noisenote 0, 49, 51 endchannel diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm index 4e15e386..efadfbc4 100644 --- a/audio/sfx/muted_snare2_1.asm +++ b/audio/sfx/muted_snare2_1.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare2_1_Ch7: - unknownnoise0x20 0, 145, 34 + noisenote 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm index 5107fb77..9483d633 100644 --- a/audio/sfx/muted_snare2_2.asm +++ b/audio/sfx/muted_snare2_2.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare2_2_Ch7: - unknownnoise0x20 0, 145, 34 + noisenote 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm index 043c870d..e287b461 100644 --- a/audio/sfx/muted_snare2_3.asm +++ b/audio/sfx/muted_snare2_3.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare2_3_Ch7: - unknownnoise0x20 0, 145, 34 + noisenote 0, 145, 34 endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm index d0c689a4..95802909 100644 --- a/audio/sfx/muted_snare3_1.asm +++ b/audio/sfx/muted_snare3_1.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare3_1_Ch7: - unknownnoise0x20 0, 113, 34 + noisenote 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm index 3e470ae6..7f39ca62 100644 --- a/audio/sfx/muted_snare3_2.asm +++ b/audio/sfx/muted_snare3_2.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare3_2_Ch7: - unknownnoise0x20 0, 113, 34 + noisenote 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm index c8749577..7c11a20f 100644 --- a/audio/sfx/muted_snare3_3.asm +++ b/audio/sfx/muted_snare3_3.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare3_3_Ch7: - unknownnoise0x20 0, 113, 34 + noisenote 0, 113, 34 endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm index ebe2ee1d..31f2399b 100644 --- a/audio/sfx/muted_snare4_1.asm +++ b/audio/sfx/muted_snare4_1.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare4_1_Ch7: - unknownnoise0x20 0, 97, 34 + noisenote 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm index bdbe4d11..d658dd4c 100644 --- a/audio/sfx/muted_snare4_2.asm +++ b/audio/sfx/muted_snare4_2.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare4_2_Ch7: - unknownnoise0x20 0, 97, 34 + noisenote 0, 97, 34 endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm index 59d72218..6ba03ff5 100644 --- a/audio/sfx/muted_snare4_3.asm +++ b/audio/sfx/muted_snare4_3.asm @@ -1,3 +1,3 @@ SFX_Muted_Snare4_3_Ch7: - unknownnoise0x20 0, 97, 34 + noisenote 0, 97, 34 endchannel diff --git a/audio/sfx/not_very_effective.asm b/audio/sfx/not_very_effective.asm index 3f74c515..1847daa6 100644 --- a/audio/sfx/not_very_effective.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,6 +1,6 @@ SFX_Not_Very_Effective_Ch7: - unknownnoise0x20 4, 143, 85 - unknownnoise0x20 2, 244, 68 - unknownnoise0x20 8, 244, 34 - unknownnoise0x20 15, 242, 33 + noisenote 4, 143, 85 + noisenote 2, 244, 68 + noisenote 8, 244, 34 + noisenote 15, 242, 33 endchannel diff --git a/audio/sfx/peck.asm b/audio/sfx/peck.asm index cca7ecaa..23970df5 100644 --- a/audio/sfx/peck.asm +++ b/audio/sfx/peck.asm @@ -1,3 +1,3 @@ SFX_Peck_Ch7: - unknownnoise0x20 2, 161, 18 + noisenote 2, 161, 18 endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index 73068b86..3bf3cf91 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,8 +1,8 @@ SFX_Poisoned_1_Ch4: duty 0 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 + pitchenvelope 20 + squarenote 4, 242, 0, 6 loopchannel 4, SFX_Poisoned_1_Ch4 - unknownsfx0x20 15, 243, 0, 6 - unknownsfx0x10 8 + squarenote 15, 243, 0, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm index 7dc973bc..b651e3db 100644 --- a/audio/sfx/poisoned_3.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,8 +1,8 @@ SFX_Poisoned_3_Ch4: duty 0 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 + pitchenvelope 20 + squarenote 4, 242, 0, 6 loopchannel 4, SFX_Poisoned_3_Ch4 - unknownsfx0x20 15, 243, 0, 6 - unknownsfx0x10 8 + squarenote 15, 243, 0, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/pound.asm b/audio/sfx/pound.asm index fc6d292e..93f17c72 100644 --- a/audio/sfx/pound.asm +++ b/audio/sfx/pound.asm @@ -1,3 +1,3 @@ SFX_Pound_Ch7: - unknownnoise0x20 2, 161, 34 + noisenote 2, 161, 34 endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index 95edbf4a..3d40cab3 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,7 +1,7 @@ SFX_Press_AB_1_Ch4: duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 + squarenote 0, 145, 192, 7 + squarenote 0, 129, 208, 7 + squarenote 0, 145, 192, 7 + squarenote 12, 161, 208, 7 endchannel diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm index 0d8faa46..a3f14b74 100644 --- a/audio/sfx/press_ab_2.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,7 +1,7 @@ SFX_Press_AB_2_Ch4: duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 + squarenote 0, 145, 192, 7 + squarenote 0, 129, 208, 7 + squarenote 0, 145, 192, 7 + squarenote 12, 161, 208, 7 endchannel diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm index 0f11fc34..01cf9b92 100644 --- a/audio/sfx/press_ab_3.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,7 +1,7 @@ SFX_Press_AB_3_Ch4: duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 + squarenote 0, 145, 192, 7 + squarenote 0, 129, 208, 7 + squarenote 0, 145, 192, 7 + squarenote 12, 161, 208, 7 endchannel diff --git a/audio/sfx/psybeam.asm b/audio/sfx/psybeam.asm index 12a1b6fc..c49ebcb5 100644 --- a/audio/sfx/psybeam.asm +++ b/audio/sfx/psybeam.asm @@ -1,25 +1,25 @@ SFX_Psybeam_Ch4: dutycycle 161 - unknownsfx0x20 10, 241, 64, 6 - unknownsfx0x20 10, 243, 128, 6 - unknownsfx0x20 10, 242, 32, 6 + squarenote 10, 241, 64, 6 + squarenote 10, 243, 128, 6 + squarenote 10, 242, 32, 6 loopchannel 4, SFX_Psybeam_Ch4 - unknownsfx0x20 10, 241, 64, 6 + squarenote 10, 241, 64, 6 endchannel SFX_Psybeam_Ch5: dutycycle 179 - unknownsfx0x20 10, 243, 113, 5 - unknownsfx0x20 7, 227, 49, 5 - unknownsfx0x20 10, 241, 81, 5 + squarenote 10, 243, 113, 5 + squarenote 7, 227, 49, 5 + squarenote 10, 241, 81, 5 loopchannel 4, SFX_Psybeam_Ch5 - unknownsfx0x20 10, 241, 113, 5 + squarenote 10, 241, 113, 5 endchannel SFX_Psybeam_Ch7: - unknownnoise0x20 2, 209, 74 - unknownnoise0x20 2, 210, 42 + noisenote 2, 209, 74 + noisenote 2, 210, 42 loopchannel 21, SFX_Psybeam_Ch7 endchannel diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index 2bbde2f1..6d70dc3b 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,32 +1,32 @@ SFX_Psychic_M_Ch4: duty 2 - unknownsfx0x10 247 - unknownsfx0x20 8, 196, 189, 7 - unknownsfx0x20 8, 196, 190, 7 - unknownsfx0x20 8, 196, 191, 7 - unknownsfx0x20 8, 196, 192, 7 - unknownsfx0x20 15, 196, 193, 7 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x10 8 + pitchenvelope 247 + squarenote 8, 196, 189, 7 + squarenote 8, 196, 190, 7 + squarenote 8, 196, 191, 7 + squarenote 8, 196, 192, 7 + squarenote 15, 196, 193, 7 + squarenote 15, 242, 192, 7 + pitchenvelope 8 endchannel SFX_Psychic_M_Ch5: duty 2 - unknownsfx0x20 8, 196, 112, 7 - unknownsfx0x20 8, 196, 97, 7 - unknownsfx0x20 8, 196, 98, 7 - unknownsfx0x20 8, 196, 99, 7 - unknownsfx0x20 15, 196, 100, 7 - unknownsfx0x20 15, 242, 100, 7 + squarenote 8, 196, 112, 7 + squarenote 8, 196, 97, 7 + squarenote 8, 196, 98, 7 + squarenote 8, 196, 99, 7 + squarenote 15, 196, 100, 7 + squarenote 15, 242, 100, 7 endchannel SFX_Psychic_M_Ch7: - unknownnoise0x20 15, 63, 20 - unknownnoise0x20 15, 207, 19 - unknownnoise0x20 15, 207, 18 - unknownnoise0x20 15, 207, 17 - unknownnoise0x20 15, 207, 16 - unknownnoise0x20 15, 194, 16 + noisenote 15, 63, 20 + noisenote 15, 207, 19 + noisenote 15, 207, 18 + noisenote 15, 207, 17 + noisenote 15, 207, 16 + noisenote 15, 194, 16 endchannel diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index 1c9490a2..f1b3799a 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,13 +1,13 @@ SFX_Purchase_1_Ch4: duty 2 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 8, 242, 224, 7 + squarenote 4, 225, 0, 7 + squarenote 8, 242, 224, 7 endchannel SFX_Purchase_1_Ch5: duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 145, 193, 6 - unknownsfx0x20 8, 162, 161, 7 + squarenote 1, 8, 0, 0 + squarenote 4, 145, 193, 6 + squarenote 8, 162, 161, 7 endchannel diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm index 78929c27..b8a5660f 100644 --- a/audio/sfx/purchase_3.asm +++ b/audio/sfx/purchase_3.asm @@ -1,13 +1,13 @@ SFX_Purchase_3_Ch4: duty 2 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 8, 242, 224, 7 + squarenote 4, 225, 0, 7 + squarenote 8, 242, 224, 7 endchannel SFX_Purchase_3_Ch5: duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 145, 193, 6 - unknownsfx0x20 8, 162, 161, 7 + squarenote 1, 8, 0, 0 + squarenote 4, 145, 193, 6 + squarenote 8, 162, 161, 7 endchannel diff --git a/audio/sfx/push_boulder_1.asm b/audio/sfx/push_boulder_1.asm index 86035278..c2d778fa 100644 --- a/audio/sfx/push_boulder_1.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,10 +1,10 @@ SFX_Push_Boulder_1_Ch7: - unknownnoise0x20 4, 162, 35 - unknownnoise0x20 8, 241, 52 - unknownnoise0x20 15, 0, 0 - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 + noisenote 4, 162, 35 + noisenote 8, 241, 52 + noisenote 15, 0, 0 + noisenote 2, 247, 36 + noisenote 2, 247, 52 + noisenote 4, 247, 68 + noisenote 8, 244, 85 + noisenote 8, 241, 68 endchannel diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm index ecaeb768..9a263a9e 100644 --- a/audio/sfx/push_boulder_3.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,10 +1,10 @@ SFX_Push_Boulder_3_Ch7: - unknownnoise0x20 4, 162, 35 - unknownnoise0x20 8, 241, 52 - unknownnoise0x20 15, 0, 0 - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 + noisenote 4, 162, 35 + noisenote 8, 241, 52 + noisenote 15, 0, 0 + noisenote 2, 247, 36 + noisenote 2, 247, 52 + noisenote 4, 247, 68 + noisenote 8, 244, 85 + noisenote 8, 241, 68 endchannel diff --git a/audio/sfx/run.asm b/audio/sfx/run.asm index 81d01467..e05fb675 100644 --- a/audio/sfx/run.asm +++ b/audio/sfx/run.asm @@ -1,13 +1,13 @@ SFX_Run_Ch7: - unknownnoise0x20 2, 97, 35 - unknownnoise0x20 2, 161, 51 - unknownnoise0x20 2, 193, 51 - unknownnoise0x20 2, 81, 17 - unknownnoise0x20 2, 241, 51 - unknownnoise0x20 2, 65, 17 - unknownnoise0x20 2, 193, 51 - unknownnoise0x20 2, 49, 17 - unknownnoise0x20 2, 129, 51 - unknownnoise0x20 2, 49, 17 - unknownnoise0x20 8, 65, 51 + noisenote 2, 97, 35 + noisenote 2, 161, 51 + noisenote 2, 193, 51 + noisenote 2, 81, 17 + noisenote 2, 241, 51 + noisenote 2, 65, 17 + noisenote 2, 193, 51 + noisenote 2, 49, 17 + noisenote 2, 129, 51 + noisenote 2, 49, 17 + noisenote 8, 65, 51 endchannel diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index f898def0..6c302b11 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,9 +1,9 @@ SFX_Safari_Zone_PA_Ch4: duty 2 - unknownsfx0x20 15, 243, 48, 7 - unknownsfx0x20 8, 101, 48, 7 - unknownsfx0x20 15, 244, 0, 7 - unknownsfx0x20 15, 116, 0, 7 - unknownsfx0x20 15, 68, 0, 7 - unknownsfx0x20 15, 36, 0, 7 + squarenote 15, 243, 48, 7 + squarenote 8, 101, 48, 7 + squarenote 15, 244, 0, 7 + squarenote 15, 116, 0, 7 + squarenote 15, 68, 0, 7 + squarenote 15, 36, 0, 7 endchannel diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index afb1f13a..900c89c1 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,23 +1,23 @@ SFX_Save_1_Ch4: duty 2 - unknownsfx0x20 4, 244, 0, 7 - unknownsfx0x20 2, 228, 0, 6 - unknownsfx0x20 2, 228, 128, 6 - unknownsfx0x20 2, 228, 192, 6 - unknownsfx0x20 2, 228, 0, 7 - unknownsfx0x20 2, 228, 160, 7 - unknownsfx0x20 15, 242, 224, 7 + squarenote 4, 244, 0, 7 + squarenote 2, 228, 0, 6 + squarenote 2, 228, 128, 6 + squarenote 2, 228, 192, 6 + squarenote 2, 228, 0, 7 + squarenote 2, 228, 160, 7 + squarenote 15, 242, 224, 7 endchannel SFX_Save_1_Ch5: duty 2 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 2, 212, 1, 7 - unknownsfx0x20 2, 196, 1, 6 - unknownsfx0x20 2, 196, 129, 6 - unknownsfx0x20 2, 196, 193, 6 - unknownsfx0x20 2, 196, 1, 7 - unknownsfx0x20 2, 196, 161, 7 - unknownsfx0x20 15, 210, 225, 7 + squarenote 4, 8, 0, 0 + squarenote 2, 212, 1, 7 + squarenote 2, 196, 1, 6 + squarenote 2, 196, 129, 6 + squarenote 2, 196, 193, 6 + squarenote 2, 196, 1, 7 + squarenote 2, 196, 161, 7 + squarenote 15, 210, 225, 7 endchannel diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm index 083e77c8..0f237fd1 100644 --- a/audio/sfx/save_3.asm +++ b/audio/sfx/save_3.asm @@ -1,17 +1,17 @@ SFX_Save_3_Ch4: duty 2 IF DEF(_RED) - unknownsfx0x20 4, 244, 0, 7 - unknownsfx0x20 3, 228, 128, 6 - unknownsfx0x20 3, 228, 192, 6 - unknownsfx0x20 3, 228, 0, 7 - unknownsfx0x20 2, 228, 160, 7 + squarenote 4, 244, 0, 7 + squarenote 3, 228, 128, 6 + squarenote 3, 228, 192, 6 + squarenote 3, 228, 0, 7 + squarenote 2, 228, 160, 7 ELSE - unknownsfx0x20 3, 228, 0, 6 - unknownsfx0x20 3, 228, 128, 6 - unknownsfx0x20 3, 228, 192, 6 - unknownsfx0x20 3, 228, 0, 7 - unknownsfx0x20 15, 242, 224, 7 + squarenote 3, 228, 0, 6 + squarenote 3, 228, 128, 6 + squarenote 3, 228, 192, 6 + squarenote 3, 228, 0, 7 + squarenote 15, 242, 224, 7 ENDC endchannel @@ -19,18 +19,18 @@ ENDC SFX_Save_3_Ch5: duty 2 IF DEF(_RED) - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 3, 212, 1, 7 - unknownsfx0x20 3, 196, 129, 6 - unknownsfx0x20 3, 196, 193, 6 - unknownsfx0x20 3, 196, 1, 7 - unknownsfx0x20 2, 196, 161, 7 + squarenote 4, 8, 0, 0 + squarenote 3, 212, 1, 7 + squarenote 3, 196, 129, 6 + squarenote 3, 196, 193, 6 + squarenote 3, 196, 1, 7 + squarenote 2, 196, 161, 7 ELSE - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 3, 196, 1, 6 - unknownsfx0x20 3, 196, 129, 6 - unknownsfx0x20 3, 196, 193, 6 - unknownsfx0x20 3, 196, 1, 7 - unknownsfx0x20 15, 210, 225, 7 + squarenote 3, 8, 0, 0 + squarenote 3, 196, 1, 6 + squarenote 3, 196, 129, 6 + squarenote 3, 196, 193, 6 + squarenote 3, 196, 1, 7 + squarenote 15, 210, 225, 7 ENDC endchannel diff --git a/audio/sfx/shooting_star.asm b/audio/sfx/shooting_star.asm index f9b03feb..d33eefcb 100644 --- a/audio/sfx/shooting_star.asm +++ b/audio/sfx/shooting_star.asm @@ -1,14 +1,14 @@ SFX_Shooting_Star_Ch4: dutycycle 228 - unknownsfx0x10 47 - unknownsfx0x20 4, 64, 224, 7 - unknownsfx0x20 4, 96, 224, 7 - unknownsfx0x20 4, 128, 224, 7 - unknownsfx0x20 8, 160, 224, 7 - unknownsfx0x20 8, 160, 224, 7 - unknownsfx0x20 8, 128, 224, 7 - unknownsfx0x20 8, 96, 224, 7 - unknownsfx0x20 8, 48, 224, 7 - unknownsfx0x20 15, 18, 224, 7 - unknownsfx0x10 8 + pitchenvelope 47 + squarenote 4, 64, 224, 7 + squarenote 4, 96, 224, 7 + squarenote 4, 128, 224, 7 + squarenote 8, 160, 224, 7 + squarenote 8, 160, 224, 7 + squarenote 8, 128, 224, 7 + squarenote 8, 96, 224, 7 + squarenote 8, 48, 224, 7 + squarenote 15, 18, 224, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index 54731535..b3cdca5d 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,10 +1,10 @@ SFX_Shrink_1_Ch4: duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 6 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 5 - unknownsfx0x20 15, 71, 128, 4 - unknownsfx0x20 15, 23, 0, 4 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 215, 0, 6 + squarenote 15, 183, 128, 5 + squarenote 15, 135, 0, 5 + squarenote 15, 71, 128, 4 + squarenote 15, 23, 0, 4 + pitchenvelope 8 endchannel diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm index b03cbe55..38b3f0e9 100644 --- a/audio/sfx/shrink_3.asm +++ b/audio/sfx/shrink_3.asm @@ -1,10 +1,10 @@ SFX_Shrink_3_Ch4: duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 6 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 5 - unknownsfx0x20 15, 71, 128, 4 - unknownsfx0x20 15, 23, 0, 4 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 215, 0, 6 + squarenote 15, 183, 128, 5 + squarenote 15, 135, 0, 5 + squarenote 15, 71, 128, 4 + squarenote 15, 23, 0, 4 + pitchenvelope 8 endchannel diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index ee238262..b685abbe 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,9 +1,9 @@ SFX_Silph_Scope_Ch4: duty 0 - unknownsfx0x20 0, 210, 0, 7 - unknownsfx0x20 0, 210, 64, 7 - unknownsfx0x20 0, 210, 128, 7 - unknownsfx0x20 0, 210, 192, 7 - unknownsfx0x20 10, 225, 224, 7 - unknownsfx0x20 1, 0, 0, 0 + squarenote 0, 210, 0, 7 + squarenote 0, 210, 64, 7 + squarenote 0, 210, 128, 7 + squarenote 0, 210, 192, 7 + squarenote 10, 225, 224, 7 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index ae1a6d90..632003b8 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,14 +1,14 @@ SFX_Slots_New_Spin_Ch4: duty 3 - unknownsfx0x20 5, 225, 0, 7 - unknownsfx0x20 2, 225, 128, 7 - unknownsfx0x20 15, 241, 192, 7 + squarenote 5, 225, 0, 7 + squarenote 2, 225, 128, 7 + squarenote 15, 241, 192, 7 endchannel SFX_Slots_New_Spin_Ch5: duty 2 - unknownsfx0x20 4, 193, 193, 6 - unknownsfx0x20 2, 193, 65, 7 - unknownsfx0x20 15, 209, 129, 7 + squarenote 4, 193, 193, 6 + squarenote 2, 193, 65, 7 + squarenote 15, 209, 129, 7 endchannel diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index 6923ac71..2322c34a 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,5 +1,5 @@ SFX_Slots_Reward_Ch4: duty 2 - unknownsfx0x20 2, 241, 0, 7 - unknownsfx0x20 8, 129, 224, 7 + squarenote 2, 241, 0, 7 + squarenote 8, 129, 224, 7 endchannel diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index 85d73daf..0548600b 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,6 +1,6 @@ SFX_Slots_Stop_Wheel_Ch4: duty 2 - unknownsfx0x20 1, 242, 160, 6 - unknownsfx0x20 1, 242, 224, 6 - unknownsfx0x20 8, 241, 0, 7 + squarenote 1, 242, 160, 6 + squarenote 1, 242, 224, 6 + squarenote 8, 241, 0, 7 endchannel diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm index aae0ef28..ea06a573 100644 --- a/audio/sfx/snare1_1.asm +++ b/audio/sfx/snare1_1.asm @@ -1,3 +1,3 @@ SFX_Snare1_1_Ch7: - unknownnoise0x20 0, 193, 51 + noisenote 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm index e5013081..3ac1095d 100644 --- a/audio/sfx/snare1_2.asm +++ b/audio/sfx/snare1_2.asm @@ -1,3 +1,3 @@ SFX_Snare1_2_Ch7: - unknownnoise0x20 0, 193, 51 + noisenote 0, 193, 51 endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm index 4ffffa7f..66344d64 100644 --- a/audio/sfx/snare1_3.asm +++ b/audio/sfx/snare1_3.asm @@ -1,3 +1,3 @@ SFX_Snare1_3_Ch7: - unknownnoise0x20 0, 193, 51 + noisenote 0, 193, 51 endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm index 286e397a..7852f823 100644 --- a/audio/sfx/snare2_1.asm +++ b/audio/sfx/snare2_1.asm @@ -1,3 +1,3 @@ SFX_Snare2_1_Ch7: - unknownnoise0x20 0, 177, 51 + noisenote 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm index a3718612..0ddeff47 100644 --- a/audio/sfx/snare2_2.asm +++ b/audio/sfx/snare2_2.asm @@ -1,3 +1,3 @@ SFX_Snare2_2_Ch7: - unknownnoise0x20 0, 177, 51 + noisenote 0, 177, 51 endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm index 67f8c7fb..4e77c1dc 100644 --- a/audio/sfx/snare2_3.asm +++ b/audio/sfx/snare2_3.asm @@ -1,3 +1,3 @@ SFX_Snare2_3_Ch7: - unknownnoise0x20 0, 177, 51 + noisenote 0, 177, 51 endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm index 686b4561..787f5da5 100644 --- a/audio/sfx/snare3_1.asm +++ b/audio/sfx/snare3_1.asm @@ -1,3 +1,3 @@ SFX_Snare3_1_Ch7: - unknownnoise0x20 0, 161, 51 + noisenote 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm index f8236d40..136e99db 100644 --- a/audio/sfx/snare3_2.asm +++ b/audio/sfx/snare3_2.asm @@ -1,3 +1,3 @@ SFX_Snare3_2_Ch7: - unknownnoise0x20 0, 161, 51 + noisenote 0, 161, 51 endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm index 3b52bac9..d0aaacbf 100644 --- a/audio/sfx/snare3_3.asm +++ b/audio/sfx/snare3_3.asm @@ -1,3 +1,3 @@ SFX_Snare3_3_Ch7: - unknownnoise0x20 0, 161, 51 + noisenote 0, 161, 51 endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm index 35d58dba..31ca4d90 100644 --- a/audio/sfx/snare4_1.asm +++ b/audio/sfx/snare4_1.asm @@ -1,3 +1,3 @@ SFX_Snare4_1_Ch7: - unknownnoise0x20 0, 129, 51 + noisenote 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm index 713f8996..ad0cb156 100644 --- a/audio/sfx/snare4_2.asm +++ b/audio/sfx/snare4_2.asm @@ -1,3 +1,3 @@ SFX_Snare4_2_Ch7: - unknownnoise0x20 0, 129, 51 + noisenote 0, 129, 51 endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm index 231193e1..a8f5b7e0 100644 --- a/audio/sfx/snare4_3.asm +++ b/audio/sfx/snare4_3.asm @@ -1,3 +1,3 @@ SFX_Snare4_3_Ch7: - unknownnoise0x20 0, 129, 51 + noisenote 0, 129, 51 endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm index 54106d58..346c3e4b 100644 --- a/audio/sfx/snare5_1.asm +++ b/audio/sfx/snare5_1.asm @@ -1,8 +1,8 @@ SFX_Snare5_1_Ch7: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 + noisenote 7, 132, 55 + noisenote 6, 132, 54 + noisenote 5, 131, 53 + noisenote 4, 131, 52 + noisenote 3, 130, 51 + noisenote 2, 129, 50 endchannel diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm index f7f55eb5..91fd2abe 100644 --- a/audio/sfx/snare5_2.asm +++ b/audio/sfx/snare5_2.asm @@ -1,8 +1,8 @@ SFX_Snare5_2_Ch7: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 + noisenote 7, 132, 55 + noisenote 6, 132, 54 + noisenote 5, 131, 53 + noisenote 4, 131, 52 + noisenote 3, 130, 51 + noisenote 2, 129, 50 endchannel diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm index 76dc3966..3e0a546d 100644 --- a/audio/sfx/snare5_3.asm +++ b/audio/sfx/snare5_3.asm @@ -1,8 +1,8 @@ SFX_Snare5_3_Ch7: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 + noisenote 7, 132, 55 + noisenote 6, 132, 54 + noisenote 5, 131, 53 + noisenote 4, 131, 52 + noisenote 3, 130, 51 + noisenote 2, 129, 50 endchannel diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm index 97c0241d..982a9d73 100644 --- a/audio/sfx/snare6_1.asm +++ b/audio/sfx/snare6_1.asm @@ -1,3 +1,3 @@ SFX_Snare6_1_Ch7: - unknownnoise0x20 0, 129, 16 + noisenote 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm index 797d5518..0aaf6148 100644 --- a/audio/sfx/snare6_2.asm +++ b/audio/sfx/snare6_2.asm @@ -1,3 +1,3 @@ SFX_Snare6_2_Ch7: - unknownnoise0x20 0, 129, 16 + noisenote 0, 129, 16 endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm index 28fc695a..f021de95 100644 --- a/audio/sfx/snare6_3.asm +++ b/audio/sfx/snare6_3.asm @@ -1,3 +1,3 @@ SFX_Snare6_3_Ch7: - unknownnoise0x20 0, 129, 16 + noisenote 0, 129, 16 endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm index 1b54eefa..a0c5768f 100644 --- a/audio/sfx/snare7_1.asm +++ b/audio/sfx/snare7_1.asm @@ -1,3 +1,3 @@ SFX_Snare7_1_Ch7: - unknownnoise0x20 0, 130, 35 + noisenote 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm index e480f87f..cdd18567 100644 --- a/audio/sfx/snare7_2.asm +++ b/audio/sfx/snare7_2.asm @@ -1,3 +1,3 @@ SFX_Snare7_2_Ch7: - unknownnoise0x20 0, 130, 35 + noisenote 0, 130, 35 endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm index b57dfc13..f1db9012 100644 --- a/audio/sfx/snare7_3.asm +++ b/audio/sfx/snare7_3.asm @@ -1,3 +1,3 @@ SFX_Snare7_3_Ch7: - unknownnoise0x20 0, 130, 35 + noisenote 0, 130, 35 endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm index 1a0f74a3..3c657ab8 100644 --- a/audio/sfx/snare8_1.asm +++ b/audio/sfx/snare8_1.asm @@ -1,3 +1,3 @@ SFX_Snare8_1_Ch7: - unknownnoise0x20 0, 130, 37 + noisenote 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm index 87619598..b0d7a66a 100644 --- a/audio/sfx/snare8_2.asm +++ b/audio/sfx/snare8_2.asm @@ -1,3 +1,3 @@ SFX_Snare8_2_Ch7: - unknownnoise0x20 0, 130, 37 + noisenote 0, 130, 37 endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm index 54076c8e..51ab3ecb 100644 --- a/audio/sfx/snare8_3.asm +++ b/audio/sfx/snare8_3.asm @@ -1,3 +1,3 @@ SFX_Snare8_3_Ch7: - unknownnoise0x20 0, 130, 37 + noisenote 0, 130, 37 endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm index 6923bb09..1468fc0e 100644 --- a/audio/sfx/snare9_1.asm +++ b/audio/sfx/snare9_1.asm @@ -1,3 +1,3 @@ SFX_Snare9_1_Ch7: - unknownnoise0x20 0, 130, 38 + noisenote 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm index 308ae7f6..78b01295 100644 --- a/audio/sfx/snare9_2.asm +++ b/audio/sfx/snare9_2.asm @@ -1,3 +1,3 @@ SFX_Snare9_2_Ch7: - unknownnoise0x20 0, 130, 38 + noisenote 0, 130, 38 endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm index ffbdc454..aa56c84a 100644 --- a/audio/sfx/snare9_3.asm +++ b/audio/sfx/snare9_3.asm @@ -1,3 +1,3 @@ SFX_Snare9_3_Ch7: - unknownnoise0x20 0, 130, 38 + noisenote 0, 130, 38 endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index 38407f24..b84c1c83 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,22 +1,22 @@ SFX_SS_Anne_Horn_1_Ch4: duty 2 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 242, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 15, 242, 0, 5 endchannel SFX_SS_Anne_Horn_1_Ch5: duty 3 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 242, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 15, 242, 130, 4 endchannel diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm index 3162f664..35bcff9d 100644 --- a/audio/sfx/ss_anne_horn_3.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,22 +1,22 @@ SFX_SS_Anne_Horn_3_Ch4: duty 2 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 242, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 15, 240, 0, 5 + squarenote 15, 242, 0, 5 endchannel SFX_SS_Anne_Horn_3_Ch5: duty 3 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 242, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 4, 0, 0, 0 + squarenote 15, 240, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 15, 240, 130, 4 + squarenote 15, 242, 130, 4 endchannel diff --git a/audio/sfx/start_menu_1.asm b/audio/sfx/start_menu_1.asm index 3a979b44..5d71ea86 100644 --- a/audio/sfx/start_menu_1.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,4 +1,4 @@ SFX_Start_Menu_1_Ch7: - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 + noisenote 1, 226, 51 + noisenote 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm index 2706f555..3ab45794 100644 --- a/audio/sfx/start_menu_2.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,4 +1,4 @@ SFX_Start_Menu_2_Ch7: - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 + noisenote 1, 226, 51 + noisenote 8, 225, 34 endchannel diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm index 4b16cea4..5bf74e70 100644 --- a/audio/sfx/start_menu_3.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,4 +1,4 @@ SFX_Start_Menu_3_Ch7: - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 + noisenote 1, 226, 51 + noisenote 8, 225, 34 endchannel diff --git a/audio/sfx/super_effective.asm b/audio/sfx/super_effective.asm index 63ba35e8..4fb99e7c 100644 --- a/audio/sfx/super_effective.asm +++ b/audio/sfx/super_effective.asm @@ -1,4 +1,4 @@ SFX_Super_Effective_Ch7: - unknownnoise0x20 4, 241, 52 - unknownnoise0x20 15, 242, 100 + noisenote 4, 241, 52 + noisenote 15, 242, 100 endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index 95a31fcd..cc7da7c4 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,11 +1,11 @@ SFX_Swap_1_Ch4: duty 2 - unknownsfx0x20 8, 225, 64, 7 + squarenote 8, 225, 64, 7 endchannel SFX_Swap_1_Ch5: duty 2 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 8, 177, 65, 7 + squarenote 2, 8, 0, 0 + squarenote 8, 177, 65, 7 endchannel diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm index 6ed97d7d..788bbc11 100644 --- a/audio/sfx/swap_3.asm +++ b/audio/sfx/swap_3.asm @@ -1,11 +1,11 @@ SFX_Swap_3_Ch4: duty 2 - unknownsfx0x20 8, 225, 64, 7 + squarenote 8, 225, 64, 7 endchannel SFX_Swap_3_Ch5: duty 2 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 8, 177, 65, 7 + squarenote 2, 8, 0, 0 + squarenote 8, 177, 65, 7 endchannel diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index ee15dc20..eba35ca8 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,8 +1,8 @@ SFX_Switch_1_Ch4: duty 2 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 2, 241, 128, 6 - unknownsfx0x20 1, 0, 0, 0 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 0, 0, 0 + squarenote 4, 0, 0, 0 + squarenote 2, 241, 128, 6 + squarenote 1, 0, 0, 0 + squarenote 4, 241, 128, 7 + squarenote 4, 0, 0, 0 endchannel diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm index d98a7f29..4031c68b 100644 --- a/audio/sfx/switch_3.asm +++ b/audio/sfx/switch_3.asm @@ -1,8 +1,8 @@ SFX_Switch_3_Ch4: duty 2 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 2, 241, 128, 6 - unknownsfx0x20 1, 0, 0, 0 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 0, 0, 0 + squarenote 4, 0, 0, 0 + squarenote 2, 241, 128, 6 + squarenote 1, 0, 0, 0 + squarenote 4, 241, 128, 7 + squarenote 4, 0, 0, 0 endchannel diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index 60c87cab..c4d1a681 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,10 +1,10 @@ SFX_Teleport_Enter1_1_Ch4: duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 7 - unknownsfx0x20 15, 183, 128, 6 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 5 - unknownsfx0x20 15, 23, 0, 5 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 215, 0, 7 + squarenote 15, 183, 128, 6 + squarenote 15, 135, 0, 6 + squarenote 15, 71, 128, 5 + squarenote 15, 23, 0, 5 + pitchenvelope 8 endchannel diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm index d3dab8b4..da57da67 100644 --- a/audio/sfx/teleport_enter1_3.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,10 +1,10 @@ SFX_Teleport_Enter1_3_Ch4: duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 7 - unknownsfx0x20 15, 183, 128, 6 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 5 - unknownsfx0x20 15, 23, 0, 5 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 215, 0, 7 + squarenote 15, 183, 128, 6 + squarenote 15, 135, 0, 6 + squarenote 15, 71, 128, 5 + squarenote 15, 23, 0, 5 + pitchenvelope 8 endchannel diff --git a/audio/sfx/teleport_enter2_1.asm b/audio/sfx/teleport_enter2_1.asm index 53eb3335..07cb9ca6 100644 --- a/audio/sfx/teleport_enter2_1.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,6 +1,6 @@ SFX_Teleport_Enter2_1_Ch7: - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 1, 0, 0 + noisenote 2, 241, 50 + noisenote 2, 0, 0 + noisenote 2, 241, 34 + noisenote 1, 0, 0 endchannel diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm index 8b7c7894..cfeebf12 100644 --- a/audio/sfx/teleport_enter2_3.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,6 +1,6 @@ SFX_Teleport_Enter2_3_Ch7: - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 1, 0, 0 + noisenote 2, 241, 50 + noisenote 2, 0, 0 + noisenote 2, 241, 34 + noisenote 1, 0, 0 endchannel diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index 084c116f..d8fa2cd2 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,10 +1,10 @@ SFX_Teleport_Exit1_1_Ch4: duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 5 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 6 - unknownsfx0x20 15, 23, 0, 7 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 215, 0, 5 + squarenote 15, 183, 128, 5 + squarenote 15, 135, 0, 6 + squarenote 15, 71, 128, 6 + squarenote 15, 23, 0, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm index b3a26af8..43bd5255 100644 --- a/audio/sfx/teleport_exit1_3.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,10 +1,10 @@ SFX_Teleport_Exit1_3_Ch4: duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 5 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 6 - unknownsfx0x20 15, 23, 0, 7 - unknownsfx0x10 8 + pitchenvelope 23 + squarenote 15, 215, 0, 5 + squarenote 15, 183, 128, 5 + squarenote 15, 135, 0, 6 + squarenote 15, 71, 128, 6 + squarenote 15, 23, 0, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 4b168bb9..c342630d 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,6 +1,6 @@ SFX_Teleport_Exit2_1_Ch4: duty 1 - unknownsfx0x10 22 - unknownsfx0x20 15, 210, 0, 5 - unknownsfx0x10 8 + pitchenvelope 22 + squarenote 15, 210, 0, 5 + pitchenvelope 8 endchannel diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm index 171e59d8..5e688d11 100644 --- a/audio/sfx/teleport_exit2_3.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,6 +1,6 @@ SFX_Teleport_Exit2_3_Ch4: duty 1 - unknownsfx0x10 22 - unknownsfx0x20 15, 210, 0, 5 - unknownsfx0x10 8 + pitchenvelope 22 + squarenote 15, 210, 0, 5 + pitchenvelope 8 endchannel diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index c1f5f00c..3967f66c 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,8 +1,8 @@ SFX_Tink_1_Ch4: duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 + pitchenvelope 58 + squarenote 4, 242, 0, 2 + pitchenvelope 34 + squarenote 8, 226, 0, 2 + pitchenvelope 8 endchannel diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm index bab45323..5a654926 100644 --- a/audio/sfx/tink_2.asm +++ b/audio/sfx/tink_2.asm @@ -1,8 +1,8 @@ SFX_Tink_2_Ch4: duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 + pitchenvelope 58 + squarenote 4, 242, 0, 2 + pitchenvelope 34 + squarenote 8, 226, 0, 2 + pitchenvelope 8 endchannel diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm index a9cf73ec..c4f443e2 100644 --- a/audio/sfx/tink_3.asm +++ b/audio/sfx/tink_3.asm @@ -1,8 +1,8 @@ SFX_Tink_3_Ch4: duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 + pitchenvelope 58 + squarenote 4, 242, 0, 2 + pitchenvelope 34 + squarenote 8, 226, 0, 2 + pitchenvelope 8 endchannel diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 2f67936b..623e2c92 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,7 +1,7 @@ SFX_Trade_Machine_1_Ch4: duty 2 - unknownsfx0x10 21 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 + pitchenvelope 21 + squarenote 15, 240, 240, 4 + squarenote 15, 242, 80, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm index b590455e..19dc0957 100644 --- a/audio/sfx/trade_machine_3.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,7 +1,7 @@ SFX_Trade_Machine_3_Ch4: duty 2 - unknownsfx0x10 21 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 + pitchenvelope 21 + squarenote 15, 240, 240, 4 + squarenote 15, 242, 80, 6 + pitchenvelope 8 endchannel diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm index 957dc63f..3817adec 100644 --- a/audio/sfx/triangle1_1.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,3 +1,3 @@ SFX_Triangle1_1_Ch7: - unknownnoise0x20 0, 81, 42 + noisenote 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm index 535448cd..cac270ab 100644 --- a/audio/sfx/triangle1_2.asm +++ b/audio/sfx/triangle1_2.asm @@ -1,3 +1,3 @@ SFX_Triangle1_2_Ch7: - unknownnoise0x20 0, 81, 42 + noisenote 0, 81, 42 endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm index a13d00ea..a0cd81b2 100644 --- a/audio/sfx/triangle1_3.asm +++ b/audio/sfx/triangle1_3.asm @@ -1,3 +1,3 @@ SFX_Triangle1_3_Ch7: - unknownnoise0x20 0, 81, 42 + noisenote 0, 81, 42 endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm index 09ba8a67..1a6c4ca5 100644 --- a/audio/sfx/triangle2_1.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,4 +1,4 @@ SFX_Triangle2_1_Ch7: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 + noisenote 1, 65, 43 + noisenote 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm index 6512648a..48fc2086 100644 --- a/audio/sfx/triangle2_2.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,4 +1,4 @@ SFX_Triangle2_2_Ch7: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 + noisenote 1, 65, 43 + noisenote 0, 97, 42 endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm index b0612aba..d3c98bad 100644 --- a/audio/sfx/triangle2_3.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,4 +1,4 @@ SFX_Triangle2_3_Ch7: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 + noisenote 1, 65, 43 + noisenote 0, 97, 42 endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm index 9fd3952f..172c4141 100644 --- a/audio/sfx/triangle3_1.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,4 +1,4 @@ SFX_Triangle3_1_Ch7: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 + noisenote 2, 145, 40 + noisenote 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm index 38b3198b..f2ba1804 100644 --- a/audio/sfx/triangle3_2.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,4 +1,4 @@ SFX_Triangle3_2_Ch7: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 + noisenote 2, 145, 40 + noisenote 0, 113, 24 endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm index 138c8fac..654d9e0d 100644 --- a/audio/sfx/triangle3_3.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,4 +1,4 @@ SFX_Triangle3_3_Ch7: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 + noisenote 2, 145, 40 + noisenote 0, 113, 24 endchannel diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index 6b2561fe..2203d40a 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,7 +1,7 @@ SFX_Turn_Off_PC_1_Ch4: duty 2 - unknownsfx0x20 4, 240, 0, 6 - unknownsfx0x20 4, 240, 0, 4 - unknownsfx0x20 4, 240, 0, 2 - unknownsfx0x20 1, 0, 0, 0 + squarenote 4, 240, 0, 6 + squarenote 4, 240, 0, 4 + squarenote 4, 240, 0, 2 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm index cf6d95cd..ba079c05 100644 --- a/audio/sfx/turn_off_pc_3.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,7 +1,7 @@ SFX_Turn_Off_PC_3_Ch4: duty 2 - unknownsfx0x20 4, 240, 0, 6 - unknownsfx0x20 4, 240, 0, 4 - unknownsfx0x20 4, 240, 0, 2 - unknownsfx0x20 1, 0, 0, 0 + squarenote 4, 240, 0, 6 + squarenote 4, 240, 0, 4 + squarenote 4, 240, 0, 2 + squarenote 1, 0, 0, 0 endchannel diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index dede7c3e..39e992b3 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,13 +1,13 @@ SFX_Turn_On_PC_1_Ch4: duty 2 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 3, 161, 128, 7 - unknownsfx0x20 3, 161, 0, 7 - unknownsfx0x20 3, 161, 64, 7 - unknownsfx0x20 3, 161, 0, 7 - unknownsfx0x20 3, 161, 128, 7 - unknownsfx0x20 3, 161, 0, 7 - unknownsfx0x20 3, 161, 192, 7 - unknownsfx0x20 8, 161, 0, 7 + squarenote 15, 242, 192, 7 + squarenote 15, 0, 0, 0 + squarenote 3, 161, 128, 7 + squarenote 3, 161, 0, 7 + squarenote 3, 161, 64, 7 + squarenote 3, 161, 0, 7 + squarenote 3, 161, 128, 7 + squarenote 3, 161, 0, 7 + squarenote 3, 161, 192, 7 + squarenote 8, 161, 0, 7 endchannel diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm index 1ed54d3c..e7500dc9 100644 --- a/audio/sfx/turn_on_pc_3.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,14 +1,14 @@ SFX_Turn_On_PC_3_Ch4: duty 2 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 3, 129, 128, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 64, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 128, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 192, 7 - unknownsfx0x20 3, 129, 0, 7 + squarenote 15, 242, 192, 7 + squarenote 15, 0, 0, 0 + squarenote 15, 0, 0, 0 + squarenote 3, 129, 128, 7 + squarenote 3, 129, 0, 7 + squarenote 3, 129, 64, 7 + squarenote 3, 129, 0, 7 + squarenote 3, 129, 128, 7 + squarenote 3, 129, 0, 7 + squarenote 3, 129, 192, 7 + squarenote 3, 129, 0, 7 endchannel diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm index 21d54fb1..9d1886cf 100755 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_1.asm @@ -1,31 +1,31 @@ SFX_02_unused_Ch4: dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 + squarenote 15, 224, 128, 7 + squarenote 15, 240, 132, 7 + squarenote 15, 195, 224, 5 + squarenote 15, 196, 0, 6 + squarenote 10, 108, 128, 7 + squarenote 8, 113, 132, 7 endchannel SFX_02_unused_Ch5: dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 + squarenote 15, 160, 65, 7 + squarenote 15, 176, 67, 7 + squarenote 15, 147, 177, 5 + squarenote 15, 148, 193, 5 + squarenote 10, 76, 65, 7 + squarenote 8, 49, 70, 7 endchannel SFX_02_unused_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 + noisenote 2, 242, 76 + noisenote 6, 224, 58 + noisenote 15, 208, 58 + noisenote 8, 208, 44 + noisenote 6, 230, 76 + noisenote 12, 125, 76 + noisenote 15, 211, 76 endchannel diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm index 20de851f..cf793ec3 100755 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_2.asm @@ -1,31 +1,31 @@ SFX_08_unused_Ch4: dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 + squarenote 15, 224, 128, 7 + squarenote 15, 240, 132, 7 + squarenote 15, 195, 224, 5 + squarenote 15, 196, 0, 6 + squarenote 10, 108, 128, 7 + squarenote 8, 113, 132, 7 endchannel SFX_08_unused_Ch5: dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 + squarenote 15, 160, 65, 7 + squarenote 15, 176, 67, 7 + squarenote 15, 147, 177, 5 + squarenote 15, 148, 193, 5 + squarenote 10, 76, 65, 7 + squarenote 8, 49, 70, 7 endchannel SFX_08_unused_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 + noisenote 2, 242, 76 + noisenote 6, 224, 58 + noisenote 15, 208, 58 + noisenote 8, 208, 44 + noisenote 6, 230, 76 + noisenote 12, 125, 76 + noisenote 15, 211, 76 endchannel diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm index d4a30539..b849f5fd 100755 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_3.asm @@ -1,31 +1,31 @@ SFX_1f_unused_Ch4: dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 + squarenote 15, 224, 128, 7 + squarenote 15, 240, 132, 7 + squarenote 15, 195, 224, 5 + squarenote 15, 196, 0, 6 + squarenote 10, 108, 128, 7 + squarenote 8, 113, 132, 7 endchannel SFX_1f_unused_Ch5: dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 + squarenote 15, 160, 65, 7 + squarenote 15, 176, 67, 7 + squarenote 15, 147, 177, 5 + squarenote 15, 148, 193, 5 + squarenote 10, 76, 65, 7 + squarenote 8, 49, 70, 7 endchannel SFX_1f_unused_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 + noisenote 2, 242, 76 + noisenote 6, 224, 58 + noisenote 15, 208, 58 + noisenote 8, 208, 44 + noisenote 6, 230, 76 + noisenote 12, 125, 76 + noisenote 15, 211, 76 endchannel diff --git a/audio/sfx/vine_whip.asm b/audio/sfx/vine_whip.asm index ad0bd40b..84845db8 100644 --- a/audio/sfx/vine_whip.asm +++ b/audio/sfx/vine_whip.asm @@ -1,10 +1,10 @@ SFX_Vine_Whip_Ch7: - unknownnoise0x20 1, 194, 51 - unknownnoise0x20 2, 242, 33 - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 1, 194, 50 - unknownnoise0x20 1, 146, 18 - unknownnoise0x20 1, 178, 49 - unknownnoise0x20 12, 145, 16 - unknownnoise0x20 8, 242, 65 + noisenote 1, 194, 51 + noisenote 2, 242, 33 + noisenote 1, 226, 51 + noisenote 1, 194, 50 + noisenote 1, 146, 18 + noisenote 1, 178, 49 + noisenote 12, 145, 16 + noisenote 8, 242, 65 endchannel diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index d7a2f54d..cc6c052a 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,12 +1,12 @@ SFX_Withdraw_Deposit_1_Ch4: duty 1 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 4, 226, 0, 5 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 7 - unknownsfx0x10 34 - unknownsfx0x20 15, 226, 0, 7 - unknownsfx0x10 8 + pitchenvelope 58 + squarenote 4, 242, 0, 5 + pitchenvelope 34 + squarenote 4, 226, 0, 5 + pitchenvelope 58 + squarenote 4, 242, 0, 7 + pitchenvelope 34 + squarenote 15, 226, 0, 7 + pitchenvelope 8 endchannel diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm index 1fd1fe3e..a6a902de 100644 --- a/audio/sfx/withdraw_deposit_3.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,12 +1,12 @@ SFX_Withdraw_Deposit_3_Ch4: duty 1 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 4, 226, 0, 5 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 7 - unknownsfx0x10 34 - unknownsfx0x20 15, 226, 0, 7 - unknownsfx0x10 8 + pitchenvelope 58 + squarenote 4, 242, 0, 5 + pitchenvelope 34 + squarenote 4, 226, 0, 5 + pitchenvelope 58 + squarenote 4, 242, 0, 7 + pitchenvelope 34 + squarenote 15, 226, 0, 7 + pitchenvelope 8 endchannel diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index 71304bf8..c81e2181 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -30,19 +30,19 @@ audio: MACRO ENDC ENDM -unknownsfx0x10: MACRO +pitchenvelope: MACRO ; this was originally unknownsfx0x10 db $10 db \1 ENDM -unknownsfx0x20: MACRO +squarenote: MACRO ; this was originally unknownsfx0x20 db $20 | \1 db \2 db \3 db \4 ENDM -unknownnoise0x20: MACRO +noisenote: MACRO ; this was originally unknownnoise0x20 db $20 | \1 db \2 db \3 |