From 66d93ba69167d1c5c7b029b99aba71f3da92cc0b Mon Sep 17 00:00:00 2001
From: Electro <ElectroDeoxys@gmail.com>
Date: Fri, 9 Jan 2026 19:59:23 +0000
Subject: [PATCH 1/3] Label sfx commands

---
 src/audio/sfx/sfx_06.asm                      | 146 ++--
 src/audio/sfx/sfx_09.asm                      | 100 +--
 src/audio/sfx/sfx_0a.asm                      | 130 ++--
 src/audio/sfx/sfx_0d.asm                      |  90 +--
 src/audio/sfx/sfx_0e.asm                      |  92 +--
 src/audio/sfx/sfx_3d_attack.asm               | 304 ++++----
 src/audio/sfx/sfx_5f.asm                      |  24 +-
 src/audio/sfx/sfx_avalanche.asm               |  46 +-
 src/audio/sfx/sfx_barrier.asm                 | 120 +--
 src/audio/sfx/sfx_beam.asm                    |  38 +-
 src/audio/sfx/sfx_bench_manipulation.asm      | 208 ++---
 src/audio/sfx/sfx_big_flame.asm               | 196 ++---
 src/audio/sfx/sfx_big_lightning.asm           | 160 ++--
 src/audio/sfx/sfx_big_self_destruct.asm       | 118 +--
 src/audio/sfx/sfx_big_snore.asm               | 286 +++----
 src/audio/sfx/sfx_black_box_insert.asm        |  30 +-
 src/audio/sfx/sfx_black_box_inserted.asm      | 116 +--
 src/audio/sfx/sfx_black_box_transmitted.asm   | 100 +--
 src/audio/sfx/sfx_blizzard.asm                |  86 +-
 src/audio/sfx/sfx_bone_headbutt.asm           | 144 ++--
 src/audio/sfx/sfx_bone_toss_bench.asm         | 204 ++---
 src/audio/sfx/sfx_bonemerang.asm              | 484 ++++++------
 src/audio/sfx/sfx_border_spark.asm            |  60 +-
 src/audio/sfx/sfx_boulder_smash.asm           | 236 +++---
 src/audio/sfx/sfx_boyfriends.asm              | 252 +++---
 src/audio/sfx/sfx_bubbles.asm                 | 736 +++++++++---------
 src/audio/sfx/sfx_cancel.asm                  |  56 +-
 src/audio/sfx/sfx_card_shuffle.asm            |  48 +-
 src/audio/sfx/sfx_cat_punch.asm               |  88 +--
 src/audio/sfx/sfx_chips_counting.asm          |  76 +-
 src/audio/sfx/sfx_coin_hurl.asm               |  80 +-
 src/audio/sfx/sfx_coin_hurl_bench.asm         |  62 +-
 src/audio/sfx/sfx_coin_toss.asm               |  68 +-
 src/audio/sfx/sfx_coin_toss_negative.asm      |  40 +-
 src/audio/sfx/sfx_coin_toss_positive.asm      |  48 +-
 src/audio/sfx/sfx_confirm.asm                 |  64 +-
 src/audio/sfx/sfx_confuse_ray.asm             | 182 ++---
 src/audio/sfx/sfx_confusion.asm               | 170 ++--
 src/audio/sfx/sfx_continuous_fireball.asm     | 366 ++++-----
 src/audio/sfx/sfx_cry.asm                     | 100 +--
 src/audio/sfx/sfx_cursor.asm                  |  22 +-
 src/audio/sfx/sfx_dark_gas.asm                |  92 +--
 src/audio/sfx/sfx_dark_song.asm               | 226 +++---
 src/audio/sfx/sfx_denied.asm                  |  42 +-
 src/audio/sfx/sfx_dive_bomb.asm               | 170 ++--
 src/audio/sfx/sfx_doors.asm                   |  70 +-
 src/audio/sfx/sfx_drain.asm                   | 168 ++--
 src/audio/sfx/sfx_drill.asm                   |  20 +-
 src/audio/sfx/sfx_drill_dive.asm              | 164 ++--
 src/audio/sfx/sfx_dry_up.asm                  | 104 +--
 src/audio/sfx/sfx_electronic_input.asm        |  20 +-
 src/audio/sfx/sfx_electronic_response.asm     |  52 +-
 src/audio/sfx/sfx_expand.asm                  | 382 ++++-----
 src/audio/sfx/sfx_fire_punch.asm              | 248 +++---
 src/audio/sfx/sfx_fire_spin.asm               | 260 +++----
 src/audio/sfx/sfx_fireball.asm                | 260 +++----
 src/audio/sfx/sfx_firegiver.asm               | 274 +++----
 src/audio/sfx/sfx_firegiver_start.asm         |  42 +-
 src/audio/sfx/sfx_focus_blast.asm             | 322 ++++----
 src/audio/sfx/sfx_focus_blast_bench.asm       | 262 +++----
 src/audio/sfx/sfx_follow_me.asm               | 186 ++---
 src/audio/sfx/sfx_fury_swipes.asm             | 166 ++--
 src/audio/sfx/sfx_ghost_master_appear.asm     | 400 +++++-----
 src/audio/sfx/sfx_ghost_master_disappear.asm  | 332 ++++----
 src/audio/sfx/sfx_glow.asm                    | 162 ++--
 src/audio/sfx/sfx_goo.asm                     | 226 +++---
 src/audio/sfx/sfx_gr_blimp_hatch_close.asm    |  94 +--
 src/audio/sfx/sfx_gr_blimp_hatch_open.asm     | 132 ++--
 src/audio/sfx/sfx_gr_blimp_tractor_beam.asm   | 218 +++---
 src/audio/sfx/sfx_guillotine.asm              | 214 ++---
 src/audio/sfx/sfx_heal.asm                    | 170 ++--
 src/audio/sfx/sfx_healing_wind.asm            | 290 +++----
 src/audio/sfx/sfx_hit.asm                     | 128 +--
 src/audio/sfx/sfx_hydro_pump.asm              | 242 +++---
 src/audio/sfx/sfx_hyper_beam.asm              | 148 ++--
 src/audio/sfx/sfx_ice_punch.asm               | 312 ++++----
 src/audio/sfx/sfx_jingle.asm                  | 128 +--
 src/audio/sfx/sfx_kick.asm                    | 170 ++--
 src/audio/sfx/sfx_leer.asm                    | 116 +--
 src/audio/sfx/sfx_lightning.asm               | 132 ++--
 src/audio/sfx/sfx_lure.asm                    |  62 +-
 src/audio/sfx/sfx_mega_punch.asm              | 208 ++---
 src/audio/sfx/sfx_needles.asm                 |  30 +-
 src/audio/sfx/sfx_new_mail.asm                |  36 +-
 src/audio/sfx/sfx_nine_tails.asm              | 174 ++---
 src/audio/sfx/sfx_npc_warp_transform.asm      | 186 ++---
 src/audio/sfx/sfx_open_chest.asm              |  58 +-
 src/audio/sfx/sfx_paralysis.asm               |  62 +-
 src/audio/sfx/sfx_perplex.asm                 | 122 +--
 src/audio/sfx/sfx_petal_dance.asm             | 182 ++---
 src/audio/sfx/sfx_pitfall.asm                 | 104 +--
 src/audio/sfx/sfx_place_prize.asm             |  46 +-
 src/audio/sfx/sfx_placeholder_cursor.asm      |  22 +-
 src/audio/sfx/sfx_player_walk_map.asm         |  38 +-
 src/audio/sfx/sfx_pod_doors.asm               |  72 +-
 src/audio/sfx/sfx_poison.asm                  |  38 +-
 src/audio/sfx/sfx_pokemon_evolution.asm       | 112 +--
 src/audio/sfx/sfx_pot_smash.asm               | 188 ++---
 src/audio/sfx/sfx_powder.asm                  | 182 ++---
 src/audio/sfx/sfx_protect.asm                 | 108 +--
 src/audio/sfx/sfx_psychic.asm                 | 210 ++---
 src/audio/sfx/sfx_psychic_beam.asm            | 234 +++---
 src/audio/sfx/sfx_psychic_beam_bench.asm      | 194 ++---
 src/audio/sfx/sfx_psypunch.asm                | 242 +++---
 src/audio/sfx/sfx_punch.asm                   | 152 ++--
 src/audio/sfx/sfx_question_mark.asm           | 192 ++---
 src/audio/sfx/sfx_question_mark_bench.asm     | 136 ++--
 src/audio/sfx/sfx_razor_leaf.asm              | 146 ++--
 src/audio/sfx/sfx_receive_card_pop.asm        |  82 +-
 src/audio/sfx/sfx_save_game.asm               | 144 ++--
 src/audio/sfx/sfx_seismic_toss.asm            | 224 +++---
 src/audio/sfx/sfx_self_destruct.asm           |  82 +-
 src/audio/sfx/sfx_sing.asm                    |  48 +-
 src/audio/sfx/sfx_skull_bash.asm              | 136 ++--
 src/audio/sfx/sfx_slap.asm                    | 108 +--
 src/audio/sfx/sfx_slash.asm                   |  72 +-
 src/audio/sfx/sfx_sleep.asm                   | 258 +++---
 src/audio/sfx/sfx_slot_big_hit.asm            | 108 +--
 src/audio/sfx/sfx_slot_bonus_hit.asm          |  84 +-
 src/audio/sfx/sfx_slot_reel.asm               |  72 +-
 src/audio/sfx/sfx_slot_small_hit.asm          |  84 +-
 src/audio/sfx/sfx_slot_start.asm              |  92 +--
 src/audio/sfx/sfx_sludge_punch.asm            | 406 +++++-----
 src/audio/sfx/sfx_small_flame.asm             | 190 ++---
 src/audio/sfx/sfx_small_hit.asm               |  62 +-
 src/audio/sfx/sfx_sonic_boom.asm              | 100 +--
 src/audio/sfx/sfx_speed.asm                   |  84 +-
 src/audio/sfx/sfx_stone_barrage.asm           |  90 +--
 src/audio/sfx/sfx_stretch_kick.asm            |  56 +-
 src/audio/sfx/sfx_string_shot.asm             | 260 +++----
 .../sfx/sfx_stronghold_platform_down.asm      | 154 ++--
 src/audio/sfx/sfx_stronghold_platform_up.asm  | 154 ++--
 src/audio/sfx/sfx_supersonic.asm              |  16 +-
 src/audio/sfx/sfx_swift.asm                   | 436 +++++------
 src/audio/sfx/sfx_tail_slap.asm               | 194 ++---
 src/audio/sfx/sfx_tail_whip.asm               | 186 ++---
 src/audio/sfx/sfx_tcg1_intro_orb.asm          | 220 +++---
 src/audio/sfx/sfx_tcg1_intro_orb_scatter.asm  | 148 ++--
 src/audio/sfx/sfx_tcg1_intro_orb_swoop.asm    | 246 +++---
 src/audio/sfx/sfx_tcg1_intro_orb_title.asm    | 170 ++--
 src/audio/sfx/sfx_tcg1_legendary_cards.asm    | 126 +--
 src/audio/sfx/sfx_tcg2_intro_orbs.asm         | 616 +++++++--------
 src/audio/sfx/sfx_tcg2_intro_subtitle.asm     | 220 +++---
 src/audio/sfx/sfx_tcg2_intro_title.asm        | 284 +++----
 src/audio/sfx/sfx_teleport.asm                | 252 +++---
 src/audio/sfx/sfx_thunder_punch.asm           | 242 +++---
 src/audio/sfx/sfx_thunder_shock.asm           | 102 +--
 src/audio/sfx/sfx_thunder_wave.asm            | 172 ++--
 src/audio/sfx/sfx_toxic.asm                   | 110 +--
 src/audio/sfx/sfx_unused.asm                  |  26 +-
 src/audio/sfx/sfx_vine_pull.asm               |  53 +-
 src/audio/sfx/sfx_warp.asm                    |  50 +-
 src/audio/sfx/sfx_water_gun.asm               | 144 ++--
 src/audio/sfx/sfx_water_jets.asm              | 126 +--
 src/audio/sfx/sfx_whirlpool.asm               | 120 +--
 src/audio/sfx/sfx_whirlwind.asm               | 182 ++---
 src/audio/sfx/sfx_whirlwind_bench.asm         | 542 ++++++-------
 src/audio/sfx/sfx_white_gas.asm               |  92 +--
 src/audio/sfx1.asm                            |  36 +-
 src/macros/audio.asm                          |  43 +-
 160 files changed, 12491 insertions(+), 12469 deletions(-)

diff --git a/src/audio/sfx/sfx_06.asm b/src/audio/sfx/sfx_06.asm
index 5a8313b..c5c88df 100644
--- a/src/audio/sfx/sfx_06.asm
+++ b/src/audio/sfx/sfx_06.asm
@@ -1,75 +1,75 @@
 Sfx06_Ch1:
-	sfx_1 241
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_0 7, 107
-	sfx_0 7, 123
-	sfx_1 241
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_0 7, 57
-	sfx_0 7, 89
-	sfx_0 7, 107
-	sfx_1 241
-	sfx_2 8
-	sfx_0 7, 5
-	sfx_0 7, 33
-	sfx_0 7, 68
-	sfx_0 7, 89
-	sfx_1 145
-	sfx_2 4
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 182
-	sfx_0 7, 190
-	sfx_1 145
-	sfx_2 4
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_1 145
-	sfx_2 4
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_0 7, 162
-	sfx_0 7, 172
-	sfx_1 97
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_1 97
-	sfx_2 0
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 214
-	sfx_0 7, 219
-	sfx_1 97
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 209
-	sfx_0 7, 214
-	sfx_1 49
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_1 33
-	sfx_2 0
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 214
-	sfx_0 7, 219
-	sfx_1 17
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 209
-	sfx_0 7, 214
+	sfx_env 15, 1
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $739
+	sfx_freq $744
+	sfx_freq $76b
+	sfx_freq $77b
+	sfx_env 15, 1
+	sfx_duty 2
+	sfx_freq $721
+	sfx_freq $739
+	sfx_freq $759
+	sfx_freq $76b
+	sfx_env 15, 1
+	sfx_duty 2
+	sfx_freq $705
+	sfx_freq $721
+	sfx_freq $744
+	sfx_freq $759
+	sfx_env 9, 1
+	sfx_duty 1
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7b6
+	sfx_freq $7be
+	sfx_env 9, 1
+	sfx_duty 1
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_env 9, 1
+	sfx_duty 1
+	sfx_freq $783
+	sfx_freq $790
+	sfx_freq $7a2
+	sfx_freq $7ac
+	sfx_env 6, 1
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_env 6, 1
+	sfx_duty 0
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7d6
+	sfx_freq $7db
+	sfx_env 6, 1
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7d1
+	sfx_freq $7d6
+	sfx_env 3, 1
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_env 2, 1
+	sfx_duty 0
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7d6
+	sfx_freq $7db
+	sfx_env 1, 1
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7d1
+	sfx_freq $7d6
 	sfx_end
diff --git a/src/audio/sfx/sfx_09.asm b/src/audio/sfx/sfx_09.asm
index 3300fe2..d411fd4 100644
--- a/src/audio/sfx/sfx_09.asm
+++ b/src/audio/sfx/sfx_09.asm
@@ -1,52 +1,52 @@
 Sfx09_Ch1:
-	sfx_8 17
-	sfx_1 224
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_1 128
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 65
-	sfx_0 0, 71
-	sfx_0 0, 65
-	sfx_0 0, 71
-	sfx_0 0, 65
-	sfx_0 0, 71
-	sfx_0 0, 65
-	sfx_0 0, 71
-	sfx_0 0, 65
-	sfx_1 64
-	sfx_0 0, 65
-	sfx_0 0, 71
-	sfx_0 0, 65
-	sfx_0 0, 71
-	sfx_0 0, 65
-	sfx_1 32
-	sfx_0 0, 65
-	sfx_0 0, 71
-	sfx_0 0, 65
-	sfx_0 0, 71
-	sfx_0 0, 65
-	sfx_1 16
-	sfx_0 0, 55
-	sfx_0 0, 49
-	sfx_0 0, 55
-	sfx_0 0, 49
-	sfx_0 0, 55
+	sfx_pan TRUE, TRUE
+	sfx_env 14, 0
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_env 8, 0
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $41
+	sfx_freq $47
+	sfx_freq $41
+	sfx_freq $47
+	sfx_freq $41
+	sfx_freq $47
+	sfx_freq $41
+	sfx_freq $47
+	sfx_freq $41
+	sfx_env 4, 0
+	sfx_freq $41
+	sfx_freq $47
+	sfx_freq $41
+	sfx_freq $47
+	sfx_freq $41
+	sfx_env 2, 0
+	sfx_freq $41
+	sfx_freq $47
+	sfx_freq $41
+	sfx_freq $47
+	sfx_freq $41
+	sfx_env 1, 0
+	sfx_freq $37
+	sfx_freq $31
+	sfx_freq $37
+	sfx_freq $31
+	sfx_freq $37
 	sfx_end
diff --git a/src/audio/sfx/sfx_0a.asm b/src/audio/sfx/sfx_0a.asm
index a954348..8b3805f 100644
--- a/src/audio/sfx/sfx_0a.asm
+++ b/src/audio/sfx/sfx_0a.asm
@@ -1,67 +1,67 @@
 Sfx0a_Ch1:
-	sfx_8 17
-	sfx_1 228
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_0 7, 89
-	sfx_0 7, 107
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_1 132
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 219
-	sfx_1 196
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_0 7, 89
-	sfx_0 7, 107
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_1 84
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 219
-	sfx_1 132
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_0 7, 89
-	sfx_0 7, 107
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_1 52
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 219
-	sfx_1 68
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_0 7, 89
-	sfx_0 7, 107
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_1 36
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 219
+	sfx_pan TRUE, TRUE
+	sfx_env 14, 4
+	sfx_duty 0
+	sfx_freq $739
+	sfx_freq $759
+	sfx_freq $76b
+	sfx_freq $783
+	sfx_freq $790
+	sfx_env 8, 4
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7db
+	sfx_env 12, 4
+	sfx_duty 0
+	sfx_freq $739
+	sfx_freq $759
+	sfx_freq $76b
+	sfx_freq $783
+	sfx_freq $790
+	sfx_env 5, 4
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7db
+	sfx_env 8, 4
+	sfx_duty 0
+	sfx_freq $739
+	sfx_freq $759
+	sfx_freq $76b
+	sfx_freq $783
+	sfx_freq $790
+	sfx_env 3, 4
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7db
+	sfx_env 4, 4
+	sfx_duty 0
+	sfx_freq $739
+	sfx_freq $759
+	sfx_freq $76b
+	sfx_freq $783
+	sfx_freq $790
+	sfx_env 2, 4
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7db
 	sfx_end
diff --git a/src/audio/sfx/sfx_0d.asm b/src/audio/sfx/sfx_0d.asm
index 3e9fb26..cc0436b 100644
--- a/src/audio/sfx/sfx_0d.asm
+++ b/src/audio/sfx/sfx_0d.asm
@@ -1,49 +1,49 @@
 Sfx0d_Ch1:
 	sfx_loop 5
-	sfx_8 17
-	sfx_1 159
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_5 0
-	sfx_6 1
-	sfx_0 4, 131
-	sfx_6 1
-	sfx_0 4, 229
-	sfx_6 1
-	sfx_0 5, 17
-	sfx_6 1
-	sfx_0 5, 99
-	sfx_6 1
-	sfx_0 5, 137
-	sfx_6 1
-	sfx_0 5, 172
-	sfx_6 1
-	sfx_1 159
-	sfx_2 8
-	sfx_0 6, 11
-	sfx_0 6, 66
-	sfx_0 6, 114
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 196
-	sfx_0 6, 214
-	sfx_1 159
-	sfx_2 4
-	sfx_0 7, 5
-	sfx_0 7, 33
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_0 7, 89
-	sfx_0 7, 98
-	sfx_0 7, 107
-	sfx_1 159
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 172
-	sfx_0 7, 177
-	sfx_0 7, 182
+	sfx_pan TRUE, TRUE
+	sfx_env 9, -7
+	sfx_duty 2
+	sfx_freq $416
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $483
+	sfx_wait 1
+	sfx_freq $4e5
+	sfx_wait 1
+	sfx_freq $511
+	sfx_wait 1
+	sfx_freq $563
+	sfx_wait 1
+	sfx_freq $589
+	sfx_wait 1
+	sfx_freq $5ac
+	sfx_wait 1
+	sfx_env 9, -7
+	sfx_duty 2
+	sfx_freq $60b
+	sfx_freq $642
+	sfx_freq $672
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $6c4
+	sfx_freq $6d6
+	sfx_env 9, -7
+	sfx_duty 1
+	sfx_freq $705
+	sfx_freq $721
+	sfx_freq $739
+	sfx_freq $744
+	sfx_freq $759
+	sfx_freq $762
+	sfx_freq $76b
+	sfx_env 9, -7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7ac
+	sfx_freq $7b1
+	sfx_freq $7b6
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_0e.asm b/src/audio/sfx/sfx_0e.asm
index cf183d6..094572f 100644
--- a/src/audio/sfx/sfx_0e.asm
+++ b/src/audio/sfx/sfx_0e.asm
@@ -1,48 +1,48 @@
 Sfx0e_Ch1:
-	sfx_8 17
-	sfx_1 207
-	sfx_2 0
-	sfx_0 7, 89
-	sfx_0 7, 107
-	sfx_0 7, 123
-	sfx_0 7, 107
-	sfx_1 255
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 182
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 182
-	sfx_6 1
-	sfx_1 255
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 143
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
+	sfx_pan TRUE, TRUE
+	sfx_env 12, -7
+	sfx_duty 0
+	sfx_freq $759
+	sfx_freq $76b
+	sfx_freq $77b
+	sfx_freq $76b
+	sfx_env 15, -7
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7b6
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $7b6
+	sfx_wait 1
+	sfx_env 15, -7
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_3d_attack.asm b/src/audio/sfx/sfx_3d_attack.asm
index a5d7601..6c17c41 100644
--- a/src/audio/sfx/sfx_3d_attack.asm
+++ b/src/audio/sfx/sfx_3d_attack.asm
@@ -1,154 +1,154 @@
 Sfx_3dAttack_Ch1:
-	sfx_8 17
-	sfx_1 33
-	sfx_2 4
-	sfx_0 6, 178
-	sfx_1 49
-	sfx_2 4
-	sfx_0 6, 246
-	sfx_1 65
-	sfx_2 4
-	sfx_0 7, 33
-	sfx_1 81
-	sfx_2 4
-	sfx_0 7, 79
-	sfx_1 97
-	sfx_2 4
-	sfx_0 7, 107
-	sfx_1 113
-	sfx_2 4
-	sfx_0 7, 89
-	sfx_1 129
-	sfx_2 4
-	sfx_0 7, 123
-	sfx_1 145
-	sfx_2 4
-	sfx_0 7, 144
-	sfx_1 161
-	sfx_2 4
-	sfx_0 7, 167
-	sfx_1 177
-	sfx_2 4
-	sfx_0 7, 182
-	sfx_1 209
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_5 0
-	sfx_6 1
-	sfx_1 209
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 209
-	sfx_2 4
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_1 193
-	sfx_2 4
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_1 193
-	sfx_2 4
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 193
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_1 161
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 161
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 161
-	sfx_2 4
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_1 145
-	sfx_2 4
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_1 145
-	sfx_2 4
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 145
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_1 113
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 113
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 113
-	sfx_2 4
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_1 97
-	sfx_2 4
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_1 97
-	sfx_2 4
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 97
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_1 65
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 65
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 65
-	sfx_2 4
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_1 49
-	sfx_2 4
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_1 49
-	sfx_2 4
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 49
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_1 32
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 32
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 32
-	sfx_2 4
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_1 16
-	sfx_2 4
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_1 16
-	sfx_2 4
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 16
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_6 1
+	sfx_pan TRUE, TRUE
+	sfx_env 2, 1
+	sfx_duty 1
+	sfx_freq $6b2
+	sfx_env 3, 1
+	sfx_duty 1
+	sfx_freq $6f6
+	sfx_env 4, 1
+	sfx_duty 1
+	sfx_freq $721
+	sfx_env 5, 1
+	sfx_duty 1
+	sfx_freq $74f
+	sfx_env 6, 1
+	sfx_duty 1
+	sfx_freq $76b
+	sfx_env 7, 1
+	sfx_duty 1
+	sfx_freq $759
+	sfx_env 8, 1
+	sfx_duty 1
+	sfx_freq $77b
+	sfx_env 9, 1
+	sfx_duty 1
+	sfx_freq $790
+	sfx_env 10, 1
+	sfx_duty 1
+	sfx_freq $7a7
+	sfx_env 11, 1
+	sfx_duty 1
+	sfx_freq $7b6
+	sfx_env 13, 1
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 13, 1
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 13, 1
+	sfx_duty 1
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_env 12, 1
+	sfx_duty 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_env 12, 1
+	sfx_duty 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 12, 1
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_env 10, 1
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 10, 1
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 10, 1
+	sfx_duty 1
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_env 9, 1
+	sfx_duty 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_env 9, 1
+	sfx_duty 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 9, 1
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_env 7, 1
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 7, 1
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 7, 1
+	sfx_duty 1
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_env 6, 1
+	sfx_duty 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_env 6, 1
+	sfx_duty 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 6, 1
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_env 4, 1
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 4, 1
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 4, 1
+	sfx_duty 1
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_env 3, 1
+	sfx_duty 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_env 3, 1
+	sfx_duty 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 3, 1
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_env 2, 0
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 2, 0
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 2, 0
+	sfx_duty 1
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_env 1, 0
+	sfx_duty 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_env 1, 0
+	sfx_duty 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 1, 0
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_5f.asm b/src/audio/sfx/sfx_5f.asm
index bdff686..0cfc432 100644
--- a/src/audio/sfx/sfx_5f.asm
+++ b/src/audio/sfx/sfx_5f.asm
@@ -1,16 +1,16 @@
 Sfx5f_Ch1:
-	sfx_8 17
-	sfx_1 247
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 68
-	sfx_0 0, 52
-	sfx_1 183
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 7
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $44
+	sfx_freq $34
+	sfx_env 11, 7
 	sfx_loop 6
-	sfx_0 0, 17
-	sfx_0 0, 16
-	sfx_0 0, 17
-	sfx_0 0, 16
+	sfx_freq $11
+	sfx_freq $10
+	sfx_freq $11
+	sfx_freq $10
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_avalanche.asm b/src/audio/sfx/sfx_avalanche.asm
index 1ebc53f..c7d46fd 100644
--- a/src/audio/sfx/sfx_avalanche.asm
+++ b/src/audio/sfx/sfx_avalanche.asm
@@ -1,27 +1,27 @@
 Sfx_Avalanche_Ch1:
-	sfx_8 17
-	sfx_1 223
+	sfx_pan TRUE, TRUE
+	sfx_env 13, -7
 	sfx_loop 40
-	sfx_0 0, 112
-	sfx_0 0, 114
+	sfx_freq $70
+	sfx_freq $72
 	sfx_endloop
-	sfx_1 143
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_1 79
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_1 31
-	sfx_0 0, 112
-	sfx_0 0, 114
+	sfx_env 8, -7
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_env 4, -7
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_env 1, -7
+	sfx_freq $70
+	sfx_freq $72
 	sfx_end
diff --git a/src/audio/sfx/sfx_barrier.asm b/src/audio/sfx/sfx_barrier.asm
index 88f5d21..b1319f8 100644
--- a/src/audio/sfx/sfx_barrier.asm
+++ b/src/audio/sfx/sfx_barrier.asm
@@ -1,62 +1,62 @@
 Sfx_Barrier_Ch1:
-	sfx_1 239
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_0 7, 33
-	sfx_0 7, 57
-	sfx_0 7, 33
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_0 7, 89
-	sfx_0 7, 68
-	sfx_0 7, 89
-	sfx_0 7, 107
-	sfx_0 7, 89
-	sfx_0 7, 107
-	sfx_0 7, 123
-	sfx_0 7, 107
-	sfx_0 7, 123
-	sfx_0 7, 131
-	sfx_0 7, 123
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_1 207
-	sfx_2 0
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_1 175
-	sfx_2 0
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_1 143
-	sfx_2 0
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
+	sfx_env 14, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $705
+	sfx_freq $721
+	sfx_freq $739
+	sfx_freq $721
+	sfx_freq $739
+	sfx_freq $744
+	sfx_freq $739
+	sfx_freq $744
+	sfx_freq $759
+	sfx_freq $744
+	sfx_freq $759
+	sfx_freq $76b
+	sfx_freq $759
+	sfx_freq $76b
+	sfx_freq $77b
+	sfx_freq $76b
+	sfx_freq $77b
+	sfx_freq $783
+	sfx_freq $77b
+	sfx_freq $783
+	sfx_freq $790
+	sfx_freq $783
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_env 12, -7
+	sfx_duty 0
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_env 10, -7
+	sfx_duty 0
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
 	sfx_end
diff --git a/src/audio/sfx/sfx_beam.asm b/src/audio/sfx/sfx_beam.asm
index 74162f3..fd67174 100644
--- a/src/audio/sfx/sfx_beam.asm
+++ b/src/audio/sfx/sfx_beam.asm
@@ -1,25 +1,25 @@
 Sfx_Beam_Ch1:
-	sfx_1 84
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_1 212
-	sfx_2 0
+	sfx_env 5, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_env 13, 4
+	sfx_duty 0
 	sfx_loop 10
-	sfx_0 7, 131
-	sfx_0 7, 138
+	sfx_freq $783
+	sfx_freq $78a
 	sfx_endloop
-	sfx_1 228
-	sfx_2 4
+	sfx_env 14, 4
+	sfx_duty 1
 	sfx_loop 10
-	sfx_0 7, 138
-	sfx_0 7, 157
+	sfx_freq $78a
+	sfx_freq $79d
 	sfx_endloop
-	sfx_1 100
-	sfx_2 4
-	sfx_0 7, 157
-	sfx_1 52
-	sfx_2 4
-	sfx_0 7, 157
+	sfx_env 6, 4
+	sfx_duty 1
+	sfx_freq $79d
+	sfx_env 3, 4
+	sfx_duty 1
+	sfx_freq $79d
 	sfx_end
diff --git a/src/audio/sfx/sfx_bench_manipulation.asm b/src/audio/sfx/sfx_bench_manipulation.asm
index 96c0a13..30e0037 100644
--- a/src/audio/sfx/sfx_bench_manipulation.asm
+++ b/src/audio/sfx/sfx_bench_manipulation.asm
@@ -1,106 +1,106 @@
 Sfx_BenchManipulation_Ch1:
-	sfx_8 17
-	sfx_2 8
-	sfx_1 42
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 58
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 74
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 90
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 106
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 122
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 138
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 122
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 106
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 90
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 74
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 58
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 42
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 26
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 7, 115
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_env 2, -2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 3, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 4, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 5, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 6, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 7, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 8, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 7, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 6, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 5, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 4, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 3, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 2, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 1, -2
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $773
 	sfx_end
diff --git a/src/audio/sfx/sfx_big_flame.asm b/src/audio/sfx/sfx_big_flame.asm
index 02d8fad..b284bc1 100644
--- a/src/audio/sfx/sfx_big_flame.asm
+++ b/src/audio/sfx/sfx_big_flame.asm
@@ -1,100 +1,100 @@
 Sfx_BigFlame_Ch1:
-	sfx_8 17
-	sfx_1 111
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 84
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_1 246
-	sfx_0 0, 20
-	sfx_0 0, 20
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_1 134
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_1 102
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_1 70
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_1 38
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_1 22
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
+	sfx_pan TRUE, TRUE
+	sfx_env 6, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $54
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $53
+	sfx_env 15, 6
+	sfx_freq $14
+	sfx_freq $14
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_env 8, 6
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_env 6, 6
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_env 4, 6
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_env 2, 6
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_env 1, 6
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
 	sfx_end
diff --git a/src/audio/sfx/sfx_big_lightning.asm b/src/audio/sfx/sfx_big_lightning.asm
index dff43ce..4eb9023 100644
--- a/src/audio/sfx/sfx_big_lightning.asm
+++ b/src/audio/sfx/sfx_big_lightning.asm
@@ -1,84 +1,84 @@
 Sfx_BigLightning_Ch1:
-	sfx_8 17
-	sfx_1 240
-	sfx_0 0, 80
-	sfx_0 0, 98
-	sfx_0 0, 80
-	sfx_0 0, 98
-	sfx_0 0, 80
-	sfx_0 0, 98
-	sfx_0 0, 80
-	sfx_0 0, 98
-	sfx_0 0, 80
-	sfx_0 0, 98
-	sfx_0 0, 80
-	sfx_0 0, 98
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_1 208
-	sfx_0 0, 80
-	sfx_0 0, 80
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_1 160
-	sfx_0 0, 80
-	sfx_0 0, 80
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_1 112
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 0
+	sfx_freq $50
+	sfx_freq $62
+	sfx_freq $50
+	sfx_freq $62
+	sfx_freq $50
+	sfx_freq $62
+	sfx_freq $50
+	sfx_freq $62
+	sfx_freq $50
+	sfx_freq $62
+	sfx_freq $50
+	sfx_freq $62
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_env 13, 0
+	sfx_freq $50
+	sfx_freq $50
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $50
+	sfx_env 10, 0
+	sfx_freq $50
+	sfx_freq $50
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_env 7, 0
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
 	sfx_loop 5
-	sfx_1 128
-	sfx_0 0, 98
-	sfx_0 0, 20
-	sfx_0 0, 21
-	sfx_0 0, 22
+	sfx_env 8, 0
+	sfx_freq $62
+	sfx_freq $14
+	sfx_freq $15
+	sfx_freq $16
 	sfx_endloop
-	sfx_0 0, 20
-	sfx_0 0, 21
-	sfx_0 0, 22
-	sfx_0 0, 20
-	sfx_1 128
-	sfx_0 0, 21
-	sfx_0 0, 22
-	sfx_0 0, 20
-	sfx_0 0, 19
-	sfx_0 0, 18
-	sfx_0 0, 20
-	sfx_0 0, 19
-	sfx_0 0, 18
-	sfx_1 64
-	sfx_0 0, 21
-	sfx_0 0, 23
-	sfx_0 0, 21
-	sfx_0 0, 23
-	sfx_0 0, 21
-	sfx_0 0, 65
-	sfx_0 0, 67
-	sfx_0 0, 65
-	sfx_1 32
-	sfx_0 0, 68
-	sfx_0 0, 84
-	sfx_0 0, 68
-	sfx_0 0, 84
-	sfx_0 0, 69
-	sfx_0 0, 85
-	sfx_0 0, 69
-	sfx_1 22
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 103
-	sfx_0 0, 87
-	sfx_0 0, 103
-	sfx_0 0, 87
-	sfx_0 0, 103
+	sfx_freq $14
+	sfx_freq $15
+	sfx_freq $16
+	sfx_freq $14
+	sfx_env 8, 0
+	sfx_freq $15
+	sfx_freq $16
+	sfx_freq $14
+	sfx_freq $13
+	sfx_freq $12
+	sfx_freq $14
+	sfx_freq $13
+	sfx_freq $12
+	sfx_env 4, 0
+	sfx_freq $15
+	sfx_freq $17
+	sfx_freq $15
+	sfx_freq $17
+	sfx_freq $15
+	sfx_freq $41
+	sfx_freq $43
+	sfx_freq $41
+	sfx_env 2, 0
+	sfx_freq $44
+	sfx_freq $54
+	sfx_freq $44
+	sfx_freq $54
+	sfx_freq $45
+	sfx_freq $55
+	sfx_freq $45
+	sfx_env 1, 6
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $67
+	sfx_freq $57
+	sfx_freq $67
+	sfx_freq $57
+	sfx_freq $67
 	sfx_end
diff --git a/src/audio/sfx/sfx_big_self_destruct.asm b/src/audio/sfx/sfx_big_self_destruct.asm
index f79fe27..9700520 100644
--- a/src/audio/sfx/sfx_big_self_destruct.asm
+++ b/src/audio/sfx/sfx_big_self_destruct.asm
@@ -1,61 +1,61 @@
 Sfx_BigSelfDestruct_Ch1:
-	sfx_8 17
-	sfx_1 207
-	sfx_0 0, 116
-	sfx_0 0, 116
-	sfx_0 0, 116
-	sfx_0 0, 116
-	sfx_1 255
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 83
-	sfx_0 0, 83
-	sfx_0 0, 83
-	sfx_0 0, 83
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_1 207
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_1 143
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_1 79
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_1 31
-	sfx_0 0, 85
-	sfx_0 0, 85
+	sfx_pan TRUE, TRUE
+	sfx_env 12, -7
+	sfx_freq $74
+	sfx_freq $74
+	sfx_freq $74
+	sfx_freq $74
+	sfx_env 15, -7
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $53
+	sfx_freq $53
+	sfx_freq $53
+	sfx_freq $53
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_env 12, -7
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_env 8, -7
+	sfx_freq $55
+	sfx_freq $55
+	sfx_env 4, -7
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_env 1, -7
+	sfx_freq $55
+	sfx_freq $55
 	sfx_end
diff --git a/src/audio/sfx/sfx_big_snore.asm b/src/audio/sfx/sfx_big_snore.asm
index 36c801d..5da9433 100644
--- a/src/audio/sfx/sfx_big_snore.asm
+++ b/src/audio/sfx/sfx_big_snore.asm
@@ -1,148 +1,148 @@
 Sfx_BigSnore_Ch1:
-	sfx_8 17
-	sfx_1 45
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_0 7, 107
-	sfx_0 7, 89
-	sfx_0 7, 107
-	sfx_0 7, 89
-	sfx_0 7, 68
-	sfx_1 92
-	sfx_2 8
-	sfx_0 7, 89
-	sfx_0 7, 68
-	sfx_0 7, 45
-	sfx_0 7, 68
-	sfx_0 7, 45
-	sfx_0 7, 20
-	sfx_1 140
-	sfx_2 8
-	sfx_0 7, 45
-	sfx_0 7, 20
-	sfx_0 6, 246
-	sfx_0 7, 20
-	sfx_0 6, 246
-	sfx_0 6, 214
-	sfx_1 240
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_0 6, 11
-	sfx_0 2, 34
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_1 240
-	sfx_2 8
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 2, 34
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_1 144
-	sfx_2 8
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 2, 34
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_1 112
-	sfx_2 8
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 2, 34
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_1 80
-	sfx_2 8
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 2, 34
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_1 48
-	sfx_2 8
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 2, 34
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
+	sfx_pan TRUE, TRUE
+	sfx_env 2, -5
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_freq $76b
+	sfx_freq $759
+	sfx_freq $76b
+	sfx_freq $759
+	sfx_freq $744
+	sfx_env 5, -4
+	sfx_duty 2
+	sfx_freq $759
+	sfx_freq $744
+	sfx_freq $72d
+	sfx_freq $744
+	sfx_freq $72d
+	sfx_freq $714
+	sfx_env 8, -4
+	sfx_duty 2
+	sfx_freq $72d
+	sfx_freq $714
+	sfx_freq $6f6
+	sfx_freq $714
+	sfx_freq $6f6
+	sfx_freq $6d6
+	sfx_env 15, 0
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_freq $60b
+	sfx_freq $222
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_env 15, 0
+	sfx_duty 2
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $222
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_env 9, 0
+	sfx_duty 2
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $222
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_env 7, 0
+	sfx_duty 2
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $222
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_env 5, 0
+	sfx_duty 2
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $222
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_env 3, 0
+	sfx_duty 2
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $222
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
 	sfx_end
 
 Sfx_BigSnore_Ch2:
-	sfx_8 17
-	sfx_1 16
-	sfx_0 0, 6
-	sfx_0 0, 6
-	sfx_0 0, 6
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_1 45
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 4
-	sfx_1 76
-	sfx_0 0, 4
-	sfx_0 0, 4
-	sfx_0 0, 4
-	sfx_0 0, 3
-	sfx_1 111
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_1 159
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_1 240
-	sfx_0 0, 21
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_1 164
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_0 0, 97
-	sfx_1 240
-	sfx_0 0, 69
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_1 167
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 100
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 102
-	sfx_0 0, 102
-	sfx_0 0, 102
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_1 133
-	sfx_0 0, 69
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_1 87
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 100
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 102
-	sfx_0 0, 102
-	sfx_0 0, 102
-	sfx_0 0, 101
-	sfx_0 0, 101
+	sfx_pan TRUE, TRUE
+	sfx_env 1, 0
+	sfx_freq $6
+	sfx_freq $6
+	sfx_freq $6
+	sfx_freq $5
+	sfx_freq $5
+	sfx_env 2, -5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $4
+	sfx_env 4, -4
+	sfx_freq $4
+	sfx_freq $4
+	sfx_freq $4
+	sfx_freq $3
+	sfx_env 6, -7
+	sfx_freq $2
+	sfx_freq $1
+	sfx_env 9, -7
+	sfx_freq $0
+	sfx_freq $0
+	sfx_env 15, 0
+	sfx_freq $15
+	sfx_freq $64
+	sfx_freq $64
+	sfx_env 10, 4
+	sfx_freq $64
+	sfx_freq $64
+	sfx_freq $61
+	sfx_env 15, 0
+	sfx_freq $45
+	sfx_freq $64
+	sfx_freq $64
+	sfx_env 10, 7
+	sfx_freq $64
+	sfx_freq $64
+	sfx_freq $64
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $64
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $66
+	sfx_freq $66
+	sfx_freq $66
+	sfx_freq $65
+	sfx_freq $65
+	sfx_env 8, 5
+	sfx_freq $45
+	sfx_freq $64
+	sfx_freq $64
+	sfx_env 5, 7
+	sfx_freq $64
+	sfx_freq $64
+	sfx_freq $64
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $64
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $66
+	sfx_freq $66
+	sfx_freq $66
+	sfx_freq $65
+	sfx_freq $65
 	sfx_end
diff --git a/src/audio/sfx/sfx_black_box_insert.asm b/src/audio/sfx/sfx_black_box_insert.asm
index 4139737..0142cb0 100644
--- a/src/audio/sfx/sfx_black_box_insert.asm
+++ b/src/audio/sfx/sfx_black_box_insert.asm
@@ -1,17 +1,17 @@
 Sfx_BlackBoxInsert_Ch1:
-	sfx_8 17
-	sfx_1 123
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_1 205
-	sfx_0 0, 2
-	sfx_0 0, 4
-	sfx_1 235
-	sfx_0 0, 54
-	sfx_1 240
-	sfx_0 0, 2
-	sfx_1 243
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
+	sfx_pan TRUE, TRUE
+	sfx_env 7, -3
+	sfx_freq $1
+	sfx_freq $1
+	sfx_env 12, -5
+	sfx_freq $2
+	sfx_freq $4
+	sfx_env 14, -3
+	sfx_freq $36
+	sfx_env 15, 0
+	sfx_freq $2
+	sfx_env 15, 3
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
 	sfx_end
diff --git a/src/audio/sfx/sfx_black_box_inserted.asm b/src/audio/sfx/sfx_black_box_inserted.asm
index 816dc2f..86235f5 100644
--- a/src/audio/sfx/sfx_black_box_inserted.asm
+++ b/src/audio/sfx/sfx_black_box_inserted.asm
@@ -1,60 +1,60 @@
 Sfx_BlackBoxInserted_Ch1:
-	sfx_8 17
-	sfx_1 241
-	sfx_2 0
-	sfx_0 7, 167
-	sfx_5 0
-	sfx_6 1
-	sfx_1 241
-	sfx_2 0
-	sfx_0 7, 177
-	sfx_6 1
-	sfx_1 241
-	sfx_2 0
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_1 245
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_1 133
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_1 101
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_1 85
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_1 69
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_1 53
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_1 37
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 1
+	sfx_duty 0
+	sfx_freq $7a7
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 15, 1
+	sfx_duty 0
+	sfx_freq $7b1
+	sfx_wait 1
+	sfx_env 15, 1
+	sfx_duty 0
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_env 15, 5
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_env 8, 5
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_env 6, 5
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_env 5, 5
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_env 4, 5
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_env 3, 5
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_env 2, 5
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_black_box_transmitted.asm b/src/audio/sfx/sfx_black_box_transmitted.asm
index 8689e66..69a800b 100644
--- a/src/audio/sfx/sfx_black_box_transmitted.asm
+++ b/src/audio/sfx/sfx_black_box_transmitted.asm
@@ -1,52 +1,52 @@
 Sfx_BlackBoxTransmitted_Ch1:
-	sfx_8 17
-	sfx_1 195
-	sfx_2 4
-	sfx_0 7, 144
-	sfx_5 0
-	sfx_6 2
-	sfx_1 195
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_6 2
-	sfx_1 198
-	sfx_2 4
-	sfx_0 7, 190
-	sfx_6 4
-	sfx_1 99
-	sfx_2 4
-	sfx_0 7, 144
-	sfx_6 2
-	sfx_1 99
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_6 2
-	sfx_1 103
-	sfx_2 4
-	sfx_0 7, 190
-	sfx_6 4
-	sfx_1 67
-	sfx_2 4
-	sfx_0 7, 144
-	sfx_6 2
-	sfx_1 67
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_6 2
-	sfx_1 71
-	sfx_2 4
-	sfx_0 7, 190
-	sfx_6 4
-	sfx_1 36
-	sfx_2 4
-	sfx_0 7, 144
-	sfx_6 2
-	sfx_1 36
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_6 2
-	sfx_1 39
-	sfx_2 4
-	sfx_0 7, 190
-	sfx_6 4
+	sfx_pan TRUE, TRUE
+	sfx_env 12, 3
+	sfx_duty 1
+	sfx_freq $790
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_env 12, 3
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_wait 2
+	sfx_env 12, 6
+	sfx_duty 1
+	sfx_freq $7be
+	sfx_wait 4
+	sfx_env 6, 3
+	sfx_duty 1
+	sfx_freq $790
+	sfx_wait 2
+	sfx_env 6, 3
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_wait 2
+	sfx_env 6, 7
+	sfx_duty 1
+	sfx_freq $7be
+	sfx_wait 4
+	sfx_env 4, 3
+	sfx_duty 1
+	sfx_freq $790
+	sfx_wait 2
+	sfx_env 4, 3
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_wait 2
+	sfx_env 4, 7
+	sfx_duty 1
+	sfx_freq $7be
+	sfx_wait 4
+	sfx_env 2, 4
+	sfx_duty 1
+	sfx_freq $790
+	sfx_wait 2
+	sfx_env 2, 4
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_wait 2
+	sfx_env 2, 7
+	sfx_duty 1
+	sfx_freq $7be
+	sfx_wait 4
 	sfx_end
diff --git a/src/audio/sfx/sfx_blizzard.asm b/src/audio/sfx/sfx_blizzard.asm
index 2b65f79..7a3e009 100644
--- a/src/audio/sfx/sfx_blizzard.asm
+++ b/src/audio/sfx/sfx_blizzard.asm
@@ -1,47 +1,47 @@
 Sfx_Blizzard_Ch1:
-	sfx_8 17
-	sfx_1 111
+	sfx_pan TRUE, TRUE
+	sfx_env 6, -7
 	sfx_loop 80
-	sfx_0 0, 112
+	sfx_freq $70
 	sfx_endloop
-	sfx_1 143
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_1 127
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_1 111
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_1 95
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_1 79
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_1 63
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_1 47
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_1 31
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
-	sfx_0 0, 112
+	sfx_env 8, -7
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_env 7, -7
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_env 6, -7
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_env 5, -7
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_env 4, -7
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_env 3, -7
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_env 2, -7
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_env 1, -7
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
+	sfx_freq $70
 	sfx_end
diff --git a/src/audio/sfx/sfx_bone_headbutt.asm b/src/audio/sfx/sfx_bone_headbutt.asm
index 697999b..9420ed9 100644
--- a/src/audio/sfx/sfx_bone_headbutt.asm
+++ b/src/audio/sfx/sfx_bone_headbutt.asm
@@ -1,81 +1,81 @@
 Sfx_BoneHeadbutt_Ch1:
-	sfx_8 17
-	sfx_9 54
+	sfx_pan TRUE, TRUE
+	sfx_sweep_up 3, 6
 	sfx_loop 5
-	sfx_1 58
-	sfx_2 8
-	sfx_0 7, 144
-	sfx_5 0
-	sfx_6 5
+	sfx_env 3, -2
+	sfx_duty 2
+	sfx_freq $790
+	sfx_pitch_offset 0
+	sfx_wait 5
 	sfx_endloop
-	sfx_1 58
-	sfx_2 8
-	sfx_0 7, 144
-	sfx_6 2
-	sfx_9 0
-	sfx_2 0
-	sfx_1 247
-	sfx_0 6, 137
-	sfx_0 6, 66
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 2, 198
-	sfx_0 1, 107
-	sfx_9 38
-	sfx_1 103
-	sfx_2 4
-	sfx_0 6, 214
-	sfx_6 6
-	sfx_1 55
-	sfx_2 4
-	sfx_0 6, 246
-	sfx_6 6
-	sfx_1 23
-	sfx_2 4
-	sfx_0 7, 20
-	sfx_6 6
+	sfx_env 3, -2
+	sfx_duty 2
+	sfx_freq $790
+	sfx_wait 2
+	sfx_sweep_up 0, 0
+	sfx_duty 0
+	sfx_env 15, 7
+	sfx_freq $689
+	sfx_freq $642
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $2c6
+	sfx_freq $16b
+	sfx_sweep_up 2, 6
+	sfx_env 6, 7
+	sfx_duty 1
+	sfx_freq $6d6
+	sfx_wait 6
+	sfx_env 3, 7
+	sfx_duty 1
+	sfx_freq $6f6
+	sfx_wait 6
+	sfx_env 1, 7
+	sfx_duty 1
+	sfx_freq $714
+	sfx_wait 6
 	sfx_end
 
 Sfx_BoneHeadbutt_Ch2:
-	sfx_8 17
-	sfx_1 80
+	sfx_pan TRUE, TRUE
+	sfx_env 5, 0
 	sfx_loop 4
-	sfx_0 0, 54
-	sfx_0 0, 38
-	sfx_0 0, 52
-	sfx_0 0, 34
-	sfx_0 0, 52
-	sfx_0 0, 54
-	sfx_0 0, 35
+	sfx_freq $36
+	sfx_freq $26
+	sfx_freq $34
+	sfx_freq $22
+	sfx_freq $34
+	sfx_freq $36
+	sfx_freq $23
 	sfx_endloop
-	sfx_0 0, 54
-	sfx_0 0, 38
-	sfx_0 0, 52
-	sfx_0 0, 34
-	sfx_0 0, 52
-	sfx_1 244
-	sfx_0 0, 21
-	sfx_0 0, 66
-	sfx_0 0, 101
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_0 0, 82
-	sfx_1 116
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_1 68
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_1 36
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
+	sfx_freq $36
+	sfx_freq $26
+	sfx_freq $34
+	sfx_freq $22
+	sfx_freq $34
+	sfx_env 15, 4
+	sfx_freq $15
+	sfx_freq $42
+	sfx_freq $65
+	sfx_freq $63
+	sfx_freq $63
+	sfx_freq $52
+	sfx_env 7, 4
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_env 4, 4
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_env 2, 4
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
 	sfx_end
diff --git a/src/audio/sfx/sfx_bone_toss_bench.asm b/src/audio/sfx/sfx_bone_toss_bench.asm
index 9c85427..9c357e5 100644
--- a/src/audio/sfx/sfx_bone_toss_bench.asm
+++ b/src/audio/sfx/sfx_bone_toss_bench.asm
@@ -1,109 +1,109 @@
 Sfx_BoneToss_Bench_Ch1:
-	sfx_8 17
-	sfx_1 29
-	sfx_2 8
+	sfx_pan TRUE, TRUE
+	sfx_env 1, -5
+	sfx_duty 2
 	sfx_loop 2
-	sfx_1 29
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 177
-	sfx_1 61
-	sfx_2 8
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_1 93
-	sfx_2 8
-	sfx_0 7, 197
-	sfx_0 7, 200
-	sfx_1 112
-	sfx_2 8
-	sfx_0 7, 209
-	sfx_0 7, 212
-	sfx_1 85
-	sfx_2 8
-	sfx_0 7, 217
-	sfx_0 7, 219
-	sfx_1 53
-	sfx_2 8
-	sfx_0 7, 221
-	sfx_0 7, 223
+	sfx_env 1, -5
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7b1
+	sfx_env 3, -5
+	sfx_duty 2
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_env 5, -5
+	sfx_duty 2
+	sfx_freq $7c5
+	sfx_freq $7c8
+	sfx_env 7, 0
+	sfx_duty 2
+	sfx_freq $7d1
+	sfx_freq $7d4
+	sfx_env 5, 5
+	sfx_duty 2
+	sfx_freq $7d9
+	sfx_freq $7db
+	sfx_env 3, 5
+	sfx_duty 2
+	sfx_freq $7dd
+	sfx_freq $7df
 	sfx_endloop
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 177
-	sfx_1 47
-	sfx_2 8
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_1 77
-	sfx_2 8
-	sfx_0 7, 197
-	sfx_0 7, 200
-	sfx_1 96
-	sfx_2 8
-	sfx_0 7, 209
-	sfx_0 7, 212
-	sfx_1 69
-	sfx_2 8
-	sfx_0 7, 217
-	sfx_0 7, 219
-	sfx_1 37
-	sfx_2 8
-	sfx_0 7, 221
-	sfx_0 7, 223
-	sfx_1 16
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 177
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_1 45
-	sfx_2 8
-	sfx_0 7, 197
-	sfx_0 7, 200
-	sfx_1 64
-	sfx_2 8
-	sfx_0 7, 209
-	sfx_0 7, 212
-	sfx_1 37
-	sfx_2 8
-	sfx_0 7, 217
-	sfx_0 7, 219
-	sfx_1 16
-	sfx_2 8
-	sfx_0 7, 221
-	sfx_0 7, 223
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7b1
+	sfx_env 2, -7
+	sfx_duty 2
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_env 4, -5
+	sfx_duty 2
+	sfx_freq $7c5
+	sfx_freq $7c8
+	sfx_env 6, 0
+	sfx_duty 2
+	sfx_freq $7d1
+	sfx_freq $7d4
+	sfx_env 4, 5
+	sfx_duty 2
+	sfx_freq $7d9
+	sfx_freq $7db
+	sfx_env 2, 5
+	sfx_duty 2
+	sfx_freq $7dd
+	sfx_freq $7df
+	sfx_env 1, 0
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7b1
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_env 2, -5
+	sfx_duty 2
+	sfx_freq $7c5
+	sfx_freq $7c8
+	sfx_env 4, 0
+	sfx_duty 2
+	sfx_freq $7d1
+	sfx_freq $7d4
+	sfx_env 2, 5
+	sfx_duty 2
+	sfx_freq $7d9
+	sfx_freq $7db
+	sfx_env 1, 0
+	sfx_duty 2
+	sfx_freq $7dd
+	sfx_freq $7df
 	sfx_end
 
 Sfx_BoneToss_Bench_Ch2:
-	sfx_8 17
-	sfx_1 0
-	sfx_6 14
-	sfx_1 243
-	sfx_0 0, 102
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_1 247
-	sfx_0 0, 19
-	sfx_0 0, 99
-	sfx_0 0, 83
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_1 119
-	sfx_0 0, 99
-	sfx_0 0, 83
-	sfx_0 0, 81
-	sfx_1 71
-	sfx_0 0, 99
-	sfx_0 0, 83
-	sfx_0 0, 81
-	sfx_1 39
-	sfx_0 0, 99
-	sfx_0 0, 83
-	sfx_0 0, 81
+	sfx_pan TRUE, TRUE
+	sfx_env 0, 0
+	sfx_wait 14
+	sfx_env 15, 3
+	sfx_freq $66
+	sfx_freq $64
+	sfx_freq $64
+	sfx_env 15, 7
+	sfx_freq $13
+	sfx_freq $63
+	sfx_freq $53
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $10
+	sfx_env 7, 7
+	sfx_freq $63
+	sfx_freq $53
+	sfx_freq $51
+	sfx_env 4, 7
+	sfx_freq $63
+	sfx_freq $53
+	sfx_freq $51
+	sfx_env 2, 7
+	sfx_freq $63
+	sfx_freq $53
+	sfx_freq $51
 	sfx_end
diff --git a/src/audio/sfx/sfx_bonemerang.asm b/src/audio/sfx/sfx_bonemerang.asm
index 6e62d48..17246b7 100644
--- a/src/audio/sfx/sfx_bonemerang.asm
+++ b/src/audio/sfx/sfx_bonemerang.asm
@@ -1,247 +1,247 @@
 Sfx_Bonemerang_Ch1:
-	sfx_1 143
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_0 7, 190
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 214
-	sfx_0 7, 219
-	sfx_1 111
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_1 79
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_1 47
-	sfx_2 8
-	sfx_0 7, 144
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_1 111
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_0 7, 190
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 214
-	sfx_0 7, 219
-	sfx_1 95
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_1 79
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_1 47
-	sfx_2 8
-	sfx_0 7, 144
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_1 79
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_0 7, 190
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 214
-	sfx_0 7, 219
-	sfx_1 63
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_1 47
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 144
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_1 63
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_0 7, 190
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 214
-	sfx_0 7, 219
-	sfx_1 63
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_1 47
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_1 47
-	sfx_2 8
-	sfx_0 7, 144
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_1 63
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_0 7, 190
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 214
-	sfx_0 7, 219
-	sfx_1 63
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_1 63
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_1 47
-	sfx_2 8
-	sfx_0 7, 144
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_0 7, 190
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 214
-	sfx_0 7, 219
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 144
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 157
+	sfx_env 8, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $783
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_freq $7be
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d6
+	sfx_freq $7db
+	sfx_env 6, -7
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_env 4, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_env 2, -7
+	sfx_duty 2
+	sfx_freq $790
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_env 6, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_freq $7be
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d6
+	sfx_freq $7db
+	sfx_env 5, -7
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_env 4, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_env 2, -7
+	sfx_duty 2
+	sfx_freq $790
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_env 4, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_freq $7be
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d6
+	sfx_freq $7db
+	sfx_env 3, -7
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_env 2, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $790
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_env 3, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_freq $7be
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d6
+	sfx_freq $7db
+	sfx_env 3, -7
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_env 2, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_env 2, -7
+	sfx_duty 2
+	sfx_freq $790
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_env 3, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_freq $7be
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d6
+	sfx_freq $7db
+	sfx_env 3, -7
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_env 3, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_env 2, -7
+	sfx_duty 2
+	sfx_freq $790
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_freq $7be
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d6
+	sfx_freq $7db
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $790
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $79d
 	sfx_end
 
 Sfx_Bonemerang_Ch2:
-	sfx_8 17
-	sfx_1 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 18
-	sfx_5 255
-	sfx_1 223
-	sfx_0 0, 49
-	sfx_0 0, 55
-	sfx_0 0, 49
-	sfx_0 0, 55
-	sfx_0 0, 49
-	sfx_0 0, 55
-	sfx_1 143
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_1 79
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_1 31
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_1 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 10
-	sfx_5 255
-	sfx_1 223
-	sfx_0 0, 49
-	sfx_0 0, 55
-	sfx_0 0, 49
-	sfx_0 0, 55
-	sfx_0 0, 49
-	sfx_0 0, 55
-	sfx_1 143
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_1 79
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_1 31
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
-	sfx_0 0, 5
-	sfx_0 0, 81
+	sfx_pan TRUE, TRUE
+	sfx_env 13, -7
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 18
+	sfx_pitch_offset -1
+	sfx_env 13, -7
+	sfx_freq $31
+	sfx_freq $37
+	sfx_freq $31
+	sfx_freq $37
+	sfx_freq $31
+	sfx_freq $37
+	sfx_env 8, -7
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_env 4, -7
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_env 1, -7
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_env 13, -7
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 10
+	sfx_pitch_offset -1
+	sfx_env 13, -7
+	sfx_freq $31
+	sfx_freq $37
+	sfx_freq $31
+	sfx_freq $37
+	sfx_freq $31
+	sfx_freq $37
+	sfx_env 8, -7
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_env 4, -7
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_env 1, -7
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
+	sfx_freq $5
+	sfx_freq $51
 	sfx_end
diff --git a/src/audio/sfx/sfx_border_spark.asm b/src/audio/sfx/sfx_border_spark.asm
index 1c5bba1..b5ea3ff 100644
--- a/src/audio/sfx/sfx_border_spark.asm
+++ b/src/audio/sfx/sfx_border_spark.asm
@@ -1,34 +1,34 @@
 Sfx_BorderSpark_Ch1:
-	sfx_8 17
-	sfx_1 97
+	sfx_pan TRUE, TRUE
+	sfx_env 6, 1
 	sfx_loop 2
-	sfx_0 0, 15
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 97
-	sfx_0 0, 45
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 97
+	sfx_freq $f
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 6, 1
+	sfx_freq $2d
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 6, 1
 	sfx_endloop
-	sfx_1 129
-	sfx_0 0, 15
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 129
-	sfx_1 65
-	sfx_0 0, 45
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 65
-	sfx_1 33
-	sfx_0 0, 15
+	sfx_env 8, 1
+	sfx_freq $f
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, 1
+	sfx_env 4, 1
+	sfx_freq $2d
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, 1
+	sfx_env 2, 1
+	sfx_freq $f
 	sfx_end
diff --git a/src/audio/sfx/sfx_boulder_smash.asm b/src/audio/sfx/sfx_boulder_smash.asm
index 628f66e..16db678 100644
--- a/src/audio/sfx/sfx_boulder_smash.asm
+++ b/src/audio/sfx/sfx_boulder_smash.asm
@@ -1,123 +1,123 @@
 Sfx_BoulderSmash_Ch1:
-	sfx_1 45
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 89
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_0 7, 57
-	sfx_6 1
-	sfx_0 7, 45
-	sfx_6 1
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_0 7, 20
-	sfx_6 1
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_0 6, 231
-	sfx_6 1
-	sfx_1 240
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 99
-	sfx_0 4, 229
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 0, 156
-	sfx_0 0, 44
-	sfx_1 240
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 99
-	sfx_0 4, 229
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 0, 156
-	sfx_0 0, 44
-	sfx_0 3, 218
-	sfx_0 2, 198
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 0, 156
-	sfx_0 0, 44
-	sfx_1 118
-	sfx_2 8
-	sfx_0 3, 218
-	sfx_0 2, 198
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 0, 156
-	sfx_0 0, 44
-	sfx_1 54
-	sfx_2 8
-	sfx_0 3, 218
-	sfx_0 2, 198
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 0, 156
-	sfx_0 0, 44
+	sfx_env 2, -5
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $759
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_freq $739
+	sfx_wait 1
+	sfx_freq $72d
+	sfx_wait 1
+	sfx_freq $721
+	sfx_wait 1
+	sfx_freq $714
+	sfx_wait 1
+	sfx_freq $705
+	sfx_wait 1
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_freq $6e7
+	sfx_wait 1
+	sfx_env 15, 0
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $563
+	sfx_freq $4e5
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $9c
+	sfx_freq $2c
+	sfx_env 15, 0
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $563
+	sfx_freq $4e5
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $9c
+	sfx_freq $2c
+	sfx_freq $3da
+	sfx_freq $2c6
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $9c
+	sfx_freq $2c
+	sfx_env 7, 6
+	sfx_duty 2
+	sfx_freq $3da
+	sfx_freq $2c6
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $9c
+	sfx_freq $2c
+	sfx_env 3, 6
+	sfx_duty 2
+	sfx_freq $3da
+	sfx_freq $2c6
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $9c
+	sfx_freq $2c
 	sfx_end
 
 Sfx_BoulderSmash_Ch2:
-	sfx_8 17
-	sfx_1 45
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_1 240
-	sfx_0 0, 21
-	sfx_0 0, 113
-	sfx_0 0, 113
-	sfx_0 0, 118
-	sfx_0 0, 102
-	sfx_0 0, 86
-	sfx_1 192
-	sfx_0 0, 86
-	sfx_0 0, 86
-	sfx_0 0, 102
-	sfx_0 0, 102
-	sfx_0 0, 118
-	sfx_0 0, 118
-	sfx_1 118
-	sfx_0 0, 118
-	sfx_0 0, 102
-	sfx_0 0, 102
-	sfx_0 0, 86
-	sfx_0 0, 86
-	sfx_0 0, 86
-	sfx_1 54
-	sfx_0 0, 118
-	sfx_0 0, 102
-	sfx_0 0, 102
-	sfx_0 0, 86
-	sfx_0 0, 86
-	sfx_0 0, 86
+	sfx_pan TRUE, TRUE
+	sfx_env 2, -5
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_env 15, 0
+	sfx_freq $15
+	sfx_freq $71
+	sfx_freq $71
+	sfx_freq $76
+	sfx_freq $66
+	sfx_freq $56
+	sfx_env 12, 0
+	sfx_freq $56
+	sfx_freq $56
+	sfx_freq $66
+	sfx_freq $66
+	sfx_freq $76
+	sfx_freq $76
+	sfx_env 7, 6
+	sfx_freq $76
+	sfx_freq $66
+	sfx_freq $66
+	sfx_freq $56
+	sfx_freq $56
+	sfx_freq $56
+	sfx_env 3, 6
+	sfx_freq $76
+	sfx_freq $66
+	sfx_freq $66
+	sfx_freq $56
+	sfx_freq $56
+	sfx_freq $56
 	sfx_end
diff --git a/src/audio/sfx/sfx_boyfriends.asm b/src/audio/sfx/sfx_boyfriends.asm
index 05f53fa..1c9eab5 100644
--- a/src/audio/sfx/sfx_boyfriends.asm
+++ b/src/audio/sfx/sfx_boyfriends.asm
@@ -1,128 +1,128 @@
 Sfx_Boyfriends_Ch1:
-	sfx_8 17
-	sfx_1 87
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 138
-	sfx_6 1
-	sfx_0 7, 144
-	sfx_6 1
-	sfx_0 7, 151
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_0 7, 167
-	sfx_6 1
-	sfx_1 103
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_0 7, 177
-	sfx_6 1
-	sfx_0 7, 182
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 119
-	sfx_2 4
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 197
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_0 7, 203
-	sfx_6 1
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_0 7, 209
-	sfx_6 1
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_1 135
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 217
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_0 7, 221
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 119
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 221
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_0 7, 217
-	sfx_6 1
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_1 103
-	sfx_2 4
-	sfx_0 7, 209
-	sfx_6 1
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_0 7, 203
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_0 7, 197
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_1 207
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 143
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
+	sfx_pan TRUE, TRUE
+	sfx_env 5, 7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $78a
+	sfx_wait 1
+	sfx_freq $790
+	sfx_wait 1
+	sfx_freq $797
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_freq $7a7
+	sfx_wait 1
+	sfx_env 6, 7
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_freq $7b1
+	sfx_wait 1
+	sfx_freq $7b6
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 7, 7
+	sfx_duty 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7c5
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_freq $7cb
+	sfx_wait 1
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_freq $7d1
+	sfx_wait 1
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_env 8, 7
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7d9
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_freq $7dd
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 7, 7
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7dd
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_freq $7d9
+	sfx_wait 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_env 6, 7
+	sfx_duty 1
+	sfx_freq $7d1
+	sfx_wait 1
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_freq $7cb
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_freq $7c5
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_env 12, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_bubbles.asm b/src/audio/sfx/sfx_bubbles.asm
index 40189db..f2c1fba 100644
--- a/src/audio/sfx/sfx_bubbles.asm
+++ b/src/audio/sfx/sfx_bubbles.asm
@@ -1,370 +1,370 @@
 Sfx_Bubbles_Ch1:
-	sfx_1 228
-	sfx_8 17
-	sfx_2 4
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 182
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 209
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 190
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 214
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 219
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 200
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_1 148
-	sfx_2 4
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 148
-	sfx_0 7, 182
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 148
-	sfx_0 7, 209
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 148
-	sfx_0 7, 190
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 148
-	sfx_0 7, 214
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 148
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 148
-	sfx_0 7, 219
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 148
-	sfx_0 7, 200
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 148
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 148
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 148
-	sfx_1 132
-	sfx_2 4
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 132
-	sfx_0 7, 182
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 132
-	sfx_0 7, 209
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 132
-	sfx_0 7, 190
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 132
-	sfx_0 7, 214
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 132
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 132
-	sfx_0 7, 219
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 132
-	sfx_0 7, 200
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 132
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 132
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 132
-	sfx_1 68
-	sfx_2 4
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 68
-	sfx_0 7, 182
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 68
-	sfx_0 7, 209
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 68
-	sfx_0 7, 190
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 68
-	sfx_0 7, 214
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 68
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 68
-	sfx_0 7, 219
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 68
-	sfx_0 7, 200
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 68
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 68
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 68
-	sfx_1 36
-	sfx_2 4
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 36
-	sfx_0 7, 182
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 36
-	sfx_0 7, 209
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 36
-	sfx_0 7, 190
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 36
-	sfx_0 7, 214
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 36
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 36
-	sfx_0 7, 219
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 36
-	sfx_0 7, 200
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 36
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 36
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 36
-	sfx_1 20
-	sfx_2 4
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 20
-	sfx_0 7, 182
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 20
-	sfx_0 7, 209
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 20
-	sfx_0 7, 190
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 20
-	sfx_0 7, 214
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 20
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 20
-	sfx_0 7, 219
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 20
-	sfx_0 7, 200
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 20
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 20
-	sfx_0 7, 206
+	sfx_env 14, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 1
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $7b6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $7d1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $7be
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $7d6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $7db
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $7c8
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_env 9, 4
+	sfx_duty 1
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, 4
+	sfx_freq $7b6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, 4
+	sfx_freq $7d1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, 4
+	sfx_freq $7be
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, 4
+	sfx_freq $7d6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, 4
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, 4
+	sfx_freq $7db
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, 4
+	sfx_freq $7c8
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, 4
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, 4
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, 4
+	sfx_env 8, 4
+	sfx_duty 1
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, 4
+	sfx_freq $7b6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, 4
+	sfx_freq $7d1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, 4
+	sfx_freq $7be
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, 4
+	sfx_freq $7d6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, 4
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, 4
+	sfx_freq $7db
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, 4
+	sfx_freq $7c8
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, 4
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, 4
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, 4
+	sfx_env 4, 4
+	sfx_duty 1
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, 4
+	sfx_freq $7b6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, 4
+	sfx_freq $7d1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, 4
+	sfx_freq $7be
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, 4
+	sfx_freq $7d6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, 4
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, 4
+	sfx_freq $7db
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, 4
+	sfx_freq $7c8
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, 4
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, 4
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, 4
+	sfx_env 2, 4
+	sfx_duty 1
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 2, 4
+	sfx_freq $7b6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 2, 4
+	sfx_freq $7d1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 2, 4
+	sfx_freq $7be
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 2, 4
+	sfx_freq $7d6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 2, 4
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 2, 4
+	sfx_freq $7db
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 2, 4
+	sfx_freq $7c8
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 2, 4
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 2, 4
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 2, 4
+	sfx_env 1, 4
+	sfx_duty 1
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 1, 4
+	sfx_freq $7b6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 1, 4
+	sfx_freq $7d1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 1, 4
+	sfx_freq $7be
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 1, 4
+	sfx_freq $7d6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 1, 4
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 1, 4
+	sfx_freq $7db
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 1, 4
+	sfx_freq $7c8
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 1, 4
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 1, 4
+	sfx_freq $7ce
 	sfx_end
diff --git a/src/audio/sfx/sfx_cancel.asm b/src/audio/sfx/sfx_cancel.asm
index 1ad6eae..ebacc62 100644
--- a/src/audio/sfx/sfx_cancel.asm
+++ b/src/audio/sfx/sfx_cancel.asm
@@ -1,30 +1,30 @@
 Sfx_Cancel_Ch1:
-	sfx_1 212
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_1 0
-	sfx_5 0
-	sfx_6 3
-	sfx_5 255
-	sfx_1 212
-	sfx_0 7, 107
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 212
-	sfx_0 7, 89
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 212
-	sfx_0 7, 79
-	sfx_1 100
-	sfx_2 0
-	sfx_0 7, 167
-	sfx_1 52
-	sfx_2 0
-	sfx_0 7, 167
+	sfx_env 13, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 3
+	sfx_pitch_offset -1
+	sfx_env 13, 4
+	sfx_freq $76b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 13, 4
+	sfx_freq $759
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 13, 4
+	sfx_freq $74f
+	sfx_env 6, 4
+	sfx_duty 0
+	sfx_freq $7a7
+	sfx_env 3, 4
+	sfx_duty 0
+	sfx_freq $7a7
 	sfx_end
diff --git a/src/audio/sfx/sfx_card_shuffle.asm b/src/audio/sfx/sfx_card_shuffle.asm
index 7b67bc7..777376e 100644
--- a/src/audio/sfx/sfx_card_shuffle.asm
+++ b/src/audio/sfx/sfx_card_shuffle.asm
@@ -1,28 +1,28 @@
 Sfx_CardShuffle_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 240
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 240
-	sfx_1 128
-	sfx_0 0, 38
-	sfx_0 0, 38
-	sfx_0 0, 38
-	sfx_0 0, 38
-	sfx_1 32
-	sfx_0 0, 38
-	sfx_0 0, 38
-	sfx_0 0, 38
-	sfx_0 0, 38
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 255
-	sfx_1 32
+	sfx_env 15, 0
+	sfx_freq $21
+	sfx_freq $21
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, 0
+	sfx_env 8, 0
+	sfx_freq $26
+	sfx_freq $26
+	sfx_freq $26
+	sfx_freq $26
+	sfx_env 2, 0
+	sfx_freq $26
+	sfx_freq $26
+	sfx_freq $26
+	sfx_freq $26
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset -1
+	sfx_env 2, 0
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_cat_punch.asm b/src/audio/sfx/sfx_cat_punch.asm
index fe04726..0616cfc 100644
--- a/src/audio/sfx/sfx_cat_punch.asm
+++ b/src/audio/sfx/sfx_cat_punch.asm
@@ -1,46 +1,46 @@
 Sfx_CatPunch_Ch1:
-	sfx_1 239
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_0 7, 193
-	sfx_0 7, 197
-	sfx_0 7, 200
-	sfx_0 7, 203
-	sfx_0 7, 206
-	sfx_1 223
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 200
-	sfx_0 7, 193
-	sfx_0 7, 190
-	sfx_1 207
-	sfx_2 0
-	sfx_0 7, 182
-	sfx_0 7, 172
-	sfx_1 191
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 7, 157
-	sfx_0 7, 144
-	sfx_0 7, 131
-	sfx_1 175
-	sfx_2 0
-	sfx_0 7, 123
-	sfx_0 7, 107
-	sfx_0 7, 89
-	sfx_0 7, 68
-	sfx_1 143
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_0 7, 33
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_0 6, 246
-	sfx_1 47
-	sfx_2 0
-	sfx_0 6, 214
-	sfx_0 6, 178
+	sfx_env 14, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_freq $7c1
+	sfx_freq $7c5
+	sfx_freq $7c8
+	sfx_freq $7cb
+	sfx_freq $7ce
+	sfx_env 13, -7
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7c8
+	sfx_freq $7c1
+	sfx_freq $7be
+	sfx_env 12, -7
+	sfx_duty 0
+	sfx_freq $7b6
+	sfx_freq $7ac
+	sfx_env 11, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $79d
+	sfx_freq $790
+	sfx_freq $783
+	sfx_env 10, -7
+	sfx_duty 0
+	sfx_freq $77b
+	sfx_freq $76b
+	sfx_freq $759
+	sfx_freq $744
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $739
+	sfx_freq $721
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $705
+	sfx_freq $6f6
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $6d6
+	sfx_freq $6b2
 	sfx_end
diff --git a/src/audio/sfx/sfx_chips_counting.asm b/src/audio/sfx/sfx_chips_counting.asm
index 1ca15ab..ecf6458 100644
--- a/src/audio/sfx/sfx_chips_counting.asm
+++ b/src/audio/sfx/sfx_chips_counting.asm
@@ -1,40 +1,40 @@
 Sfx_ChipsCounting_Ch1:
-	sfx_8 17
-	sfx_1 196
-	sfx_2 4
-	sfx_0 7, 193
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_0 7, 5
-	sfx_1 230
-	sfx_2 8
-	sfx_0 7, 190
-	sfx_1 134
-	sfx_2 8
-	sfx_0 7, 203
-	sfx_1 103
-	sfx_2 8
-	sfx_0 7, 219
-	sfx_5 0
-	sfx_6 1
-	sfx_1 87
-	sfx_2 8
-	sfx_0 7, 219
-	sfx_6 3
-	sfx_1 71
-	sfx_2 8
-	sfx_0 7, 219
-	sfx_6 3
-	sfx_1 55
-	sfx_2 8
-	sfx_0 7, 219
-	sfx_6 3
-	sfx_1 39
-	sfx_2 8
-	sfx_0 7, 219
-	sfx_6 3
-	sfx_1 23
-	sfx_2 8
-	sfx_0 7, 219
-	sfx_6 3
+	sfx_pan TRUE, TRUE
+	sfx_env 12, 4
+	sfx_duty 1
+	sfx_freq $7c1
+	sfx_duty 2
+	sfx_freq $783
+	sfx_freq $705
+	sfx_env 14, 6
+	sfx_duty 2
+	sfx_freq $7be
+	sfx_env 8, 6
+	sfx_duty 2
+	sfx_freq $7cb
+	sfx_env 6, 7
+	sfx_duty 2
+	sfx_freq $7db
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 5, 7
+	sfx_duty 2
+	sfx_freq $7db
+	sfx_wait 3
+	sfx_env 4, 7
+	sfx_duty 2
+	sfx_freq $7db
+	sfx_wait 3
+	sfx_env 3, 7
+	sfx_duty 2
+	sfx_freq $7db
+	sfx_wait 3
+	sfx_env 2, 7
+	sfx_duty 2
+	sfx_freq $7db
+	sfx_wait 3
+	sfx_env 1, 7
+	sfx_duty 2
+	sfx_freq $7db
+	sfx_wait 3
 	sfx_end
diff --git a/src/audio/sfx/sfx_coin_hurl.asm b/src/audio/sfx/sfx_coin_hurl.asm
index a8e722b..4236f0b 100644
--- a/src/audio/sfx/sfx_coin_hurl.asm
+++ b/src/audio/sfx/sfx_coin_hurl.asm
@@ -1,49 +1,49 @@
 Sfx_CoinHurl_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 3
-	sfx_1 241
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_0 7, 5
-	sfx_0 6, 137
-	sfx_1 68
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_5 0
-	sfx_6 4
-	sfx_1 35
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_6 2
+	sfx_env 15, 1
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_freq $705
+	sfx_freq $689
+	sfx_env 4, 4
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_pitch_offset 0
+	sfx_wait 4
+	sfx_env 2, 3
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_wait 2
 	sfx_endloop
-	sfx_1 18
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_6 3
+	sfx_env 1, 2
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_wait 3
 	sfx_end
 
 Sfx_CoinHurl_Ch2:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 242
-	sfx_0 0, 17
-	sfx_0 0, 101
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_1 0
-	sfx_6 3
+	sfx_env 15, 2
+	sfx_freq $11
+	sfx_freq $65
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_env 0, 0
+	sfx_wait 3
 	sfx_endloop
-	sfx_1 242
-	sfx_0 0, 17
-	sfx_0 0, 101
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
+	sfx_env 15, 2
+	sfx_freq $11
+	sfx_freq $65
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
 	sfx_end
diff --git a/src/audio/sfx/sfx_coin_hurl_bench.asm b/src/audio/sfx/sfx_coin_hurl_bench.asm
index 6c976e1..f65a79b 100644
--- a/src/audio/sfx/sfx_coin_hurl_bench.asm
+++ b/src/audio/sfx/sfx_coin_hurl_bench.asm
@@ -1,36 +1,36 @@
 Sfx_CoinHurl_Bench_Ch1:
-	sfx_8 17
-	sfx_1 240
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_0 7, 89
-	sfx_0 7, 5
-	sfx_0 6, 246
-	sfx_0 6, 137
-	sfx_1 100
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_5 0
-	sfx_6 4
-	sfx_1 67
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_6 2
-	sfx_1 34
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_6 3
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 0
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_freq $759
+	sfx_freq $705
+	sfx_freq $6f6
+	sfx_freq $689
+	sfx_env 6, 4
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_pitch_offset 0
+	sfx_wait 4
+	sfx_env 4, 3
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_wait 2
+	sfx_env 2, 2
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_wait 3
 	sfx_end
 
 Sfx_CoinHurl_Bench_Ch2:
-	sfx_8 17
-	sfx_1 245
-	sfx_0 0, 17
-	sfx_0 0, 101
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 5
+	sfx_freq $11
+	sfx_freq $65
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
 	sfx_end
diff --git a/src/audio/sfx/sfx_coin_toss.asm b/src/audio/sfx/sfx_coin_toss.asm
index ce450ee..f373926 100644
--- a/src/audio/sfx/sfx_coin_toss.asm
+++ b/src/audio/sfx/sfx_coin_toss.asm
@@ -1,36 +1,36 @@
 Sfx_CoinToss_Ch1:
-	sfx_8 17
-	sfx_1 239
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_0 7, 209
-	sfx_6 1
-	sfx_1 239
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 9
-	sfx_1 175
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 9
-	sfx_1 143
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 9
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 9
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 9
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 9
+	sfx_pan TRUE, TRUE
+	sfx_env 14, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_freq $7d1
+	sfx_wait 1
+	sfx_env 14, -7
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 9
+	sfx_env 10, -7
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 9
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 9
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 9
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 9
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 9
 	sfx_end
diff --git a/src/audio/sfx/sfx_coin_toss_negative.asm b/src/audio/sfx/sfx_coin_toss_negative.asm
index f3c2316..473d522 100644
--- a/src/audio/sfx/sfx_coin_toss_negative.asm
+++ b/src/audio/sfx/sfx_coin_toss_negative.asm
@@ -1,22 +1,22 @@
 Sfx_CoinTossNegative_Ch1:
-	sfx_1 231
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 89
-	sfx_0 7, 33
-	sfx_0 6, 246
-	sfx_0 6, 158
-	sfx_1 103
-	sfx_2 8
-	sfx_0 6, 158
-	sfx_5 0
-	sfx_6 1
-	sfx_1 55
-	sfx_2 8
-	sfx_0 6, 137
-	sfx_6 1
-	sfx_1 23
-	sfx_2 8
-	sfx_0 6, 137
-	sfx_6 1
+	sfx_env 14, 7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $759
+	sfx_freq $721
+	sfx_freq $6f6
+	sfx_freq $69e
+	sfx_env 6, 7
+	sfx_duty 2
+	sfx_freq $69e
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 3, 7
+	sfx_duty 2
+	sfx_freq $689
+	sfx_wait 1
+	sfx_env 1, 7
+	sfx_duty 2
+	sfx_freq $689
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_coin_toss_positive.asm b/src/audio/sfx/sfx_coin_toss_positive.asm
index 489e579..9f69309 100644
--- a/src/audio/sfx/sfx_coin_toss_positive.asm
+++ b/src/audio/sfx/sfx_coin_toss_positive.asm
@@ -1,26 +1,26 @@
 Sfx_CoinTossPositive_Ch1:
-	sfx_1 231
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 190
-	sfx_0 7, 200
-	sfx_0 7, 212
-	sfx_1 135
-	sfx_2 8
-	sfx_0 7, 212
-	sfx_5 0
-	sfx_6 1
-	sfx_1 71
-	sfx_2 8
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 39
-	sfx_2 8
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 23
-	sfx_2 8
-	sfx_0 7, 214
-	sfx_6 1
+	sfx_env 14, 7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7be
+	sfx_freq $7c8
+	sfx_freq $7d4
+	sfx_env 8, 7
+	sfx_duty 2
+	sfx_freq $7d4
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 4, 7
+	sfx_duty 2
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 2, 7
+	sfx_duty 2
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 1, 7
+	sfx_duty 2
+	sfx_freq $7d6
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_confirm.asm b/src/audio/sfx/sfx_confirm.asm
index 7667608..c275a75 100644
--- a/src/audio/sfx/sfx_confirm.asm
+++ b/src/audio/sfx/sfx_confirm.asm
@@ -1,34 +1,34 @@
 Sfx_Confirm_Ch1:
-	sfx_1 194
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 132
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 36
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_0 7, 214
-	sfx_6 1
+	sfx_env 12, 2
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 8, 4
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 2, 4
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_freq $7d6
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_confuse_ray.asm b/src/audio/sfx/sfx_confuse_ray.asm
index 3642875..4553cb2 100644
--- a/src/audio/sfx/sfx_confuse_ray.asm
+++ b/src/audio/sfx/sfx_confuse_ray.asm
@@ -1,93 +1,93 @@
 Sfx_ConfuseRay_Ch1:
-	sfx_8 17
-	sfx_1 255
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_1 239
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_1 223
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_1 207
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_1 191
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_1 175
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_1 159
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 223
-	sfx_0 7, 219
-	sfx_1 143
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_1 127
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 223
-	sfx_0 7, 219
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_1 95
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 223
-	sfx_0 7, 219
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 223
-	sfx_0 7, 219
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 223
-	sfx_0 7, 219
+	sfx_pan TRUE, TRUE
+	sfx_env 15, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_env 14, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_env 13, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_env 12, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_env 11, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_env 10, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_env 9, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7df
+	sfx_freq $7db
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_env 7, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7df
+	sfx_freq $7db
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_env 5, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7df
+	sfx_freq $7db
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7df
+	sfx_freq $7db
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7df
+	sfx_freq $7db
 	sfx_end
diff --git a/src/audio/sfx/sfx_confusion.asm b/src/audio/sfx/sfx_confusion.asm
index 3b52c45..5b0e9dd 100644
--- a/src/audio/sfx/sfx_confusion.asm
+++ b/src/audio/sfx/sfx_confusion.asm
@@ -1,87 +1,87 @@
 Sfx_Confusion_Ch1:
-	sfx_1 228
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 182
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_0 7, 190
-	sfx_0 7, 162
-	sfx_0 7, 167
-	sfx_0 7, 172
-	sfx_0 7, 172
-	sfx_0 7, 172
-	sfx_0 7, 177
-	sfx_0 7, 182
-	sfx_0 7, 182
-	sfx_1 196
-	sfx_2 0
-	sfx_0 7, 182
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_0 7, 190
-	sfx_0 7, 162
-	sfx_0 7, 167
-	sfx_0 7, 172
-	sfx_0 7, 172
-	sfx_0 7, 172
-	sfx_0 7, 177
-	sfx_0 7, 182
-	sfx_0 7, 182
-	sfx_1 164
-	sfx_2 0
-	sfx_0 7, 182
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_0 7, 190
-	sfx_0 7, 162
-	sfx_0 7, 167
-	sfx_0 7, 172
-	sfx_0 7, 172
-	sfx_0 7, 172
-	sfx_0 7, 177
-	sfx_0 7, 182
-	sfx_0 7, 182
-	sfx_1 132
-	sfx_2 0
-	sfx_0 7, 182
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_0 7, 190
-	sfx_0 7, 162
-	sfx_0 7, 167
-	sfx_0 7, 172
-	sfx_0 7, 172
-	sfx_0 7, 172
-	sfx_0 7, 177
-	sfx_0 7, 182
-	sfx_0 7, 182
-	sfx_1 68
-	sfx_2 0
-	sfx_0 7, 182
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_0 7, 190
-	sfx_0 7, 162
-	sfx_0 7, 167
-	sfx_0 7, 172
-	sfx_0 7, 172
-	sfx_0 7, 172
-	sfx_0 7, 177
-	sfx_0 7, 182
-	sfx_0 7, 182
-	sfx_1 20
-	sfx_2 0
-	sfx_0 7, 182
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_0 7, 190
-	sfx_0 7, 162
-	sfx_0 7, 167
-	sfx_0 7, 172
-	sfx_0 7, 172
-	sfx_0 7, 172
-	sfx_0 7, 177
-	sfx_0 7, 182
-	sfx_0 7, 182
+	sfx_env 14, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $7b6
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_freq $7be
+	sfx_freq $7a2
+	sfx_freq $7a7
+	sfx_freq $7ac
+	sfx_freq $7ac
+	sfx_freq $7ac
+	sfx_freq $7b1
+	sfx_freq $7b6
+	sfx_freq $7b6
+	sfx_env 12, 4
+	sfx_duty 0
+	sfx_freq $7b6
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_freq $7be
+	sfx_freq $7a2
+	sfx_freq $7a7
+	sfx_freq $7ac
+	sfx_freq $7ac
+	sfx_freq $7ac
+	sfx_freq $7b1
+	sfx_freq $7b6
+	sfx_freq $7b6
+	sfx_env 10, 4
+	sfx_duty 0
+	sfx_freq $7b6
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_freq $7be
+	sfx_freq $7a2
+	sfx_freq $7a7
+	sfx_freq $7ac
+	sfx_freq $7ac
+	sfx_freq $7ac
+	sfx_freq $7b1
+	sfx_freq $7b6
+	sfx_freq $7b6
+	sfx_env 8, 4
+	sfx_duty 0
+	sfx_freq $7b6
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_freq $7be
+	sfx_freq $7a2
+	sfx_freq $7a7
+	sfx_freq $7ac
+	sfx_freq $7ac
+	sfx_freq $7ac
+	sfx_freq $7b1
+	sfx_freq $7b6
+	sfx_freq $7b6
+	sfx_env 4, 4
+	sfx_duty 0
+	sfx_freq $7b6
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_freq $7be
+	sfx_freq $7a2
+	sfx_freq $7a7
+	sfx_freq $7ac
+	sfx_freq $7ac
+	sfx_freq $7ac
+	sfx_freq $7b1
+	sfx_freq $7b6
+	sfx_freq $7b6
+	sfx_env 1, 4
+	sfx_duty 0
+	sfx_freq $7b6
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_freq $7be
+	sfx_freq $7a2
+	sfx_freq $7a7
+	sfx_freq $7ac
+	sfx_freq $7ac
+	sfx_freq $7ac
+	sfx_freq $7b1
+	sfx_freq $7b6
+	sfx_freq $7b6
 	sfx_end
diff --git a/src/audio/sfx/sfx_continuous_fireball.asm b/src/audio/sfx/sfx_continuous_fireball.asm
index 9a7a9ff..20b925d 100644
--- a/src/audio/sfx/sfx_continuous_fireball.asm
+++ b/src/audio/sfx/sfx_continuous_fireball.asm
@@ -1,218 +1,218 @@
 Sfx_ContinuousFireball_Ch1:
-	sfx_8 17
-	sfx_2 8
-	sfx_1 32
-	sfx_0 7, 172
-	sfx_0 7, 115
-	sfx_0 7, 167
-	sfx_0 7, 107
-	sfx_0 7, 162
-	sfx_0 7, 98
-	sfx_1 64
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_0 7, 89
-	sfx_0 7, 151
-	sfx_0 7, 79
-	sfx_0 7, 144
-	sfx_0 7, 68
-	sfx_1 48
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_0 7, 89
-	sfx_0 7, 151
-	sfx_0 7, 79
-	sfx_0 7, 144
-	sfx_0 7, 68
-	sfx_1 80
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_0 7, 57
-	sfx_0 7, 123
-	sfx_0 7, 45
-	sfx_0 7, 107
-	sfx_0 7, 33
-	sfx_1 64
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_0 7, 57
-	sfx_0 7, 123
-	sfx_0 7, 45
-	sfx_0 7, 107
-	sfx_0 7, 33
-	sfx_1 96
-	sfx_2 8
-	sfx_0 7, 98
-	sfx_0 7, 20
-	sfx_0 7, 89
-	sfx_1 245
-	sfx_2 8
-	sfx_0 6, 91
-	sfx_0 5, 205
-	sfx_0 2, 34
-	sfx_0 4, 181
-	sfx_0 3, 155
-	sfx_0 5, 17
-	sfx_0 3, 218
-	sfx_0 2, 34
-	sfx_0 5, 17
-	sfx_0 3, 218
-	sfx_0 2, 34
-	sfx_1 245
-	sfx_2 8
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 3, 88
-	sfx_0 2, 34
-	sfx_0 1, 6
-	sfx_0 0, 44
-	sfx_1 101
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 3, 88
-	sfx_0 2, 34
-	sfx_0 1, 6
-	sfx_0 0, 44
-	sfx_0 4, 229
-	sfx_0 3, 88
-	sfx_0 1, 6
-	sfx_1 208
-	sfx_2 8
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_env 2, 0
+	sfx_freq $7ac
+	sfx_freq $773
+	sfx_freq $7a7
+	sfx_freq $76b
+	sfx_freq $7a2
+	sfx_freq $762
+	sfx_env 4, 0
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_freq $759
+	sfx_freq $797
+	sfx_freq $74f
+	sfx_freq $790
+	sfx_freq $744
+	sfx_env 3, 0
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_freq $759
+	sfx_freq $797
+	sfx_freq $74f
+	sfx_freq $790
+	sfx_freq $744
+	sfx_env 5, 0
+	sfx_duty 2
+	sfx_freq $783
+	sfx_freq $739
+	sfx_freq $77b
+	sfx_freq $72d
+	sfx_freq $76b
+	sfx_freq $721
+	sfx_env 4, 0
+	sfx_duty 2
+	sfx_freq $783
+	sfx_freq $739
+	sfx_freq $77b
+	sfx_freq $72d
+	sfx_freq $76b
+	sfx_freq $721
+	sfx_env 6, 0
+	sfx_duty 2
+	sfx_freq $762
+	sfx_freq $714
+	sfx_freq $759
+	sfx_env 15, 5
+	sfx_duty 2
+	sfx_freq $65b
+	sfx_freq $5cd
+	sfx_freq $222
+	sfx_freq $4b5
+	sfx_freq $39b
+	sfx_freq $511
+	sfx_freq $3da
+	sfx_freq $222
+	sfx_freq $511
+	sfx_freq $3da
+	sfx_freq $222
+	sfx_env 15, 5
+	sfx_duty 2
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $358
+	sfx_freq $222
+	sfx_freq $106
+	sfx_freq $2c
+	sfx_env 6, 5
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $358
+	sfx_freq $222
+	sfx_freq $106
+	sfx_freq $2c
+	sfx_freq $4e5
+	sfx_freq $358
+	sfx_freq $106
+	sfx_env 13, 0
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 5, 99
-	sfx_0 4, 131
-	sfx_0 4, 22
+	sfx_freq $563
+	sfx_freq $483
+	sfx_freq $416
 	sfx_endloop
-	sfx_1 64
-	sfx_2 0
-	sfx_0 5, 99
-	sfx_0 6, 11
-	sfx_0 6, 66
-	sfx_0 5, 99
-	sfx_0 6, 11
-	sfx_0 6, 66
-	sfx_1 48
-	sfx_2 0
-	sfx_0 5, 99
-	sfx_0 6, 11
-	sfx_0 6, 66
-	sfx_0 5, 99
-	sfx_0 6, 11
-	sfx_0 6, 66
-	sfx_1 32
-	sfx_2 8
-	sfx_0 5, 99
-	sfx_0 6, 11
-	sfx_0 6, 66
-	sfx_0 5, 99
-	sfx_0 6, 11
-	sfx_0 6, 66
+	sfx_env 4, 0
+	sfx_duty 0
+	sfx_freq $563
+	sfx_freq $60b
+	sfx_freq $642
+	sfx_freq $563
+	sfx_freq $60b
+	sfx_freq $642
+	sfx_env 3, 0
+	sfx_duty 0
+	sfx_freq $563
+	sfx_freq $60b
+	sfx_freq $642
+	sfx_freq $563
+	sfx_freq $60b
+	sfx_freq $642
+	sfx_env 2, 0
+	sfx_duty 2
+	sfx_freq $563
+	sfx_freq $60b
+	sfx_freq $642
+	sfx_freq $563
+	sfx_freq $60b
+	sfx_freq $642
 	sfx_end
 
 Sfx_ContinuousFireball_Ch2:
-	sfx_8 17
-	sfx_1 16
+	sfx_pan TRUE, TRUE
+	sfx_env 1, 0
 	sfx_loop 3
-	sfx_0 0, 17
+	sfx_freq $11
 	sfx_endloop
-	sfx_1 32
+	sfx_env 2, 0
 	sfx_loop 3
-	sfx_0 0, 17
+	sfx_freq $11
 	sfx_endloop
 	sfx_loop 3
-	sfx_0 0, 33
+	sfx_freq $21
 	sfx_endloop
-	sfx_1 48
+	sfx_env 3, 0
 	sfx_loop 3
-	sfx_0 0, 33
+	sfx_freq $21
 	sfx_endloop
 	sfx_loop 3
-	sfx_0 0, 49
+	sfx_freq $31
 	sfx_endloop
-	sfx_1 64
+	sfx_env 4, 0
 	sfx_loop 3
-	sfx_0 0, 49
+	sfx_freq $31
 	sfx_endloop
 	sfx_loop 3
-	sfx_0 0, 65
+	sfx_freq $41
 	sfx_endloop
-	sfx_1 80
+	sfx_env 5, 0
 	sfx_loop 3
-	sfx_0 0, 65
+	sfx_freq $41
 	sfx_endloop
 	sfx_loop 3
-	sfx_0 0, 81
+	sfx_freq $51
 	sfx_endloop
-	sfx_1 96
+	sfx_env 6, 0
 	sfx_loop 3
-	sfx_0 0, 81
+	sfx_freq $51
 	sfx_endloop
 	sfx_loop 3
-	sfx_0 0, 97
+	sfx_freq $61
 	sfx_endloop
-	sfx_1 199
-	sfx_0 0, 22
-	sfx_0 0, 83
-	sfx_0 0, 115
-	sfx_0 0, 86
-	sfx_0 0, 83
-	sfx_0 0, 115
-	sfx_0 0, 86
-	sfx_0 0, 83
-	sfx_0 0, 115
-	sfx_1 132
+	sfx_env 12, 7
+	sfx_freq $16
+	sfx_freq $53
+	sfx_freq $73
+	sfx_freq $56
+	sfx_freq $53
+	sfx_freq $73
+	sfx_freq $56
+	sfx_freq $53
+	sfx_freq $73
+	sfx_env 8, 4
 	sfx_loop 2
-	sfx_0 0, 22
-	sfx_0 0, 83
-	sfx_0 0, 115
+	sfx_freq $16
+	sfx_freq $53
+	sfx_freq $73
 	sfx_endloop
 	sfx_loop 2
-	sfx_1 148
-	sfx_0 0, 38
-	sfx_0 0, 65
-	sfx_0 0, 98
+	sfx_env 9, 4
+	sfx_freq $26
+	sfx_freq $41
+	sfx_freq $62
 	sfx_endloop
-	sfx_1 98
-	sfx_0 0, 38
-	sfx_0 0, 65
-	sfx_0 0, 98
-	sfx_1 245
-	sfx_0 0, 70
-	sfx_0 0, 70
+	sfx_env 6, 2
+	sfx_freq $26
+	sfx_freq $41
+	sfx_freq $62
+	sfx_env 15, 5
+	sfx_freq $46
+	sfx_freq $46
 	sfx_loop 2
-	sfx_1 163
-	sfx_0 0, 38
-	sfx_0 0, 101
-	sfx_0 0, 68
+	sfx_env 10, 3
+	sfx_freq $26
+	sfx_freq $65
+	sfx_freq $44
 	sfx_endloop
-	sfx_1 101
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_1 69
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 69
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 39
-	sfx_0 0, 69
-	sfx_0 0, 69
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 69
-	sfx_0 0, 68
-	sfx_0 0, 68
+	sfx_env 6, 5
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $45
+	sfx_env 4, 5
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $45
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 2, 7
+	sfx_freq $45
+	sfx_freq $45
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $45
+	sfx_freq $44
+	sfx_freq $44
 	sfx_end
diff --git a/src/audio/sfx/sfx_cry.asm b/src/audio/sfx/sfx_cry.asm
index 5814fac..2859545 100644
--- a/src/audio/sfx/sfx_cry.asm
+++ b/src/audio/sfx/sfx_cry.asm
@@ -1,56 +1,56 @@
 Sfx_Cry_Ch1:
 	sfx_loop 17
-	sfx_1 135
-	sfx_8 17
-	sfx_2 0
-	sfx_0 6, 11
-	sfx_5 0
-	sfx_6 1
-	sfx_0 6, 178
-	sfx_6 1
+	sfx_env 8, 7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $60b
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $6b2
+	sfx_wait 1
 	sfx_endloop
 	sfx_loop 4
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_1 111
-	sfx_2 0
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_1 143
-	sfx_2 0
-	sfx_0 6, 214
-	sfx_6 1
-	sfx_1 207
-	sfx_2 0
-	sfx_0 6, 196
-	sfx_6 1
-	sfx_1 175
-	sfx_2 0
-	sfx_0 6, 178
-	sfx_6 1
-	sfx_1 207
-	sfx_2 0
-	sfx_0 6, 158
-	sfx_6 1
-	sfx_0 6, 137
-	sfx_6 1
-	sfx_1 143
-	sfx_2 0
-	sfx_0 6, 114
-	sfx_6 1
-	sfx_1 79
-	sfx_2 0
-	sfx_0 6, 91
-	sfx_6 1
-	sfx_0 6, 66
-	sfx_6 1
-	sfx_1 31
-	sfx_2 0
-	sfx_0 6, 40
-	sfx_6 1
-	sfx_0 6, 11
-	sfx_6 1
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $705
+	sfx_wait 1
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $6d6
+	sfx_wait 1
+	sfx_env 12, -7
+	sfx_duty 0
+	sfx_freq $6c4
+	sfx_wait 1
+	sfx_env 10, -7
+	sfx_duty 0
+	sfx_freq $6b2
+	sfx_wait 1
+	sfx_env 12, -7
+	sfx_duty 0
+	sfx_freq $69e
+	sfx_wait 1
+	sfx_freq $689
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $672
+	sfx_wait 1
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $65b
+	sfx_wait 1
+	sfx_freq $642
+	sfx_wait 1
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $628
+	sfx_wait 1
+	sfx_freq $60b
+	sfx_wait 1
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_cursor.asm b/src/audio/sfx/sfx_cursor.asm
index ffb44c2..40b60a2 100644
--- a/src/audio/sfx/sfx_cursor.asm
+++ b/src/audio/sfx/sfx_cursor.asm
@@ -1,13 +1,13 @@
 Sfx_Cursor_Ch1:
-	sfx_1 196
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 193
-	sfx_1 100
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_1 52
-	sfx_2 0
-	sfx_0 7, 193
+	sfx_env 12, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $7c1
+	sfx_env 6, 4
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_env 3, 4
+	sfx_duty 0
+	sfx_freq $7c1
 	sfx_end
diff --git a/src/audio/sfx/sfx_dark_gas.asm b/src/audio/sfx/sfx_dark_gas.asm
index c77824f..20ddee3 100644
--- a/src/audio/sfx/sfx_dark_gas.asm
+++ b/src/audio/sfx/sfx_dark_gas.asm
@@ -1,50 +1,50 @@
 Sfx_DarkGas_Ch1:
-	sfx_8 17
-	sfx_1 47
-	sfx_0 0, 8
-	sfx_0 0, 8
-	sfx_0 0, 8
-	sfx_1 79
-	sfx_0 0, 7
-	sfx_0 0, 7
-	sfx_0 0, 7
-	sfx_1 111
-	sfx_0 0, 6
-	sfx_0 0, 6
-	sfx_0 0, 6
-	sfx_1 143
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
+	sfx_pan TRUE, TRUE
+	sfx_env 2, -7
+	sfx_freq $8
+	sfx_freq $8
+	sfx_freq $8
+	sfx_env 4, -7
+	sfx_freq $7
+	sfx_freq $7
+	sfx_freq $7
+	sfx_env 6, -7
+	sfx_freq $6
+	sfx_freq $6
+	sfx_freq $6
+	sfx_env 8, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
 	sfx_loop 12
-	sfx_1 207
-	sfx_0 0, 4
-	sfx_0 0, 4
-	sfx_0 0, 4
-	sfx_0 0, 4
-	sfx_0 0, 4
-	sfx_0 0, 4
+	sfx_env 12, -7
+	sfx_freq $4
+	sfx_freq $4
+	sfx_freq $4
+	sfx_freq $4
+	sfx_freq $4
+	sfx_freq $4
 	sfx_endloop
-	sfx_1 143
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_1 111
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_1 79
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_1 47
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
+	sfx_env 8, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_env 6, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_env 4, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_env 2, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
 	sfx_end
diff --git a/src/audio/sfx/sfx_dark_song.asm b/src/audio/sfx/sfx_dark_song.asm
index 372f906..2665715 100644
--- a/src/audio/sfx/sfx_dark_song.asm
+++ b/src/audio/sfx/sfx_dark_song.asm
@@ -1,115 +1,115 @@
 Sfx_DarkSong_Ch1:
-	sfx_1 207
-	sfx_8 17
-	sfx_1 42
-	sfx_2 0
-	sfx_0 7, 89
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_1 164
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_0 7, 20
-	sfx_6 1
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_0 7, 20
-	sfx_6 1
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_0 7, 20
-	sfx_6 1
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_0 7, 20
-	sfx_6 1
-	sfx_1 42
-	sfx_2 0
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_1 199
-	sfx_2 0
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_1 132
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_0 7, 45
-	sfx_6 1
-	sfx_0 7, 57
-	sfx_6 1
-	sfx_1 68
-	sfx_2 0
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_0 7, 45
-	sfx_6 1
-	sfx_0 7, 20
-	sfx_6 1
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_1 36
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_0 7, 20
-	sfx_6 1
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_0 7, 5
-	sfx_6 1
+	sfx_env 12, -7
+	sfx_pan TRUE, TRUE
+	sfx_env 2, -2
+	sfx_duty 0
+	sfx_freq $759
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_env 10, 4
+	sfx_duty 0
+	sfx_freq $705
+	sfx_wait 1
+	sfx_freq $714
+	sfx_wait 1
+	sfx_freq $705
+	sfx_wait 1
+	sfx_freq $714
+	sfx_wait 1
+	sfx_freq $705
+	sfx_wait 1
+	sfx_freq $714
+	sfx_wait 1
+	sfx_freq $705
+	sfx_wait 1
+	sfx_freq $714
+	sfx_wait 1
+	sfx_env 2, -2
+	sfx_duty 0
+	sfx_freq $773
+	sfx_wait 1
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_env 12, 7
+	sfx_duty 0
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_env 8, 4
+	sfx_duty 0
+	sfx_freq $739
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_freq $72d
+	sfx_wait 1
+	sfx_freq $739
+	sfx_wait 1
+	sfx_env 4, 4
+	sfx_duty 0
+	sfx_freq $721
+	sfx_wait 1
+	sfx_freq $72d
+	sfx_wait 1
+	sfx_freq $714
+	sfx_wait 1
+	sfx_freq $721
+	sfx_wait 1
+	sfx_env 2, 4
+	sfx_duty 0
+	sfx_freq $705
+	sfx_wait 1
+	sfx_freq $714
+	sfx_wait 1
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_freq $705
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_denied.asm b/src/audio/sfx/sfx_denied.asm
index 2b0a7f7..008a48a 100644
--- a/src/audio/sfx/sfx_denied.asm
+++ b/src/audio/sfx/sfx_denied.asm
@@ -1,23 +1,23 @@
 Sfx_Denied_Ch1:
-	sfx_1 240
-	sfx_8 17
-	sfx_2 0
-	sfx_0 4, 229
-	sfx_0 4, 229
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 255
-	sfx_1 240
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
+	sfx_env 15, 0
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $4e5
+	sfx_freq $4e5
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset -1
+	sfx_env 15, 0
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
 	sfx_end
diff --git a/src/audio/sfx/sfx_dive_bomb.asm b/src/audio/sfx/sfx_dive_bomb.asm
index 0dd8a6b..34ac94f 100644
--- a/src/audio/sfx/sfx_dive_bomb.asm
+++ b/src/audio/sfx/sfx_dive_bomb.asm
@@ -1,91 +1,91 @@
 Sfx_DiveBomb_Ch1:
-	sfx_8 17
-	sfx_1 111
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 84
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 83
+	sfx_pan TRUE, TRUE
+	sfx_env 6, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $54
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $53
 	sfx_loop 5
-	sfx_1 246
-	sfx_0 0, 20
-	sfx_0 0, 20
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
+	sfx_env 15, 6
+	sfx_freq $14
+	sfx_freq $14
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
 	sfx_endloop
-	sfx_1 134
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_1 70
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 65
+	sfx_env 8, 6
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_env 4, 6
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $41
 	sfx_loop 16
-	sfx_1 255
-	sfx_0 0, 82
-	sfx_0 0, 84
-	sfx_0 0, 83
+	sfx_env 15, -7
+	sfx_freq $52
+	sfx_freq $54
+	sfx_freq $53
 	sfx_endloop
-	sfx_1 143
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_1 79
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_1 47
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_1 31
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
+	sfx_env 8, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_env 4, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_env 2, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_env 1, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
 	sfx_end
diff --git a/src/audio/sfx/sfx_doors.asm b/src/audio/sfx/sfx_doors.asm
index cd5ddc5..e241da4 100644
--- a/src/audio/sfx/sfx_doors.asm
+++ b/src/audio/sfx/sfx_doors.asm
@@ -1,37 +1,37 @@
 Sfx_Doors_Ch1:
-	sfx_8 17
-	sfx_1 225
-	sfx_0 0, 82
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_1 225
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_1 145
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_1 97
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_1 49
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_1 17
-	sfx_0 0, 98
-	sfx_0 0, 98
-	sfx_0 0, 98
+	sfx_pan TRUE, TRUE
+	sfx_env 14, 1
+	sfx_freq $52
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_env 14, 1
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
+	sfx_env 9, 1
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
+	sfx_env 6, 1
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
+	sfx_env 3, 1
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
+	sfx_env 1, 1
+	sfx_freq $62
+	sfx_freq $62
+	sfx_freq $62
 	sfx_end
diff --git a/src/audio/sfx/sfx_drain.asm b/src/audio/sfx/sfx_drain.asm
index 8fcc1de..611009e 100644
--- a/src/audio/sfx/sfx_drain.asm
+++ b/src/audio/sfx/sfx_drain.asm
@@ -1,86 +1,86 @@
 Sfx_Drain_Ch1:
-	sfx_1 228
-	sfx_8 17
-	sfx_2 4
-	sfx_0 7, 157
-	sfx_0 7, 190
-	sfx_0 7, 144
-	sfx_0 7, 182
-	sfx_0 7, 131
-	sfx_0 7, 172
-	sfx_0 7, 123
-	sfx_0 7, 162
-	sfx_0 7, 107
-	sfx_0 7, 157
-	sfx_1 228
-	sfx_2 4
-	sfx_0 7, 57
-	sfx_0 7, 123
-	sfx_0 7, 33
-	sfx_0 7, 107
-	sfx_0 7, 5
-	sfx_0 7, 89
-	sfx_0 6, 246
-	sfx_0 7, 68
-	sfx_0 6, 214
-	sfx_0 7, 57
-	sfx_1 228
-	sfx_2 4
-	sfx_0 6, 246
-	sfx_0 6, 66
-	sfx_0 6, 214
-	sfx_0 6, 11
-	sfx_0 6, 178
-	sfx_0 5, 237
-	sfx_0 6, 137
-	sfx_0 5, 172
-	sfx_0 6, 114
-	sfx_1 228
-	sfx_2 4
-	sfx_0 7, 190
-	sfx_0 7, 144
-	sfx_0 7, 182
-	sfx_0 7, 131
-	sfx_0 7, 172
-	sfx_0 7, 123
-	sfx_0 7, 162
-	sfx_0 7, 107
-	sfx_0 7, 157
-	sfx_1 228
-	sfx_2 4
-	sfx_0 7, 33
-	sfx_0 7, 107
-	sfx_0 7, 5
-	sfx_0 7, 89
-	sfx_0 6, 246
-	sfx_0 7, 68
-	sfx_0 6, 214
-	sfx_0 7, 57
-	sfx_1 228
-	sfx_2 4
-	sfx_0 6, 214
-	sfx_0 6, 11
-	sfx_0 6, 178
-	sfx_0 5, 237
-	sfx_0 6, 137
-	sfx_0 5, 172
-	sfx_0 6, 114
-	sfx_1 132
-	sfx_2 0
-	sfx_0 6, 114
-	sfx_0 6, 246
-	sfx_1 68
-	sfx_2 0
-	sfx_0 6, 66
-	sfx_0 6, 214
-	sfx_1 36
-	sfx_2 0
-	sfx_0 6, 11
-	sfx_0 6, 178
-	sfx_1 20
-	sfx_2 0
-	sfx_0 5, 237
-	sfx_0 6, 137
-	sfx_0 5, 172
-	sfx_0 6, 114
+	sfx_env 14, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 1
+	sfx_freq $79d
+	sfx_freq $7be
+	sfx_freq $790
+	sfx_freq $7b6
+	sfx_freq $783
+	sfx_freq $7ac
+	sfx_freq $77b
+	sfx_freq $7a2
+	sfx_freq $76b
+	sfx_freq $79d
+	sfx_env 14, 4
+	sfx_duty 1
+	sfx_freq $739
+	sfx_freq $77b
+	sfx_freq $721
+	sfx_freq $76b
+	sfx_freq $705
+	sfx_freq $759
+	sfx_freq $6f6
+	sfx_freq $744
+	sfx_freq $6d6
+	sfx_freq $739
+	sfx_env 14, 4
+	sfx_duty 1
+	sfx_freq $6f6
+	sfx_freq $642
+	sfx_freq $6d6
+	sfx_freq $60b
+	sfx_freq $6b2
+	sfx_freq $5ed
+	sfx_freq $689
+	sfx_freq $5ac
+	sfx_freq $672
+	sfx_env 14, 4
+	sfx_duty 1
+	sfx_freq $7be
+	sfx_freq $790
+	sfx_freq $7b6
+	sfx_freq $783
+	sfx_freq $7ac
+	sfx_freq $77b
+	sfx_freq $7a2
+	sfx_freq $76b
+	sfx_freq $79d
+	sfx_env 14, 4
+	sfx_duty 1
+	sfx_freq $721
+	sfx_freq $76b
+	sfx_freq $705
+	sfx_freq $759
+	sfx_freq $6f6
+	sfx_freq $744
+	sfx_freq $6d6
+	sfx_freq $739
+	sfx_env 14, 4
+	sfx_duty 1
+	sfx_freq $6d6
+	sfx_freq $60b
+	sfx_freq $6b2
+	sfx_freq $5ed
+	sfx_freq $689
+	sfx_freq $5ac
+	sfx_freq $672
+	sfx_env 8, 4
+	sfx_duty 0
+	sfx_freq $672
+	sfx_freq $6f6
+	sfx_env 4, 4
+	sfx_duty 0
+	sfx_freq $642
+	sfx_freq $6d6
+	sfx_env 2, 4
+	sfx_duty 0
+	sfx_freq $60b
+	sfx_freq $6b2
+	sfx_env 1, 4
+	sfx_duty 0
+	sfx_freq $5ed
+	sfx_freq $689
+	sfx_freq $5ac
+	sfx_freq $672
 	sfx_end
diff --git a/src/audio/sfx/sfx_drill.asm b/src/audio/sfx/sfx_drill.asm
index 18d5a19..a10e835 100644
--- a/src/audio/sfx/sfx_drill.asm
+++ b/src/audio/sfx/sfx_drill.asm
@@ -1,16 +1,16 @@
 Sfx_Drill_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 8
-	sfx_1 129
-	sfx_0 0, 82
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
+	sfx_env 8, 1
+	sfx_freq $52
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
 	sfx_endloop
 	sfx_loop 10
-	sfx_1 241
-	sfx_0 0, 81
-	sfx_0 0, 209
-	sfx_0 0, 17
+	sfx_env 15, 1
+	sfx_freq $51
+	sfx_freq $d1
+	sfx_freq $11
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_drill_dive.asm b/src/audio/sfx/sfx_drill_dive.asm
index 17c9feb..4724479 100644
--- a/src/audio/sfx/sfx_drill_dive.asm
+++ b/src/audio/sfx/sfx_drill_dive.asm
@@ -1,87 +1,87 @@
 Sfx_DrillDive_Ch1:
-	sfx_8 17
-	sfx_1 80
-	sfx_2 4
-	sfx_0 7, 157
-	sfx_0 7, 172
-	sfx_0 7, 162
-	sfx_0 7, 177
-	sfx_0 7, 172
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_0 7, 193
-	sfx_0 7, 190
-	sfx_0 7, 200
-	sfx_0 7, 193
-	sfx_0 7, 206
-	sfx_0 7, 200
-	sfx_0 7, 209
-	sfx_0 7, 206
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 214
-	sfx_0 7, 223
-	sfx_1 241
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 5
-	sfx_0 5, 99
-	sfx_1 241
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 5
-	sfx_0 5, 99
-	sfx_1 81
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 5
-	sfx_0 5, 99
-	sfx_1 33
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 5
-	sfx_0 5, 99
+	sfx_pan TRUE, TRUE
+	sfx_env 5, 0
+	sfx_duty 1
+	sfx_freq $79d
+	sfx_freq $7ac
+	sfx_freq $7a2
+	sfx_freq $7b1
+	sfx_freq $7ac
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_freq $7c1
+	sfx_freq $7be
+	sfx_freq $7c8
+	sfx_freq $7c1
+	sfx_freq $7ce
+	sfx_freq $7c8
+	sfx_freq $7d1
+	sfx_freq $7ce
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7d6
+	sfx_freq $7df
+	sfx_env 15, 1
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $705
+	sfx_freq $563
+	sfx_env 15, 1
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $705
+	sfx_freq $563
+	sfx_env 5, 1
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $705
+	sfx_freq $563
+	sfx_env 2, 1
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $705
+	sfx_freq $563
 	sfx_end
 
 Sfx_DrillDive_Ch2:
-	sfx_8 17
-	sfx_1 43
-	sfx_0 0, 22
-	sfx_0 0, 18
-	sfx_0 0, 22
-	sfx_0 0, 18
-	sfx_0 0, 22
-	sfx_0 0, 18
-	sfx_0 0, 21
-	sfx_1 109
-	sfx_0 0, 18
-	sfx_0 0, 21
-	sfx_0 0, 18
-	sfx_0 0, 21
-	sfx_0 0, 18
-	sfx_0 0, 20
-	sfx_1 157
-	sfx_0 0, 19
-	sfx_0 0, 17
-	sfx_0 0, 19
-	sfx_0 0, 17
-	sfx_0 0, 18
-	sfx_0 0, 16
-	sfx_1 245
-	sfx_0 0, 118
-	sfx_0 0, 65
-	sfx_0 0, 12
-	sfx_1 245
-	sfx_0 0, 118
-	sfx_0 0, 65
-	sfx_0 0, 12
-	sfx_1 69
-	sfx_0 0, 118
-	sfx_0 0, 65
-	sfx_0 0, 12
-	sfx_1 37
-	sfx_0 0, 118
-	sfx_0 0, 65
-	sfx_0 0, 12
+	sfx_pan TRUE, TRUE
+	sfx_env 2, -3
+	sfx_freq $16
+	sfx_freq $12
+	sfx_freq $16
+	sfx_freq $12
+	sfx_freq $16
+	sfx_freq $12
+	sfx_freq $15
+	sfx_env 6, -5
+	sfx_freq $12
+	sfx_freq $15
+	sfx_freq $12
+	sfx_freq $15
+	sfx_freq $12
+	sfx_freq $14
+	sfx_env 9, -5
+	sfx_freq $13
+	sfx_freq $11
+	sfx_freq $13
+	sfx_freq $11
+	sfx_freq $12
+	sfx_freq $10
+	sfx_env 15, 5
+	sfx_freq $76
+	sfx_freq $41
+	sfx_freq $c
+	sfx_env 15, 5
+	sfx_freq $76
+	sfx_freq $41
+	sfx_freq $c
+	sfx_env 4, 5
+	sfx_freq $76
+	sfx_freq $41
+	sfx_freq $c
+	sfx_env 2, 5
+	sfx_freq $76
+	sfx_freq $41
+	sfx_freq $c
 	sfx_end
diff --git a/src/audio/sfx/sfx_dry_up.asm b/src/audio/sfx/sfx_dry_up.asm
index 70a9188..2d0f188 100644
--- a/src/audio/sfx/sfx_dry_up.asm
+++ b/src/audio/sfx/sfx_dry_up.asm
@@ -1,56 +1,56 @@
 Sfx_DryUp_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 44
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_1 93
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_0 0, 83
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_1 125
-	sfx_0 0, 83
-	sfx_0 0, 83
-	sfx_0 0, 67
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_1 172
-	sfx_0 0, 66
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_1 247
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_1 116
-	sfx_0 0, 16
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
+	sfx_env 2, -4
+	sfx_freq $63
+	sfx_freq $63
+	sfx_freq $63
+	sfx_freq $63
+	sfx_freq $63
+	sfx_freq $63
+	sfx_freq $63
+	sfx_env 5, -5
+	sfx_freq $63
+	sfx_freq $63
+	sfx_freq $63
+	sfx_freq $53
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_env 7, -5
+	sfx_freq $53
+	sfx_freq $53
+	sfx_freq $43
+	sfx_freq $43
+	sfx_freq $42
+	sfx_env 10, -4
+	sfx_freq $42
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $31
+	sfx_freq $31
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_env 15, 7
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_env 7, 4
+	sfx_freq $10
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_electronic_input.asm b/src/audio/sfx/sfx_electronic_input.asm
index 251617f..8a9d680 100644
--- a/src/audio/sfx/sfx_electronic_input.asm
+++ b/src/audio/sfx/sfx_electronic_input.asm
@@ -1,12 +1,12 @@
 Sfx_ElectronicInput_Ch1:
-	sfx_1 98
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_0 6, 178
-	sfx_1 160
-	sfx_2 8
-	sfx_0 7, 167
-	sfx_5 0
-	sfx_6 1
+	sfx_env 6, 2
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_freq $6b2
+	sfx_env 10, 0
+	sfx_duty 2
+	sfx_freq $7a7
+	sfx_pitch_offset 0
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_electronic_response.asm b/src/audio/sfx/sfx_electronic_response.asm
index ffa5256..13dbe76 100644
--- a/src/audio/sfx/sfx_electronic_response.asm
+++ b/src/audio/sfx/sfx_electronic_response.asm
@@ -1,28 +1,28 @@
 Sfx_ElectronicResponse_Ch1:
-	sfx_1 162
-	sfx_8 17
-	sfx_2 4
-	sfx_0 7, 131
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_1 247
-	sfx_2 8
-	sfx_0 7, 193
-	sfx_6 3
-	sfx_1 151
-	sfx_0 7, 193
-	sfx_6 3
-	sfx_1 103
-	sfx_0 7, 193
-	sfx_6 3
-	sfx_1 71
-	sfx_0 7, 193
-	sfx_6 3
-	sfx_1 39
-	sfx_0 7, 193
-	sfx_6 3
+	sfx_env 10, 2
+	sfx_pan TRUE, TRUE
+	sfx_duty 1
+	sfx_freq $783
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_env 15, 7
+	sfx_duty 2
+	sfx_freq $7c1
+	sfx_wait 3
+	sfx_env 9, 7
+	sfx_freq $7c1
+	sfx_wait 3
+	sfx_env 6, 7
+	sfx_freq $7c1
+	sfx_wait 3
+	sfx_env 4, 7
+	sfx_freq $7c1
+	sfx_wait 3
+	sfx_env 2, 7
+	sfx_freq $7c1
+	sfx_wait 3
 	sfx_end
diff --git a/src/audio/sfx/sfx_expand.asm b/src/audio/sfx/sfx_expand.asm
index b9e576e..5bface0 100644
--- a/src/audio/sfx/sfx_expand.asm
+++ b/src/audio/sfx/sfx_expand.asm
@@ -1,193 +1,193 @@
 Sfx_Expand_Ch1:
-	sfx_1 239
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 190
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 182
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 172
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 162
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 157
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 144
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 107
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 89
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 68
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 6, 11
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 6, 246
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 6, 214
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 6, 178
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 6, 137
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 6, 114
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_0 6, 66
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 239
-	sfx_1 239
-	sfx_2 8
-	sfx_0 6, 11
-	sfx_0 6, 40
-	sfx_0 6, 66
-	sfx_0 7, 5
-	sfx_0 7, 20
-	sfx_0 7, 33
-	sfx_0 7, 45
-	sfx_1 143
-	sfx_2 8
-	sfx_0 7, 57
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_1 143
-	sfx_2 8
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_1 127
-	sfx_2 8
-	sfx_0 7, 98
-	sfx_6 1
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_1 111
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_1 95
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_1 79
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 138
-	sfx_6 1
-	sfx_1 63
-	sfx_2 8
-	sfx_0 7, 144
-	sfx_6 1
-	sfx_0 7, 151
-	sfx_6 1
-	sfx_1 47
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 167
-	sfx_6 1
+	sfx_env 14, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $783
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $7be
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $7b6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $7ac
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $7a2
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $79d
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $790
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $76b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $759
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $744
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $60b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $6f6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $6d6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $6b2
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $689
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $672
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_freq $642
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, -7
+	sfx_env 14, -7
+	sfx_duty 2
+	sfx_freq $60b
+	sfx_freq $628
+	sfx_freq $642
+	sfx_freq $705
+	sfx_freq $714
+	sfx_freq $721
+	sfx_freq $72d
+	sfx_env 8, -7
+	sfx_duty 2
+	sfx_freq $739
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_duty 2
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_env 7, -7
+	sfx_duty 2
+	sfx_freq $762
+	sfx_wait 1
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_env 6, -7
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_env 5, -7
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_freq $783
+	sfx_wait 1
+	sfx_env 4, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $78a
+	sfx_wait 1
+	sfx_env 3, -7
+	sfx_duty 2
+	sfx_freq $790
+	sfx_wait 1
+	sfx_freq $797
+	sfx_wait 1
+	sfx_env 2, -7
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $7a7
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_fire_punch.asm b/src/audio/sfx/sfx_fire_punch.asm
index 1f4d638..201fa59 100644
--- a/src/audio/sfx/sfx_fire_punch.asm
+++ b/src/audio/sfx/sfx_fire_punch.asm
@@ -1,131 +1,131 @@
 Sfx_FirePunch_Ch1:
-	sfx_1 255
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_1 255
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_1 143
-	sfx_2 8
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 143
-	sfx_1 79
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 79
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_1 0
-	sfx_5 0
-	sfx_6 45
-	sfx_5 255
-	sfx_1 31
-	sfx_1 255
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_1 255
-	sfx_2 0
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_1 143
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 143
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 79
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 107
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_env 15, -7
+	sfx_duty 2
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_env 8, -7
+	sfx_duty 2
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, -7
+	sfx_env 4, -7
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, -7
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 45
+	sfx_pitch_offset -1
+	sfx_env 1, -7
+	sfx_env 15, -7
+	sfx_duty 0
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_env 15, -7
+	sfx_duty 0
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, -7
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, -7
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $76b
 	sfx_end
 
 Sfx_FirePunch_Ch2:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 0
-	sfx_5 0
-	sfx_6 20
-	sfx_5 255
-	sfx_1 1
-	sfx_1 223
-	sfx_0 0, 80
-	sfx_0 0, 87
-	sfx_0 0, 80
-	sfx_0 0, 87
-	sfx_0 0, 80
-	sfx_1 207
-	sfx_0 0, 87
-	sfx_0 0, 80
-	sfx_0 0, 87
-	sfx_0 0, 80
-	sfx_0 0, 87
-	sfx_1 191
-	sfx_0 0, 80
-	sfx_0 0, 87
-	sfx_0 0, 80
-	sfx_0 0, 87
-	sfx_0 0, 80
-	sfx_1 175
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_1 143
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_1 79
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_1 31
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 20
+	sfx_pitch_offset -1
+	sfx_env 0, 1
+	sfx_env 13, -7
+	sfx_freq $50
+	sfx_freq $57
+	sfx_freq $50
+	sfx_freq $57
+	sfx_freq $50
+	sfx_env 12, -7
+	sfx_freq $57
+	sfx_freq $50
+	sfx_freq $57
+	sfx_freq $50
+	sfx_freq $57
+	sfx_env 11, -7
+	sfx_freq $50
+	sfx_freq $57
+	sfx_freq $50
+	sfx_freq $57
+	sfx_freq $50
+	sfx_env 10, -7
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_env 8, -7
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_env 4, -7
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_env 1, -7
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_fire_spin.asm b/src/audio/sfx/sfx_fire_spin.asm
index 7cf6e9a..1a9eb6b 100644
--- a/src/audio/sfx/sfx_fire_spin.asm
+++ b/src/audio/sfx/sfx_fire_spin.asm
@@ -1,132 +1,132 @@
 Sfx_FireSpin_Ch1:
-	sfx_8 17
-	sfx_1 111
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 84
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_1 246
-	sfx_0 0, 20
-	sfx_0 0, 20
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_1 198
-	sfx_0 0, 20
-	sfx_0 0, 20
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_1 134
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 52
-	sfx_1 102
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 68
-	sfx_0 0, 67
-	sfx_0 0, 68
-	sfx_0 0, 67
-	sfx_0 0, 68
-	sfx_0 0, 67
-	sfx_0 0, 68
-	sfx_1 70
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 68
-	sfx_0 0, 67
-	sfx_0 0, 68
-	sfx_0 0, 67
-	sfx_0 0, 68
-	sfx_1 54
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_1 38
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_1 22
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
+	sfx_pan TRUE, TRUE
+	sfx_env 6, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $54
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $53
+	sfx_env 15, 6
+	sfx_freq $14
+	sfx_freq $14
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_env 12, 6
+	sfx_freq $14
+	sfx_freq $14
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_env 8, 6
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $34
+	sfx_env 6, 6
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $44
+	sfx_freq $43
+	sfx_freq $44
+	sfx_freq $43
+	sfx_freq $44
+	sfx_freq $43
+	sfx_freq $44
+	sfx_env 4, 6
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $44
+	sfx_freq $43
+	sfx_freq $44
+	sfx_freq $43
+	sfx_freq $44
+	sfx_env 3, 6
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_env 2, 6
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $41
+	sfx_env 1, 6
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
 	sfx_end
diff --git a/src/audio/sfx/sfx_fireball.asm b/src/audio/sfx/sfx_fireball.asm
index f264f0d..394489f 100644
--- a/src/audio/sfx/sfx_fireball.asm
+++ b/src/audio/sfx/sfx_fireball.asm
@@ -1,135 +1,135 @@
 Sfx_Fireball_Ch1:
-	sfx_8 17
-	sfx_2 8
-	sfx_1 32
-	sfx_0 7, 172
-	sfx_0 7, 115
-	sfx_0 7, 167
-	sfx_0 7, 107
-	sfx_0 7, 162
-	sfx_0 7, 98
-	sfx_1 64
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_0 7, 89
-	sfx_0 7, 151
-	sfx_0 7, 79
-	sfx_0 7, 144
-	sfx_0 7, 68
-	sfx_1 96
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_0 7, 57
-	sfx_0 7, 123
-	sfx_0 7, 45
-	sfx_0 7, 115
-	sfx_0 7, 33
-	sfx_1 128
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_0 7, 20
-	sfx_0 7, 98
-	sfx_0 7, 5
-	sfx_0 7, 89
-	sfx_0 6, 246
-	sfx_1 243
-	sfx_2 4
-	sfx_0 6, 11
-	sfx_0 5, 99
-	sfx_1 240
-	sfx_0 6, 178
-	sfx_0 5, 99
-	sfx_0 4, 131
-	sfx_0 3, 88
-	sfx_0 2, 34
-	sfx_0 0, 156
-	sfx_9 38
-	sfx_1 68
-	sfx_2 0
-	sfx_0 6, 11
-	sfx_0 6, 137
-	sfx_0 6, 231
-	sfx_0 7, 5
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 39
-	sfx_2 0
-	sfx_0 6, 11
-	sfx_0 6, 137
-	sfx_0 6, 231
-	sfx_0 7, 5
-	sfx_0 7, 68
-	sfx_0 7, 115
-	sfx_1 16
-	sfx_2 0
-	sfx_0 6, 11
-	sfx_0 6, 137
-	sfx_0 6, 231
-	sfx_0 7, 5
-	sfx_0 7, 68
-	sfx_0 7, 115
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_env 2, 0
+	sfx_freq $7ac
+	sfx_freq $773
+	sfx_freq $7a7
+	sfx_freq $76b
+	sfx_freq $7a2
+	sfx_freq $762
+	sfx_env 4, 0
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_freq $759
+	sfx_freq $797
+	sfx_freq $74f
+	sfx_freq $790
+	sfx_freq $744
+	sfx_env 6, 0
+	sfx_duty 2
+	sfx_freq $783
+	sfx_freq $739
+	sfx_freq $77b
+	sfx_freq $72d
+	sfx_freq $773
+	sfx_freq $721
+	sfx_env 8, 0
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_freq $714
+	sfx_freq $762
+	sfx_freq $705
+	sfx_freq $759
+	sfx_freq $6f6
+	sfx_env 15, 3
+	sfx_duty 1
+	sfx_freq $60b
+	sfx_freq $563
+	sfx_env 15, 0
+	sfx_freq $6b2
+	sfx_freq $563
+	sfx_freq $483
+	sfx_freq $358
+	sfx_freq $222
+	sfx_freq $9c
+	sfx_sweep_up 2, 6
+	sfx_env 4, 4
+	sfx_duty 0
+	sfx_freq $60b
+	sfx_freq $689
+	sfx_freq $6e7
+	sfx_freq $705
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 2, 7
+	sfx_duty 0
+	sfx_freq $60b
+	sfx_freq $689
+	sfx_freq $6e7
+	sfx_freq $705
+	sfx_freq $744
+	sfx_freq $773
+	sfx_env 1, 0
+	sfx_duty 0
+	sfx_freq $60b
+	sfx_freq $689
+	sfx_freq $6e7
+	sfx_freq $705
+	sfx_freq $744
+	sfx_freq $773
 	sfx_end
 
 Sfx_Fireball_Ch2:
-	sfx_8 17
-	sfx_1 16
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_1 32
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_1 48
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_1 64
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_1 80
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_1 243
-	sfx_0 0, 21
-	sfx_0 0, 99
-	sfx_1 247
-	sfx_0 0, 53
-	sfx_0 0, 99
-	sfx_0 0, 82
-	sfx_1 183
-	sfx_0 0, 67
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 66
-	sfx_1 103
-	sfx_0 0, 66
-	sfx_0 0, 68
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_1 71
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_1 39
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
+	sfx_pan TRUE, TRUE
+	sfx_env 1, 0
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_env 2, 0
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_env 3, 0
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $31
+	sfx_freq $31
+	sfx_env 4, 0
+	sfx_freq $31
+	sfx_freq $31
+	sfx_freq $31
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_env 5, 0
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_env 15, 3
+	sfx_freq $15
+	sfx_freq $63
+	sfx_env 15, 7
+	sfx_freq $35
+	sfx_freq $63
+	sfx_freq $52
+	sfx_env 11, 7
+	sfx_freq $43
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $42
+	sfx_env 6, 7
+	sfx_freq $42
+	sfx_freq $44
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
+	sfx_env 4, 7
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
+	sfx_env 2, 7
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
 	sfx_end
diff --git a/src/audio/sfx/sfx_firegiver.asm b/src/audio/sfx/sfx_firegiver.asm
index 329e242..26fabea 100644
--- a/src/audio/sfx/sfx_firegiver.asm
+++ b/src/audio/sfx/sfx_firegiver.asm
@@ -1,146 +1,146 @@
 Sfx_Firegiver_Ch1:
-	sfx_1 0
-	sfx_5 0
-	sfx_6 20
-	sfx_5 255
-	sfx_1 1
-	sfx_1 228
-	sfx_8 17
-	sfx_2 0
-	sfx_0 6, 11
-	sfx_5 0
-	sfx_6 1
-	sfx_0 6, 114
-	sfx_6 1
-	sfx_0 6, 66
-	sfx_6 1
-	sfx_0 6, 137
-	sfx_6 1
-	sfx_0 6, 114
-	sfx_6 1
-	sfx_0 6, 178
-	sfx_6 1
-	sfx_0 6, 137
-	sfx_6 1
-	sfx_0 6, 214
-	sfx_6 1
-	sfx_0 6, 178
-	sfx_6 1
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_1 100
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_0 7, 57
-	sfx_6 1
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_0 7, 57
-	sfx_6 1
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 52
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 144
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_0 7, 182
-	sfx_6 1
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 10
-	sfx_5 0
-	sfx_1 52
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 20
+	sfx_pitch_offset -1
+	sfx_env 0, 1
+	sfx_env 14, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $60b
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $672
+	sfx_wait 1
+	sfx_freq $642
+	sfx_wait 1
+	sfx_freq $689
+	sfx_wait 1
+	sfx_freq $672
+	sfx_wait 1
+	sfx_freq $6b2
+	sfx_wait 1
+	sfx_freq $689
+	sfx_wait 1
+	sfx_freq $6d6
+	sfx_wait 1
+	sfx_freq $6b2
+	sfx_wait 1
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_env 6, 4
+	sfx_duty 0
+	sfx_freq $705
+	sfx_wait 1
+	sfx_freq $739
+	sfx_wait 1
+	sfx_freq $721
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_freq $739
+	sfx_wait 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 3, 4
+	sfx_duty 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $790
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_freq $7b6
+	sfx_wait 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 10
+	sfx_pitch_offset 0
+	sfx_env 3, 4
 	sfx_loop 6
-	sfx_1 228
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 0
-	sfx_1 228
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 0
-	sfx_1 228
-	sfx_0 7, 89
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 0
-	sfx_1 228
-	sfx_0 7, 144
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 0
-	sfx_1 228
-	sfx_0 7, 162
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 0
-	sfx_1 228
-	sfx_0 7, 182
-	sfx_1 0
-	sfx_5 0
-	sfx_6 5
-	sfx_5 0
-	sfx_1 228
+	sfx_env 14, 4
+	sfx_duty 0
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $759
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $790
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $7a2
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $7b6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 5
+	sfx_pitch_offset 0
+	sfx_env 14, 4
 	sfx_endloop
 	sfx_end
 
 Sfx_Firegiver_Ch2:
 	sfx_loop 65
-	sfx_1 127
-	sfx_8 17
-	sfx_0 0, 82
-	sfx_0 0, 84
-	sfx_0 0, 83
+	sfx_env 7, -7
+	sfx_pan TRUE, TRUE
+	sfx_freq $52
+	sfx_freq $54
+	sfx_freq $53
 	sfx_endloop
-	sfx_1 95
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_1 79
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_1 47
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_1 31
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
+	sfx_env 5, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_env 4, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_env 2, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_env 1, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
 	sfx_end
diff --git a/src/audio/sfx/sfx_firegiver_start.asm b/src/audio/sfx/sfx_firegiver_start.asm
index a9b7e0e..61b3cdf 100644
--- a/src/audio/sfx/sfx_firegiver_start.asm
+++ b/src/audio/sfx/sfx_firegiver_start.asm
@@ -1,25 +1,25 @@
 Sfx_FiregiverStart_Ch1:
 	sfx_loop 30
-	sfx_1 191
-	sfx_8 17
-	sfx_0 0, 82
-	sfx_0 0, 84
-	sfx_0 0, 83
+	sfx_env 11, -7
+	sfx_pan TRUE, TRUE
+	sfx_freq $52
+	sfx_freq $54
+	sfx_freq $53
 	sfx_endloop
-	sfx_1 95
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_1 79
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_1 47
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_1 31
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
+	sfx_env 5, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_env 4, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_env 2, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_env 1, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
 	sfx_end
diff --git a/src/audio/sfx/sfx_focus_blast.asm b/src/audio/sfx/sfx_focus_blast.asm
index 0a26812..8fb0dc9 100644
--- a/src/audio/sfx/sfx_focus_blast.asm
+++ b/src/audio/sfx/sfx_focus_blast.asm
@@ -1,166 +1,166 @@
 Sfx_FocusBlast_Ch1:
-	sfx_8 17
-	sfx_2 8
-	sfx_1 27
-	sfx_2 8
-	sfx_0 7, 190
-	sfx_0 7, 172
-	sfx_0 7, 186
-	sfx_0 7, 167
-	sfx_0 7, 182
-	sfx_0 7, 162
-	sfx_1 59
-	sfx_2 8
-	sfx_0 7, 177
-	sfx_0 7, 157
-	sfx_0 7, 172
-	sfx_0 7, 151
-	sfx_0 7, 167
-	sfx_0 7, 144
-	sfx_1 108
-	sfx_2 8
-	sfx_0 7, 162
-	sfx_0 7, 138
-	sfx_0 7, 157
-	sfx_0 7, 131
-	sfx_0 7, 151
-	sfx_0 7, 123
-	sfx_1 157
-	sfx_2 8
-	sfx_0 7, 144
-	sfx_0 7, 115
-	sfx_0 7, 138
-	sfx_0 7, 107
-	sfx_0 7, 131
-	sfx_0 7, 115
-	sfx_1 255
-	sfx_2 4
-	sfx_0 7, 68
-	sfx_0 5, 237
-	sfx_0 5, 99
-	sfx_0 4, 131
-	sfx_0 4, 22
-	sfx_0 3, 218
-	sfx_0 0, 44
-	sfx_1 87
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_1 55
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_1 39
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_1 23
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_env 1, -3
+	sfx_duty 2
+	sfx_freq $7be
+	sfx_freq $7ac
+	sfx_freq $7ba
+	sfx_freq $7a7
+	sfx_freq $7b6
+	sfx_freq $7a2
+	sfx_env 3, -3
+	sfx_duty 2
+	sfx_freq $7b1
+	sfx_freq $79d
+	sfx_freq $7ac
+	sfx_freq $797
+	sfx_freq $7a7
+	sfx_freq $790
+	sfx_env 6, -4
+	sfx_duty 2
+	sfx_freq $7a2
+	sfx_freq $78a
+	sfx_freq $79d
+	sfx_freq $783
+	sfx_freq $797
+	sfx_freq $77b
+	sfx_env 9, -5
+	sfx_duty 2
+	sfx_freq $790
+	sfx_freq $773
+	sfx_freq $78a
+	sfx_freq $76b
+	sfx_freq $783
+	sfx_freq $773
+	sfx_env 15, -7
+	sfx_duty 1
+	sfx_freq $744
+	sfx_freq $5ed
+	sfx_freq $563
+	sfx_freq $483
+	sfx_freq $416
+	sfx_freq $3da
+	sfx_freq $2c
+	sfx_env 5, 7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_env 3, 7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_env 2, 7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_env 1, 7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
 	sfx_end
 
 Sfx_FocusBlast_Ch2:
-	sfx_8 17
-	sfx_1 29
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_1 60
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_1 91
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 3
-	sfx_0 0, 3
-	sfx_0 0, 3
-	sfx_1 138
-	sfx_0 0, 4
-	sfx_0 0, 5
-	sfx_0 0, 6
-	sfx_1 247
-	sfx_0 0, 21
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 69
-	sfx_0 0, 68
-	sfx_0 0, 51
-	sfx_0 0, 51
-	sfx_1 214
-	sfx_0 0, 6
-	sfx_0 0, 5
-	sfx_0 0, 3
-	sfx_0 0, 3
-	sfx_0 0, 1
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_1 118
-	sfx_0 0, 6
-	sfx_0 0, 5
-	sfx_0 0, 3
-	sfx_0 0, 3
-	sfx_0 0, 1
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_1 70
-	sfx_0 0, 6
-	sfx_0 0, 5
-	sfx_0 0, 3
-	sfx_0 0, 3
-	sfx_0 0, 1
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_1 38
-	sfx_0 0, 6
-	sfx_0 0, 5
-	sfx_0 0, 3
-	sfx_0 0, 3
-	sfx_0 0, 1
-	sfx_0 0, 0
-	sfx_0 0, 0
+	sfx_pan TRUE, TRUE
+	sfx_env 1, -5
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_env 3, -4
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_env 5, -3
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $3
+	sfx_freq $3
+	sfx_freq $3
+	sfx_env 8, -2
+	sfx_freq $4
+	sfx_freq $5
+	sfx_freq $6
+	sfx_env 15, 7
+	sfx_freq $15
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $45
+	sfx_freq $44
+	sfx_freq $33
+	sfx_freq $33
+	sfx_env 13, 6
+	sfx_freq $6
+	sfx_freq $5
+	sfx_freq $3
+	sfx_freq $3
+	sfx_freq $1
+	sfx_freq $0
+	sfx_freq $0
+	sfx_env 7, 6
+	sfx_freq $6
+	sfx_freq $5
+	sfx_freq $3
+	sfx_freq $3
+	sfx_freq $1
+	sfx_freq $0
+	sfx_freq $0
+	sfx_env 4, 6
+	sfx_freq $6
+	sfx_freq $5
+	sfx_freq $3
+	sfx_freq $3
+	sfx_freq $1
+	sfx_freq $0
+	sfx_freq $0
+	sfx_env 2, 6
+	sfx_freq $6
+	sfx_freq $5
+	sfx_freq $3
+	sfx_freq $3
+	sfx_freq $1
+	sfx_freq $0
+	sfx_freq $0
 	sfx_end
diff --git a/src/audio/sfx/sfx_focus_blast_bench.asm b/src/audio/sfx/sfx_focus_blast_bench.asm
index b412a71..28c8411 100644
--- a/src/audio/sfx/sfx_focus_blast_bench.asm
+++ b/src/audio/sfx/sfx_focus_blast_bench.asm
@@ -1,136 +1,136 @@
 Sfx_FocusBlast_Bench_Ch1:
-	sfx_8 17
-	sfx_2 8
-	sfx_1 27
-	sfx_2 8
-	sfx_0 7, 206
-	sfx_0 7, 197
-	sfx_0 7, 203
-	sfx_0 7, 190
-	sfx_0 7, 200
-	sfx_0 7, 186
-	sfx_1 59
-	sfx_2 8
-	sfx_0 7, 197
-	sfx_0 7, 182
-	sfx_0 7, 193
-	sfx_0 7, 177
-	sfx_0 7, 190
-	sfx_0 7, 172
-	sfx_1 92
-	sfx_2 8
-	sfx_0 7, 186
-	sfx_0 7, 167
-	sfx_0 7, 182
-	sfx_0 7, 162
-	sfx_0 7, 177
-	sfx_0 7, 157
-	sfx_1 125
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 151
-	sfx_0 7, 167
-	sfx_0 7, 144
-	sfx_0 7, 162
-	sfx_0 7, 138
-	sfx_0 7, 157
-	sfx_0 7, 131
-	sfx_0 7, 151
-	sfx_0 7, 123
-	sfx_0 7, 144
-	sfx_0 7, 115
-	sfx_1 255
-	sfx_2 8
-	sfx_0 7, 5
-	sfx_0 6, 114
-	sfx_0 5, 237
-	sfx_0 5, 17
-	sfx_0 4, 131
-	sfx_0 4, 22
-	sfx_0 4, 131
-	sfx_0 4, 22
-	sfx_1 66
-	sfx_2 4
-	sfx_0 7, 197
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 50
-	sfx_2 4
-	sfx_0 7, 197
-	sfx_6 1
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 34
-	sfx_2 4
-	sfx_0 7, 197
-	sfx_6 1
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_env 1, -3
+	sfx_duty 2
+	sfx_freq $7ce
+	sfx_freq $7c5
+	sfx_freq $7cb
+	sfx_freq $7be
+	sfx_freq $7c8
+	sfx_freq $7ba
+	sfx_env 3, -3
+	sfx_duty 2
+	sfx_freq $7c5
+	sfx_freq $7b6
+	sfx_freq $7c1
+	sfx_freq $7b1
+	sfx_freq $7be
+	sfx_freq $7ac
+	sfx_env 5, -4
+	sfx_duty 2
+	sfx_freq $7ba
+	sfx_freq $7a7
+	sfx_freq $7b6
+	sfx_freq $7a2
+	sfx_freq $7b1
+	sfx_freq $79d
+	sfx_env 7, -5
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $797
+	sfx_freq $7a7
+	sfx_freq $790
+	sfx_freq $7a2
+	sfx_freq $78a
+	sfx_freq $79d
+	sfx_freq $783
+	sfx_freq $797
+	sfx_freq $77b
+	sfx_freq $790
+	sfx_freq $773
+	sfx_env 15, -7
+	sfx_duty 2
+	sfx_freq $705
+	sfx_freq $672
+	sfx_freq $5ed
+	sfx_freq $511
+	sfx_freq $483
+	sfx_freq $416
+	sfx_freq $483
+	sfx_freq $416
+	sfx_env 4, 2
+	sfx_duty 1
+	sfx_freq $7c5
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 3, 2
+	sfx_duty 1
+	sfx_freq $7c5
+	sfx_wait 1
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 2, 2
+	sfx_duty 1
+	sfx_freq $7c5
+	sfx_wait 1
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
 	sfx_end
 
 Sfx_FocusBlast_Bench_Ch2:
-	sfx_8 17
-	sfx_1 64
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_1 80
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_1 96
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 3
-	sfx_0 0, 3
-	sfx_0 0, 3
-	sfx_0 0, 4
-	sfx_0 0, 5
-	sfx_0 0, 6
-	sfx_0 0, 5
-	sfx_1 112
-	sfx_0 0, 5
-	sfx_0 0, 6
-	sfx_0 0, 6
-	sfx_0 0, 7
-	sfx_0 0, 7
-	sfx_1 240
-	sfx_0 0, 21
-	sfx_0 0, 101
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 85
-	sfx_1 150
-	sfx_0 0, 6
-	sfx_0 0, 3
-	sfx_0 0, 1
-	sfx_0 0, 0
-	sfx_1 118
-	sfx_0 0, 6
-	sfx_0 0, 3
-	sfx_0 0, 1
-	sfx_0 0, 0
-	sfx_1 86
-	sfx_0 0, 6
-	sfx_0 0, 3
-	sfx_0 0, 1
-	sfx_0 0, 0
+	sfx_pan TRUE, TRUE
+	sfx_env 4, 0
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_env 5, 0
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_env 6, 0
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $3
+	sfx_freq $3
+	sfx_freq $3
+	sfx_freq $4
+	sfx_freq $5
+	sfx_freq $6
+	sfx_freq $5
+	sfx_env 7, 0
+	sfx_freq $5
+	sfx_freq $6
+	sfx_freq $6
+	sfx_freq $7
+	sfx_freq $7
+	sfx_env 15, 0
+	sfx_freq $15
+	sfx_freq $65
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $55
+	sfx_env 9, 6
+	sfx_freq $6
+	sfx_freq $3
+	sfx_freq $1
+	sfx_freq $0
+	sfx_env 7, 6
+	sfx_freq $6
+	sfx_freq $3
+	sfx_freq $1
+	sfx_freq $0
+	sfx_env 5, 6
+	sfx_freq $6
+	sfx_freq $3
+	sfx_freq $1
+	sfx_freq $0
 	sfx_end
diff --git a/src/audio/sfx/sfx_follow_me.asm b/src/audio/sfx/sfx_follow_me.asm
index 12bc6b8..65b0afd 100644
--- a/src/audio/sfx/sfx_follow_me.asm
+++ b/src/audio/sfx/sfx_follow_me.asm
@@ -1,97 +1,97 @@
 Sfx_FollowMe_Ch1:
-	sfx_8 17
-	sfx_1 0
-	sfx_6 9
+	sfx_pan TRUE, TRUE
+	sfx_env 0, 0
+	sfx_wait 9
 	sfx_loop 2
-	sfx_1 43
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 206
-	sfx_1 91
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 212
-	sfx_1 139
-	sfx_2 0
-	sfx_0 7, 219
-	sfx_1 203
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_6 15
-	sfx_1 43
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 7, 182
-	sfx_1 91
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_0 7, 193
-	sfx_1 139
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_1 203
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_1 0
-	sfx_6 15
+	sfx_env 2, -3
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7ce
+	sfx_env 5, -3
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7d4
+	sfx_env 8, -3
+	sfx_duty 0
+	sfx_freq $7db
+	sfx_env 12, -3
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_wait 15
+	sfx_env 2, -3
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $7b6
+	sfx_env 5, -3
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_freq $7c1
+	sfx_env 8, -3
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_env 12, -3
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_env 0, 0
+	sfx_wait 15
 	sfx_endloop
-	sfx_1 39
-	sfx_2 8
-	sfx_0 6, 178
-	sfx_1 71
-	sfx_2 8
-	sfx_0 7, 89
-	sfx_1 119
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_1 247
-	sfx_2 8
-	sfx_0 7, 214
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_1 119
-	sfx_2 8
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_1 71
-	sfx_2 8
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_1 55
-	sfx_2 8
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_1 39
-	sfx_2 8
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_1 23
-	sfx_2 8
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
+	sfx_env 2, 7
+	sfx_duty 2
+	sfx_freq $6b2
+	sfx_env 4, 7
+	sfx_duty 2
+	sfx_freq $759
+	sfx_env 7, 7
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_env 15, 7
+	sfx_duty 2
+	sfx_freq $7d6
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_env 7, 7
+	sfx_duty 2
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_env 4, 7
+	sfx_duty 2
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_env 3, 7
+	sfx_duty 2
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_env 2, 7
+	sfx_duty 2
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_env 1, 7
+	sfx_duty 2
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_fury_swipes.asm b/src/audio/sfx/sfx_fury_swipes.asm
index c6bfb18..615d04e 100644
--- a/src/audio/sfx/sfx_fury_swipes.asm
+++ b/src/audio/sfx/sfx_fury_swipes.asm
@@ -1,85 +1,85 @@
 Sfx_FurySwipes_Ch1:
-	sfx_8 17
-	sfx_1 214
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_1 255
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_1 223
-	sfx_0 0, 33
-	sfx_0 0, 50
-	sfx_0 0, 33
-	sfx_0 0, 50
-	sfx_1 127
-	sfx_0 0, 34
-	sfx_0 0, 51
-	sfx_0 0, 34
-	sfx_0 0, 51
-	sfx_1 223
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 255
-	sfx_0 0, 65
-	sfx_0 0, 49
-	sfx_0 0, 65
-	sfx_0 0, 49
-	sfx_0 0, 65
-	sfx_0 0, 49
-	sfx_0 0, 65
-	sfx_0 0, 49
-	sfx_1 223
-	sfx_0 0, 65
-	sfx_0 0, 50
-	sfx_0 0, 65
-	sfx_0 0, 50
-	sfx_1 127
-	sfx_0 0, 66
-	sfx_0 0, 51
-	sfx_0 0, 66
-	sfx_0 0, 51
-	sfx_1 214
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_1 255
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_1 223
-	sfx_0 0, 33
-	sfx_0 0, 50
-	sfx_1 143
-	sfx_0 0, 33
-	sfx_0 0, 50
-	sfx_0 0, 34
-	sfx_0 0, 51
-	sfx_1 111
-	sfx_0 0, 34
-	sfx_0 0, 51
-	sfx_0 0, 35
-	sfx_0 0, 52
-	sfx_1 79
-	sfx_0 0, 35
-	sfx_0 0, 52
-	sfx_0 0, 35
-	sfx_0 0, 52
-	sfx_1 47
-	sfx_0 0, 35
-	sfx_0 0, 52
-	sfx_0 0, 36
-	sfx_0 0, 53
+	sfx_pan TRUE, TRUE
+	sfx_env 13, 6
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_env 15, -7
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_env 13, -7
+	sfx_freq $21
+	sfx_freq $32
+	sfx_freq $21
+	sfx_freq $32
+	sfx_env 7, -7
+	sfx_freq $22
+	sfx_freq $33
+	sfx_freq $22
+	sfx_freq $33
+	sfx_env 13, -7
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 15, -7
+	sfx_freq $41
+	sfx_freq $31
+	sfx_freq $41
+	sfx_freq $31
+	sfx_freq $41
+	sfx_freq $31
+	sfx_freq $41
+	sfx_freq $31
+	sfx_env 13, -7
+	sfx_freq $41
+	sfx_freq $32
+	sfx_freq $41
+	sfx_freq $32
+	sfx_env 7, -7
+	sfx_freq $42
+	sfx_freq $33
+	sfx_freq $42
+	sfx_freq $33
+	sfx_env 13, 6
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_env 15, -7
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_env 13, -7
+	sfx_freq $21
+	sfx_freq $32
+	sfx_env 8, -7
+	sfx_freq $21
+	sfx_freq $32
+	sfx_freq $22
+	sfx_freq $33
+	sfx_env 6, -7
+	sfx_freq $22
+	sfx_freq $33
+	sfx_freq $23
+	sfx_freq $34
+	sfx_env 4, -7
+	sfx_freq $23
+	sfx_freq $34
+	sfx_freq $23
+	sfx_freq $34
+	sfx_env 2, -7
+	sfx_freq $23
+	sfx_freq $34
+	sfx_freq $24
+	sfx_freq $35
 	sfx_end
diff --git a/src/audio/sfx/sfx_ghost_master_appear.asm b/src/audio/sfx/sfx_ghost_master_appear.asm
index c72a24c..c905bc4 100644
--- a/src/audio/sfx/sfx_ghost_master_appear.asm
+++ b/src/audio/sfx/sfx_ghost_master_appear.asm
@@ -1,204 +1,204 @@
 Sfx_GhostMasterAppear_Ch1:
-	sfx_1 16
-	sfx_8 17
-	sfx_2 0
-	sfx_0 6, 11
-	sfx_0 6, 40
-	sfx_0 6, 66
-	sfx_0 6, 91
-	sfx_2 8
-	sfx_0 6, 114
-	sfx_0 6, 137
-	sfx_0 6, 158
-	sfx_2 4
-	sfx_0 6, 178
-	sfx_0 6, 196
-	sfx_1 32
-	sfx_0 6, 214
-	sfx_0 6, 231
-	sfx_2 0
-	sfx_0 6, 246
-	sfx_0 7, 5
-	sfx_1 48
-	sfx_0 7, 20
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_0 7, 45
-	sfx_1 32
-	sfx_2 4
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_0 7, 79
-	sfx_0 7, 89
-	sfx_1 32
-	sfx_0 6, 178
-	sfx_0 6, 196
-	sfx_2 0
-	sfx_0 6, 214
-	sfx_0 6, 231
-	sfx_1 48
-	sfx_2 8
-	sfx_0 6, 246
-	sfx_0 7, 5
-	sfx_2 4
-	sfx_0 7, 20
-	sfx_1 64
-	sfx_0 7, 33
-	sfx_2 0
-	sfx_0 7, 45
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_1 48
-	sfx_0 7, 79
-	sfx_2 4
-	sfx_0 7, 89
-	sfx_0 7, 98
-	sfx_1 48
-	sfx_2 0
-	sfx_0 6, 214
-	sfx_0 6, 231
-	sfx_2 8
-	sfx_0 6, 246
-	sfx_1 64
-	sfx_0 7, 5
-	sfx_0 7, 20
-	sfx_2 0
-	sfx_0 7, 33
-	sfx_1 80
-	sfx_0 7, 45
-	sfx_2 4
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_0 7, 79
-	sfx_1 64
-	sfx_2 0
-	sfx_0 7, 89
-	sfx_0 7, 98
-	sfx_0 7, 107
-	sfx_1 64
-	sfx_0 6, 231
-	sfx_0 6, 246
-	sfx_0 7, 5
-	sfx_2 8
-	sfx_0 7, 20
-	sfx_1 80
-	sfx_0 7, 33
-	sfx_2 4
-	sfx_0 7, 45
-	sfx_0 7, 57
-	sfx_1 96
-	sfx_2 0
-	sfx_0 7, 68
-	sfx_0 7, 79
-	sfx_0 7, 89
-	sfx_1 80
-	sfx_0 7, 98
-	sfx_0 7, 107
-	sfx_2 8
-	sfx_0 7, 115
-	sfx_1 80
-	sfx_0 7, 20
-	sfx_2 4
-	sfx_0 7, 33
-	sfx_0 7, 45
-	sfx_1 96
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_2 0
-	sfx_0 7, 79
-	sfx_1 112
-	sfx_0 7, 89
-	sfx_0 7, 98
-	sfx_0 7, 107
-	sfx_1 96
-	sfx_0 7, 115
-	sfx_0 7, 123
-	sfx_1 96
-	sfx_0 7, 57
-	sfx_2 8
-	sfx_0 7, 68
-	sfx_0 7, 79
-	sfx_1 112
-	sfx_2 0
-	sfx_0 7, 89
-	sfx_0 7, 98
-	sfx_1 128
-	sfx_0 7, 107
-	sfx_0 7, 115
-	sfx_1 112
-	sfx_0 7, 123
-	sfx_0 7, 131
-	sfx_1 112
-	sfx_0 7, 68
-	sfx_2 4
-	sfx_0 7, 79
-	sfx_0 7, 89
-	sfx_1 128
-	sfx_0 7, 98
-	sfx_0 7, 107
-	sfx_1 144
-	sfx_2 0
-	sfx_0 7, 115
-	sfx_0 7, 123
-	sfx_0 7, 131
-	sfx_0 7, 138
+	sfx_env 1, 0
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $60b
+	sfx_freq $628
+	sfx_freq $642
+	sfx_freq $65b
+	sfx_duty 2
+	sfx_freq $672
+	sfx_freq $689
+	sfx_freq $69e
+	sfx_duty 1
+	sfx_freq $6b2
+	sfx_freq $6c4
+	sfx_env 2, 0
+	sfx_freq $6d6
+	sfx_freq $6e7
+	sfx_duty 0
+	sfx_freq $6f6
+	sfx_freq $705
+	sfx_env 3, 0
+	sfx_freq $714
+	sfx_duty 2
+	sfx_freq $721
+	sfx_freq $72d
+	sfx_env 2, 0
+	sfx_duty 1
+	sfx_freq $739
+	sfx_freq $744
+	sfx_freq $74f
+	sfx_freq $759
+	sfx_env 2, 0
+	sfx_freq $6b2
+	sfx_freq $6c4
+	sfx_duty 0
+	sfx_freq $6d6
+	sfx_freq $6e7
+	sfx_env 3, 0
+	sfx_duty 2
+	sfx_freq $6f6
+	sfx_freq $705
+	sfx_duty 1
+	sfx_freq $714
+	sfx_env 4, 0
+	sfx_freq $721
+	sfx_duty 0
+	sfx_freq $72d
+	sfx_freq $739
+	sfx_freq $744
+	sfx_env 3, 0
+	sfx_freq $74f
+	sfx_duty 1
+	sfx_freq $759
+	sfx_freq $762
+	sfx_env 3, 0
+	sfx_duty 0
+	sfx_freq $6d6
+	sfx_freq $6e7
+	sfx_duty 2
+	sfx_freq $6f6
+	sfx_env 4, 0
+	sfx_freq $705
+	sfx_freq $714
+	sfx_duty 0
+	sfx_freq $721
+	sfx_env 5, 0
+	sfx_freq $72d
+	sfx_duty 1
+	sfx_freq $739
+	sfx_freq $744
+	sfx_freq $74f
+	sfx_env 4, 0
+	sfx_duty 0
+	sfx_freq $759
+	sfx_freq $762
+	sfx_freq $76b
+	sfx_env 4, 0
+	sfx_freq $6e7
+	sfx_freq $6f6
+	sfx_freq $705
+	sfx_duty 2
+	sfx_freq $714
+	sfx_env 5, 0
+	sfx_freq $721
+	sfx_duty 1
+	sfx_freq $72d
+	sfx_freq $739
+	sfx_env 6, 0
+	sfx_duty 0
+	sfx_freq $744
+	sfx_freq $74f
+	sfx_freq $759
+	sfx_env 5, 0
+	sfx_freq $762
+	sfx_freq $76b
+	sfx_duty 2
+	sfx_freq $773
+	sfx_env 5, 0
+	sfx_freq $714
+	sfx_duty 1
+	sfx_freq $721
+	sfx_freq $72d
+	sfx_env 6, 0
+	sfx_freq $739
+	sfx_freq $744
+	sfx_duty 0
+	sfx_freq $74f
+	sfx_env 7, 0
+	sfx_freq $759
+	sfx_freq $762
+	sfx_freq $76b
+	sfx_env 6, 0
+	sfx_freq $773
+	sfx_freq $77b
+	sfx_env 6, 0
+	sfx_freq $739
+	sfx_duty 2
+	sfx_freq $744
+	sfx_freq $74f
+	sfx_env 7, 0
+	sfx_duty 0
+	sfx_freq $759
+	sfx_freq $762
+	sfx_env 8, 0
+	sfx_freq $76b
+	sfx_freq $773
+	sfx_env 7, 0
+	sfx_freq $77b
+	sfx_freq $783
+	sfx_env 7, 0
+	sfx_freq $744
+	sfx_duty 1
+	sfx_freq $74f
+	sfx_freq $759
+	sfx_env 8, 0
+	sfx_freq $762
+	sfx_freq $76b
+	sfx_env 9, 0
+	sfx_duty 0
+	sfx_freq $773
+	sfx_freq $77b
+	sfx_freq $783
+	sfx_freq $78a
 	sfx_loop 4
-	sfx_1 160
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 98
-	sfx_1 112
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 98
-	sfx_1 128
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_0 7, 98
-	sfx_1 112
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 98
-	sfx_1 144
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 98
-	sfx_1 80
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_0 7, 98
+	sfx_env 10, 0
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $762
+	sfx_env 7, 0
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $762
+	sfx_env 8, 0
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_freq $762
+	sfx_env 7, 0
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $762
+	sfx_env 9, 0
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $762
+	sfx_env 5, 0
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_freq $762
 	sfx_endloop
-	sfx_9 79
-	sfx_1 192
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 193
-	sfx_1 102
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 193
-	sfx_1 54
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 193
-	sfx_1 38
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 193
+	sfx_sweep_down 4, 7
+	sfx_env 12, 0
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7c1
+	sfx_env 6, 6
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7c1
+	sfx_env 3, 6
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7c1
+	sfx_env 2, 6
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7c1
 	sfx_end
diff --git a/src/audio/sfx/sfx_ghost_master_disappear.asm b/src/audio/sfx/sfx_ghost_master_disappear.asm
index d8573d9..4feaeba 100644
--- a/src/audio/sfx/sfx_ghost_master_disappear.asm
+++ b/src/audio/sfx/sfx_ghost_master_disappear.asm
@@ -1,170 +1,170 @@
 Sfx_GhostMasterDisappear_Ch1:
-	sfx_1 16
-	sfx_8 17
-	sfx_2 0
-	sfx_2 8
-	sfx_0 6, 214
-	sfx_0 6, 231
-	sfx_2 4
-	sfx_0 6, 246
-	sfx_0 7, 5
-	sfx_1 32
-	sfx_0 7, 20
-	sfx_0 7, 33
-	sfx_2 0
-	sfx_0 7, 45
-	sfx_0 7, 57
-	sfx_1 48
-	sfx_0 7, 68
-	sfx_2 8
-	sfx_0 7, 79
-	sfx_0 7, 89
-	sfx_1 32
-	sfx_2 4
-	sfx_0 7, 98
-	sfx_0 7, 107
-	sfx_0 7, 115
-	sfx_0 7, 123
-	sfx_1 32
-	sfx_0 6, 246
-	sfx_0 7, 5
-	sfx_2 0
-	sfx_0 7, 20
-	sfx_0 7, 33
-	sfx_1 48
-	sfx_2 8
-	sfx_0 7, 45
-	sfx_0 7, 57
-	sfx_2 4
-	sfx_0 7, 68
-	sfx_1 64
-	sfx_0 7, 79
-	sfx_2 0
-	sfx_0 7, 89
-	sfx_0 7, 98
-	sfx_0 7, 107
-	sfx_1 48
-	sfx_0 7, 115
-	sfx_2 4
-	sfx_0 7, 123
-	sfx_0 7, 131
-	sfx_1 48
-	sfx_2 0
-	sfx_0 7, 20
-	sfx_0 7, 33
-	sfx_2 8
-	sfx_0 7, 45
-	sfx_1 64
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_2 0
-	sfx_0 7, 79
-	sfx_1 80
-	sfx_0 7, 89
-	sfx_2 4
-	sfx_0 7, 98
-	sfx_0 7, 107
-	sfx_0 7, 115
-	sfx_1 64
-	sfx_2 0
-	sfx_0 7, 123
-	sfx_0 7, 131
-	sfx_0 7, 138
-	sfx_1 64
-	sfx_0 7, 33
-	sfx_0 7, 45
-	sfx_0 7, 57
-	sfx_2 8
-	sfx_0 7, 68
-	sfx_1 80
-	sfx_0 7, 79
-	sfx_2 4
-	sfx_0 7, 89
-	sfx_0 7, 98
-	sfx_1 96
-	sfx_2 0
-	sfx_0 7, 107
-	sfx_0 7, 115
-	sfx_0 7, 123
-	sfx_1 80
-	sfx_0 7, 131
-	sfx_0 7, 138
-	sfx_2 8
-	sfx_0 7, 144
-	sfx_1 80
-	sfx_0 7, 68
-	sfx_2 4
-	sfx_0 7, 79
-	sfx_0 7, 89
-	sfx_1 96
-	sfx_0 7, 98
-	sfx_0 7, 107
-	sfx_2 0
-	sfx_0 7, 115
-	sfx_1 112
-	sfx_0 7, 123
-	sfx_0 7, 131
-	sfx_0 7, 138
-	sfx_1 96
-	sfx_0 7, 144
-	sfx_0 7, 151
+	sfx_env 1, 0
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_duty 2
+	sfx_freq $6d6
+	sfx_freq $6e7
+	sfx_duty 1
+	sfx_freq $6f6
+	sfx_freq $705
+	sfx_env 2, 0
+	sfx_freq $714
+	sfx_freq $721
+	sfx_duty 0
+	sfx_freq $72d
+	sfx_freq $739
+	sfx_env 3, 0
+	sfx_freq $744
+	sfx_duty 2
+	sfx_freq $74f
+	sfx_freq $759
+	sfx_env 2, 0
+	sfx_duty 1
+	sfx_freq $762
+	sfx_freq $76b
+	sfx_freq $773
+	sfx_freq $77b
+	sfx_env 2, 0
+	sfx_freq $6f6
+	sfx_freq $705
+	sfx_duty 0
+	sfx_freq $714
+	sfx_freq $721
+	sfx_env 3, 0
+	sfx_duty 2
+	sfx_freq $72d
+	sfx_freq $739
+	sfx_duty 1
+	sfx_freq $744
+	sfx_env 4, 0
+	sfx_freq $74f
+	sfx_duty 0
+	sfx_freq $759
+	sfx_freq $762
+	sfx_freq $76b
+	sfx_env 3, 0
+	sfx_freq $773
+	sfx_duty 1
+	sfx_freq $77b
+	sfx_freq $783
+	sfx_env 3, 0
+	sfx_duty 0
+	sfx_freq $714
+	sfx_freq $721
+	sfx_duty 2
+	sfx_freq $72d
+	sfx_env 4, 0
+	sfx_freq $739
+	sfx_freq $744
+	sfx_duty 0
+	sfx_freq $74f
+	sfx_env 5, 0
+	sfx_freq $759
+	sfx_duty 1
+	sfx_freq $762
+	sfx_freq $76b
+	sfx_freq $773
+	sfx_env 4, 0
+	sfx_duty 0
+	sfx_freq $77b
+	sfx_freq $783
+	sfx_freq $78a
+	sfx_env 4, 0
+	sfx_freq $721
+	sfx_freq $72d
+	sfx_freq $739
+	sfx_duty 2
+	sfx_freq $744
+	sfx_env 5, 0
+	sfx_freq $74f
+	sfx_duty 1
+	sfx_freq $759
+	sfx_freq $762
+	sfx_env 6, 0
+	sfx_duty 0
+	sfx_freq $76b
+	sfx_freq $773
+	sfx_freq $77b
+	sfx_env 5, 0
+	sfx_freq $783
+	sfx_freq $78a
+	sfx_duty 2
+	sfx_freq $790
+	sfx_env 5, 0
+	sfx_freq $744
+	sfx_duty 1
+	sfx_freq $74f
+	sfx_freq $759
+	sfx_env 6, 0
+	sfx_freq $762
+	sfx_freq $76b
+	sfx_duty 0
+	sfx_freq $773
+	sfx_env 7, 0
+	sfx_freq $77b
+	sfx_freq $783
+	sfx_freq $78a
+	sfx_env 6, 0
+	sfx_freq $790
+	sfx_freq $797
 	sfx_loop 2
-	sfx_1 64
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 138
-	sfx_1 128
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 138
-	sfx_1 160
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_0 7, 138
-	sfx_1 112
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 138
-	sfx_1 144
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 138
-	sfx_1 80
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_0 7, 138
+	sfx_env 4, 0
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $78a
+	sfx_env 8, 0
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $78a
+	sfx_env 10, 0
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_freq $78a
+	sfx_env 7, 0
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $78a
+	sfx_env 9, 0
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $78a
+	sfx_env 5, 0
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_freq $78a
 	sfx_endloop
-	sfx_9 79
-	sfx_1 192
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 193
-	sfx_1 102
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 193
-	sfx_1 54
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 193
-	sfx_1 38
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 193
+	sfx_sweep_down 4, 7
+	sfx_env 12, 0
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7c1
+	sfx_env 6, 6
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7c1
+	sfx_env 3, 6
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7c1
+	sfx_env 2, 6
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7c1
 	sfx_end
diff --git a/src/audio/sfx/sfx_glow.asm b/src/audio/sfx/sfx_glow.asm
index 6498505..542bc94 100644
--- a/src/audio/sfx/sfx_glow.asm
+++ b/src/audio/sfx/sfx_glow.asm
@@ -1,83 +1,83 @@
 Sfx_Glow_Ch1:
-	sfx_8 17
-	sfx_1 241
-	sfx_2 0
-	sfx_0 4, 22
-	sfx_0 6, 11
-	sfx_0 5, 99
-	sfx_0 6, 178
-	sfx_0 5, 172
-	sfx_0 6, 214
-	sfx_1 241
-	sfx_2 0
-	sfx_0 4, 131
-	sfx_0 6, 66
-	sfx_0 5, 99
-	sfx_0 6, 178
-	sfx_0 5, 237
-	sfx_0 6, 246
-	sfx_1 241
-	sfx_2 4
-	sfx_0 6, 11
-	sfx_0 7, 5
-	sfx_0 6, 178
-	sfx_0 7, 89
-	sfx_0 6, 214
-	sfx_0 7, 107
-	sfx_1 241
-	sfx_2 4
-	sfx_0 6, 66
-	sfx_0 7, 33
-	sfx_0 6, 178
-	sfx_0 7, 89
-	sfx_0 6, 246
-	sfx_0 7, 123
-	sfx_1 241
-	sfx_2 4
-	sfx_0 7, 5
-	sfx_0 7, 131
-	sfx_0 7, 89
-	sfx_0 7, 172
-	sfx_0 7, 107
-	sfx_0 7, 182
-	sfx_1 241
-	sfx_2 4
-	sfx_0 7, 33
-	sfx_0 7, 144
-	sfx_0 7, 89
-	sfx_0 7, 172
-	sfx_0 7, 123
-	sfx_0 7, 190
-	sfx_1 129
-	sfx_2 4
-	sfx_0 7, 5
-	sfx_0 7, 131
-	sfx_0 7, 89
-	sfx_0 7, 172
-	sfx_0 7, 107
-	sfx_0 7, 182
-	sfx_1 65
-	sfx_2 4
-	sfx_0 7, 33
-	sfx_0 7, 144
-	sfx_0 7, 89
-	sfx_0 7, 172
-	sfx_0 7, 123
-	sfx_0 7, 190
-	sfx_1 33
-	sfx_2 4
-	sfx_0 7, 5
-	sfx_0 7, 131
-	sfx_0 7, 89
-	sfx_0 7, 172
-	sfx_0 7, 107
-	sfx_0 7, 182
-	sfx_1 17
-	sfx_2 4
-	sfx_0 7, 33
-	sfx_0 7, 144
-	sfx_0 7, 89
-	sfx_0 7, 172
-	sfx_0 7, 123
-	sfx_0 7, 190
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 1
+	sfx_duty 0
+	sfx_freq $416
+	sfx_freq $60b
+	sfx_freq $563
+	sfx_freq $6b2
+	sfx_freq $5ac
+	sfx_freq $6d6
+	sfx_env 15, 1
+	sfx_duty 0
+	sfx_freq $483
+	sfx_freq $642
+	sfx_freq $563
+	sfx_freq $6b2
+	sfx_freq $5ed
+	sfx_freq $6f6
+	sfx_env 15, 1
+	sfx_duty 1
+	sfx_freq $60b
+	sfx_freq $705
+	sfx_freq $6b2
+	sfx_freq $759
+	sfx_freq $6d6
+	sfx_freq $76b
+	sfx_env 15, 1
+	sfx_duty 1
+	sfx_freq $642
+	sfx_freq $721
+	sfx_freq $6b2
+	sfx_freq $759
+	sfx_freq $6f6
+	sfx_freq $77b
+	sfx_env 15, 1
+	sfx_duty 1
+	sfx_freq $705
+	sfx_freq $783
+	sfx_freq $759
+	sfx_freq $7ac
+	sfx_freq $76b
+	sfx_freq $7b6
+	sfx_env 15, 1
+	sfx_duty 1
+	sfx_freq $721
+	sfx_freq $790
+	sfx_freq $759
+	sfx_freq $7ac
+	sfx_freq $77b
+	sfx_freq $7be
+	sfx_env 8, 1
+	sfx_duty 1
+	sfx_freq $705
+	sfx_freq $783
+	sfx_freq $759
+	sfx_freq $7ac
+	sfx_freq $76b
+	sfx_freq $7b6
+	sfx_env 4, 1
+	sfx_duty 1
+	sfx_freq $721
+	sfx_freq $790
+	sfx_freq $759
+	sfx_freq $7ac
+	sfx_freq $77b
+	sfx_freq $7be
+	sfx_env 2, 1
+	sfx_duty 1
+	sfx_freq $705
+	sfx_freq $783
+	sfx_freq $759
+	sfx_freq $7ac
+	sfx_freq $76b
+	sfx_freq $7b6
+	sfx_env 1, 1
+	sfx_duty 1
+	sfx_freq $721
+	sfx_freq $790
+	sfx_freq $759
+	sfx_freq $7ac
+	sfx_freq $77b
+	sfx_freq $7be
 	sfx_end
diff --git a/src/audio/sfx/sfx_goo.asm b/src/audio/sfx/sfx_goo.asm
index 1e0b2c7..499a73c 100644
--- a/src/audio/sfx/sfx_goo.asm
+++ b/src/audio/sfx/sfx_goo.asm
@@ -1,118 +1,118 @@
 Sfx_Goo_Ch1:
-	sfx_1 255
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 7, 115
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 7, 107
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 7, 98
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 7, 89
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 7, 79
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 7, 68
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 7, 45
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 7, 20
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 7, 5
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $773
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $76b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $762
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $759
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $74f
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $744
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $72d
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $714
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $705
 	sfx_end
 
 Sfx_Goo_Ch2:
-	sfx_8 17
-	sfx_1 0
-	sfx_5 0
-	sfx_6 18
-	sfx_5 255
-	sfx_1 1
-	sfx_1 223
-	sfx_0 0, 49
-	sfx_0 0, 55
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_1 143
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_1 111
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_1 79
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_1 31
-	sfx_0 0, 36
-	sfx_0 0, 36
+	sfx_pan TRUE, TRUE
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 18
+	sfx_pitch_offset -1
+	sfx_env 0, 1
+	sfx_env 13, -7
+	sfx_freq $31
+	sfx_freq $37
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_env 8, -7
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_env 6, -7
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_env 4, -7
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_env 1, -7
+	sfx_freq $24
+	sfx_freq $24
 	sfx_end
diff --git a/src/audio/sfx/sfx_gr_blimp_hatch_close.asm b/src/audio/sfx/sfx_gr_blimp_hatch_close.asm
index 15c20a5..fc01bbe 100644
--- a/src/audio/sfx/sfx_gr_blimp_hatch_close.asm
+++ b/src/audio/sfx/sfx_gr_blimp_hatch_close.asm
@@ -1,52 +1,52 @@
 Sfx_GRBlimpHatchClose_Ch1:
-	sfx_8 17
-	sfx_1 243
-	sfx_2 0
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 2, 34
-	sfx_0 1, 6
-	sfx_1 247
-	sfx_2 4
-	sfx_0 3, 218
-	sfx_0 4, 131
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 17
-	sfx_0 4, 131
-	sfx_1 167
-	sfx_2 4
-	sfx_0 5, 60
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 3, 88
-	sfx_1 135
-	sfx_2 4
-	sfx_0 4, 22
-	sfx_2 8
-	sfx_0 2, 120
-	sfx_0 1, 107
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 3
+	sfx_duty 0
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $222
+	sfx_freq $106
+	sfx_env 15, 7
+	sfx_duty 1
+	sfx_freq $3da
+	sfx_freq $483
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $511
+	sfx_freq $483
+	sfx_env 10, 7
+	sfx_duty 1
+	sfx_freq $53c
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $358
+	sfx_env 8, 7
+	sfx_duty 1
+	sfx_freq $416
+	sfx_duty 2
+	sfx_freq $278
+	sfx_freq $16b
 	sfx_end
 
 Sfx_GRBlimpHatchClose_Ch2:
-	sfx_8 17
-	sfx_1 148
-	sfx_0 0, 86
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 83
-	sfx_1 197
-	sfx_0 0, 21
-	sfx_0 0, 101
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_1 117
-	sfx_0 0, 97
-	sfx_0 0, 101
-	sfx_1 70
-	sfx_0 0, 97
-	sfx_0 0, 101
-	sfx_1 55
-	sfx_0 0, 97
-	sfx_0 0, 101
+	sfx_pan TRUE, TRUE
+	sfx_env 9, 4
+	sfx_freq $56
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $53
+	sfx_env 12, 5
+	sfx_freq $15
+	sfx_freq $65
+	sfx_freq $63
+	sfx_freq $63
+	sfx_env 7, 5
+	sfx_freq $61
+	sfx_freq $65
+	sfx_env 4, 6
+	sfx_freq $61
+	sfx_freq $65
+	sfx_env 3, 7
+	sfx_freq $61
+	sfx_freq $65
 	sfx_end
diff --git a/src/audio/sfx/sfx_gr_blimp_hatch_open.asm b/src/audio/sfx/sfx_gr_blimp_hatch_open.asm
index 8716af6..1879377 100644
--- a/src/audio/sfx/sfx_gr_blimp_hatch_open.asm
+++ b/src/audio/sfx/sfx_gr_blimp_hatch_open.asm
@@ -1,71 +1,71 @@
 Sfx_GRBlimpHatchOpen_Ch1:
-	sfx_8 17
-	sfx_1 243
-	sfx_2 0
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 2, 34
-	sfx_0 1, 6
-	sfx_1 247
-	sfx_2 4
-	sfx_0 3, 218
-	sfx_0 4, 131
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 17
-	sfx_0 4, 131
-	sfx_1 167
-	sfx_2 4
-	sfx_0 3, 218
-	sfx_0 4, 131
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 17
-	sfx_0 4, 131
-	sfx_1 135
-	sfx_2 4
-	sfx_0 5, 60
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 3, 88
-	sfx_1 103
-	sfx_2 4
-	sfx_0 4, 22
-	sfx_2 8
-	sfx_0 2, 120
-	sfx_0 1, 107
-	sfx_1 71
-	sfx_2 4
-	sfx_0 4, 22
-	sfx_2 8
-	sfx_0 2, 120
-	sfx_0 1, 107
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 3
+	sfx_duty 0
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $222
+	sfx_freq $106
+	sfx_env 15, 7
+	sfx_duty 1
+	sfx_freq $3da
+	sfx_freq $483
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $511
+	sfx_freq $483
+	sfx_env 10, 7
+	sfx_duty 1
+	sfx_freq $3da
+	sfx_freq $483
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $511
+	sfx_freq $483
+	sfx_env 8, 7
+	sfx_duty 1
+	sfx_freq $53c
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $358
+	sfx_env 6, 7
+	sfx_duty 1
+	sfx_freq $416
+	sfx_duty 2
+	sfx_freq $278
+	sfx_freq $16b
+	sfx_env 4, 7
+	sfx_duty 1
+	sfx_freq $416
+	sfx_duty 2
+	sfx_freq $278
+	sfx_freq $16b
 	sfx_end
 
 Sfx_GRBlimpHatchOpen_Ch2:
-	sfx_8 17
-	sfx_1 148
-	sfx_0 0, 86
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 83
-	sfx_1 197
-	sfx_0 0, 21
-	sfx_0 0, 101
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_1 149
-	sfx_0 0, 21
-	sfx_0 0, 101
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_1 117
-	sfx_0 0, 97
-	sfx_0 0, 101
-	sfx_1 70
-	sfx_0 0, 97
-	sfx_0 0, 101
-	sfx_1 55
-	sfx_0 0, 97
-	sfx_0 0, 101
+	sfx_pan TRUE, TRUE
+	sfx_env 9, 4
+	sfx_freq $56
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $53
+	sfx_env 12, 5
+	sfx_freq $15
+	sfx_freq $65
+	sfx_freq $63
+	sfx_freq $63
+	sfx_env 9, 5
+	sfx_freq $15
+	sfx_freq $65
+	sfx_freq $63
+	sfx_freq $63
+	sfx_env 7, 5
+	sfx_freq $61
+	sfx_freq $65
+	sfx_env 4, 6
+	sfx_freq $61
+	sfx_freq $65
+	sfx_env 3, 7
+	sfx_freq $61
+	sfx_freq $65
 	sfx_end
diff --git a/src/audio/sfx/sfx_gr_blimp_tractor_beam.asm b/src/audio/sfx/sfx_gr_blimp_tractor_beam.asm
index 5b3a12c..e879702 100644
--- a/src/audio/sfx/sfx_gr_blimp_tractor_beam.asm
+++ b/src/audio/sfx/sfx_gr_blimp_tractor_beam.asm
@@ -1,135 +1,135 @@
 Sfx_GRBlimpTractorBeam_Ch1:
-	sfx_8 17
-	sfx_1 105
-	sfx_2 8
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 5, 60
-	sfx_0 5, 99
-	sfx_0 5, 60
-	sfx_0 5, 99
-	sfx_1 192
-	sfx_2 8
+	sfx_pan TRUE, TRUE
+	sfx_env 6, -1
+	sfx_duty 2
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $53c
+	sfx_freq $563
+	sfx_freq $53c
+	sfx_freq $563
+	sfx_env 12, 0
+	sfx_duty 2
 	sfx_loop 3
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
 	sfx_endloop
-	sfx_1 208
-	sfx_2 8
+	sfx_env 13, 0
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
 	sfx_endloop
-	sfx_1 224
-	sfx_2 8
+	sfx_env 14, 0
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
 	sfx_endloop
-	sfx_1 208
-	sfx_2 8
+	sfx_env 13, 0
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
 	sfx_endloop
-	sfx_1 176
-	sfx_2 8
+	sfx_env 11, 0
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
 	sfx_endloop
-	sfx_1 208
-	sfx_2 8
+	sfx_env 13, 0
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
 	sfx_endloop
-	sfx_1 240
-	sfx_2 8
+	sfx_env 15, 0
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
 	sfx_endloop
-	sfx_1 208
-	sfx_2 8
+	sfx_env 13, 0
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
 	sfx_endloop
-	sfx_1 176
-	sfx_2 8
+	sfx_env 11, 0
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
 	sfx_endloop
-	sfx_1 208
-	sfx_2 8
+	sfx_env 13, 0
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
 	sfx_endloop
-	sfx_1 240
-	sfx_2 8
+	sfx_env 15, 0
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
 	sfx_endloop
-	sfx_1 208
-	sfx_2 8
+	sfx_env 13, 0
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
 	sfx_endloop
-	sfx_1 240
-	sfx_2 8
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
-	sfx_1 199
-	sfx_2 8
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 5, 172
-	sfx_0 5, 205
-	sfx_1 135
-	sfx_2 8
-	sfx_0 5, 137
-	sfx_0 5, 172
-	sfx_0 5, 99
-	sfx_0 5, 137
-	sfx_1 103
-	sfx_2 8
-	sfx_0 5, 60
-	sfx_0 5, 99
-	sfx_0 5, 17
-	sfx_0 5, 60
+	sfx_env 15, 0
+	sfx_duty 2
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
+	sfx_env 12, 7
+	sfx_duty 2
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $5ac
+	sfx_freq $5cd
+	sfx_env 8, 7
+	sfx_duty 2
+	sfx_freq $589
+	sfx_freq $5ac
+	sfx_freq $563
+	sfx_freq $589
+	sfx_env 6, 7
+	sfx_duty 2
+	sfx_freq $53c
+	sfx_freq $563
+	sfx_freq $511
+	sfx_freq $53c
 	sfx_end
diff --git a/src/audio/sfx/sfx_guillotine.asm b/src/audio/sfx/sfx_guillotine.asm
index 36cb7d6..b475eb4 100644
--- a/src/audio/sfx/sfx_guillotine.asm
+++ b/src/audio/sfx/sfx_guillotine.asm
@@ -1,116 +1,116 @@
 Sfx_Guillotine_Ch1:
-	sfx_8 17
-	sfx_1 224
-	sfx_2 4
-	sfx_0 1, 6
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 1, 107
-	sfx_0 2, 34
-	sfx_0 2, 120
+	sfx_pan TRUE, TRUE
+	sfx_env 14, 0
+	sfx_duty 1
+	sfx_freq $106
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $16b
+	sfx_freq $222
+	sfx_freq $278
 	sfx_loop 3
-	sfx_0 3, 155
-	sfx_0 3, 218
-	sfx_0 3, 155
-	sfx_0 3, 218
-	sfx_0 2, 198
-	sfx_0 3, 18
-	sfx_0 2, 198
-	sfx_0 3, 18
+	sfx_freq $39b
+	sfx_freq $3da
+	sfx_freq $39b
+	sfx_freq $3da
+	sfx_freq $2c6
+	sfx_freq $312
+	sfx_freq $2c6
+	sfx_freq $312
 	sfx_endloop
-	sfx_1 243
-	sfx_2 0
-	sfx_0 5, 237
-	sfx_0 5, 17
-	sfx_0 4, 22
-	sfx_0 2, 34
-	sfx_0 0, 44
-	sfx_1 247
-	sfx_2 0
-	sfx_0 4, 131
-	sfx_0 5, 237
-	sfx_0 6, 66
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 214
-	sfx_1 151
-	sfx_2 0
-	sfx_0 4, 131
-	sfx_0 5, 237
-	sfx_0 6, 66
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 214
-	sfx_1 103
-	sfx_2 0
-	sfx_0 4, 131
-	sfx_0 5, 237
-	sfx_0 6, 66
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 214
-	sfx_1 55
-	sfx_2 0
-	sfx_0 4, 131
-	sfx_0 5, 237
-	sfx_0 6, 66
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 214
-	sfx_1 16
-	sfx_2 0
-	sfx_0 4, 131
-	sfx_0 5, 237
-	sfx_0 6, 66
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 214
+	sfx_env 15, 3
+	sfx_duty 0
+	sfx_freq $5ed
+	sfx_freq $511
+	sfx_freq $416
+	sfx_freq $222
+	sfx_freq $2c
+	sfx_env 15, 7
+	sfx_duty 0
+	sfx_freq $483
+	sfx_freq $5ed
+	sfx_freq $642
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $6d6
+	sfx_env 9, 7
+	sfx_duty 0
+	sfx_freq $483
+	sfx_freq $5ed
+	sfx_freq $642
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $6d6
+	sfx_env 6, 7
+	sfx_duty 0
+	sfx_freq $483
+	sfx_freq $5ed
+	sfx_freq $642
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $6d6
+	sfx_env 3, 7
+	sfx_duty 0
+	sfx_freq $483
+	sfx_freq $5ed
+	sfx_freq $642
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $6d6
+	sfx_env 1, 0
+	sfx_duty 0
+	sfx_freq $483
+	sfx_freq $5ed
+	sfx_freq $642
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $6d6
 	sfx_end
 
 Sfx_Guillotine_Ch2:
-	sfx_8 17
-	sfx_1 128
-	sfx_0 0, 100
-	sfx_0 0, 101
-	sfx_0 0, 100
-	sfx_0 0, 101
-	sfx_0 0, 100
-	sfx_0 0, 101
+	sfx_pan TRUE, TRUE
+	sfx_env 8, 0
+	sfx_freq $64
+	sfx_freq $65
+	sfx_freq $64
+	sfx_freq $65
+	sfx_freq $64
+	sfx_freq $65
 	sfx_loop 3
-	sfx_1 176
-	sfx_0 0, 102
-	sfx_0 0, 101
-	sfx_0 0, 102
-	sfx_0 0, 101
-	sfx_0 0, 86
-	sfx_0 0, 85
-	sfx_0 0, 86
-	sfx_0 0, 85
+	sfx_env 11, 0
+	sfx_freq $66
+	sfx_freq $65
+	sfx_freq $66
+	sfx_freq $65
+	sfx_freq $56
+	sfx_freq $55
+	sfx_freq $56
+	sfx_freq $55
 	sfx_endloop
-	sfx_1 244
-	sfx_0 0, 97
-	sfx_0 0, 99
-	sfx_0 0, 100
-	sfx_0 0, 102
-	sfx_0 0, 102
-	sfx_1 247
-	sfx_0 0, 22
-	sfx_0 0, 22
-	sfx_0 0, 22
-	sfx_0 0, 22
-	sfx_0 0, 22
-	sfx_0 0, 22
-	sfx_0 0, 22
-	sfx_1 151
-	sfx_0 0, 19
-	sfx_0 0, 65
-	sfx_0 0, 22
-	sfx_0 0, 85
-	sfx_0 0, 16
-	sfx_1 71
-	sfx_0 0, 22
-	sfx_0 0, 85
-	sfx_0 0, 80
-	sfx_0 0, 22
-	sfx_0 0, 16
+	sfx_env 15, 4
+	sfx_freq $61
+	sfx_freq $63
+	sfx_freq $64
+	sfx_freq $66
+	sfx_freq $66
+	sfx_env 15, 7
+	sfx_freq $16
+	sfx_freq $16
+	sfx_freq $16
+	sfx_freq $16
+	sfx_freq $16
+	sfx_freq $16
+	sfx_freq $16
+	sfx_env 9, 7
+	sfx_freq $13
+	sfx_freq $41
+	sfx_freq $16
+	sfx_freq $55
+	sfx_freq $10
+	sfx_env 4, 7
+	sfx_freq $16
+	sfx_freq $55
+	sfx_freq $50
+	sfx_freq $16
+	sfx_freq $10
 	sfx_end
diff --git a/src/audio/sfx/sfx_heal.asm b/src/audio/sfx/sfx_heal.asm
index d460d48..b6fc8c0 100644
--- a/src/audio/sfx/sfx_heal.asm
+++ b/src/audio/sfx/sfx_heal.asm
@@ -1,87 +1,87 @@
 Sfx_Heal_Ch1:
-	sfx_1 228
-	sfx_8 17
-	sfx_2 4
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 196
-	sfx_2 4
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 132
-	sfx_2 4
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 100
-	sfx_2 4
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 68
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 36
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 20
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
+	sfx_env 14, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 1
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 12, 4
+	sfx_duty 1
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 8, 4
+	sfx_duty 1
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 6, 4
+	sfx_duty 1
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 4, 4
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 2, 4
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 1, 4
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
 	sfx_end
diff --git a/src/audio/sfx/sfx_healing_wind.asm b/src/audio/sfx/sfx_healing_wind.asm
index c276dc6..7907a2c 100644
--- a/src/audio/sfx/sfx_healing_wind.asm
+++ b/src/audio/sfx/sfx_healing_wind.asm
@@ -1,147 +1,147 @@
 Sfx_HealingWind_Ch1:
-	sfx_1 228
-	sfx_8 17
-	sfx_2 4
-	sfx_0 7, 193
-	sfx_0 7, 182
-	sfx_0 7, 200
-	sfx_0 7, 190
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 196
-	sfx_2 4
-	sfx_0 7, 193
-	sfx_0 7, 182
-	sfx_0 7, 200
-	sfx_0 7, 190
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 164
-	sfx_2 4
-	sfx_0 7, 193
-	sfx_0 7, 182
-	sfx_0 7, 200
-	sfx_0 7, 190
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 148
-	sfx_2 4
-	sfx_0 7, 193
-	sfx_0 7, 182
-	sfx_0 7, 200
-	sfx_0 7, 190
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 132
-	sfx_2 4
-	sfx_0 7, 193
-	sfx_0 7, 182
-	sfx_0 7, 200
-	sfx_0 7, 190
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 100
-	sfx_2 4
-	sfx_0 7, 193
-	sfx_0 7, 182
-	sfx_0 7, 200
-	sfx_0 7, 190
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 68
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 182
-	sfx_0 7, 200
-	sfx_0 7, 190
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 36
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 182
-	sfx_0 7, 200
-	sfx_0 7, 190
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
-	sfx_1 20
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 182
-	sfx_0 7, 200
-	sfx_0 7, 190
-	sfx_0 7, 206
-	sfx_0 7, 182
-	sfx_0 7, 209
-	sfx_0 7, 190
-	sfx_0 7, 214
-	sfx_0 7, 193
-	sfx_0 7, 219
-	sfx_0 7, 200
-	sfx_0 7, 223
-	sfx_0 7, 206
+	sfx_env 14, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 1
+	sfx_freq $7c1
+	sfx_freq $7b6
+	sfx_freq $7c8
+	sfx_freq $7be
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 12, 4
+	sfx_duty 1
+	sfx_freq $7c1
+	sfx_freq $7b6
+	sfx_freq $7c8
+	sfx_freq $7be
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 10, 4
+	sfx_duty 1
+	sfx_freq $7c1
+	sfx_freq $7b6
+	sfx_freq $7c8
+	sfx_freq $7be
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 9, 4
+	sfx_duty 1
+	sfx_freq $7c1
+	sfx_freq $7b6
+	sfx_freq $7c8
+	sfx_freq $7be
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 8, 4
+	sfx_duty 1
+	sfx_freq $7c1
+	sfx_freq $7b6
+	sfx_freq $7c8
+	sfx_freq $7be
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 6, 4
+	sfx_duty 1
+	sfx_freq $7c1
+	sfx_freq $7b6
+	sfx_freq $7c8
+	sfx_freq $7be
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 4, 4
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7b6
+	sfx_freq $7c8
+	sfx_freq $7be
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 2, 4
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7b6
+	sfx_freq $7c8
+	sfx_freq $7be
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
+	sfx_env 1, 4
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7b6
+	sfx_freq $7c8
+	sfx_freq $7be
+	sfx_freq $7ce
+	sfx_freq $7b6
+	sfx_freq $7d1
+	sfx_freq $7be
+	sfx_freq $7d6
+	sfx_freq $7c1
+	sfx_freq $7db
+	sfx_freq $7c8
+	sfx_freq $7df
+	sfx_freq $7ce
 	sfx_end
diff --git a/src/audio/sfx/sfx_hit.asm b/src/audio/sfx/sfx_hit.asm
index 9c49068..658beb9 100644
--- a/src/audio/sfx/sfx_hit.asm
+++ b/src/audio/sfx/sfx_hit.asm
@@ -1,66 +1,66 @@
 Sfx_Hit_Ch1:
-	sfx_8 17
-	sfx_1 241
-	sfx_0 0, 45
-	sfx_0 0, 77
-	sfx_0 0, 45
-	sfx_0 0, 77
-	sfx_0 0, 45
-	sfx_0 0, 77
-	sfx_1 209
-	sfx_0 0, 69
-	sfx_0 0, 20
-	sfx_0 0, 67
-	sfx_0 0, 51
-	sfx_0 0, 50
-	sfx_0 0, 51
-	sfx_1 193
-	sfx_0 0, 50
-	sfx_0 0, 51
-	sfx_0 0, 50
-	sfx_0 0, 51
-	sfx_0 0, 50
-	sfx_0 0, 49
-	sfx_1 145
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_1 129
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_1 113
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_1 97
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_1 65
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 80
-	sfx_1 33
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_1 17
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 1
+	sfx_freq $2d
+	sfx_freq $4d
+	sfx_freq $2d
+	sfx_freq $4d
+	sfx_freq $2d
+	sfx_freq $4d
+	sfx_env 13, 1
+	sfx_freq $45
+	sfx_freq $14
+	sfx_freq $43
+	sfx_freq $33
+	sfx_freq $32
+	sfx_freq $33
+	sfx_env 12, 1
+	sfx_freq $32
+	sfx_freq $33
+	sfx_freq $32
+	sfx_freq $33
+	sfx_freq $32
+	sfx_freq $31
+	sfx_env 9, 1
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_env 8, 1
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_env 7, 1
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_env 6, 1
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_env 4, 1
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $50
+	sfx_env 2, 1
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_env 1, 1
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
 	sfx_end
diff --git a/src/audio/sfx/sfx_hydro_pump.asm b/src/audio/sfx/sfx_hydro_pump.asm
index 1b6c72a..35cf15d 100644
--- a/src/audio/sfx/sfx_hydro_pump.asm
+++ b/src/audio/sfx/sfx_hydro_pump.asm
@@ -1,123 +1,123 @@
 Sfx_HydroPump_Ch1:
-	sfx_8 17
-	sfx_1 246
-	sfx_0 0, 132
-	sfx_0 0, 129
-	sfx_0 0, 132
-	sfx_0 0, 17
-	sfx_0 0, 20
-	sfx_0 0, 81
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_1 198
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_1 111
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_1 246
-	sfx_0 0, 132
-	sfx_0 0, 129
-	sfx_0 0, 132
-	sfx_0 0, 17
-	sfx_0 0, 20
-	sfx_0 0, 81
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_1 134
-	sfx_0 0, 84
-	sfx_0 0, 81
-	sfx_0 0, 84
-	sfx_0 0, 81
-	sfx_0 0, 84
-	sfx_0 0, 81
-	sfx_0 0, 84
-	sfx_0 0, 81
-	sfx_0 0, 84
-	sfx_0 0, 81
-	sfx_0 0, 84
-	sfx_0 0, 81
-	sfx_0 0, 84
-	sfx_0 0, 81
-	sfx_0 0, 84
-	sfx_0 0, 81
-	sfx_1 102
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_0 0, 68
-	sfx_0 0, 65
-	sfx_1 70
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_0 0, 52
-	sfx_0 0, 49
-	sfx_1 22
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_0 0, 36
-	sfx_0 0, 33
-	sfx_0 0, 36
-	sfx_0 0, 33
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 6
+	sfx_freq $84
+	sfx_freq $81
+	sfx_freq $84
+	sfx_freq $11
+	sfx_freq $14
+	sfx_freq $51
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $34
+	sfx_freq $31
+	sfx_freq $34
+	sfx_freq $31
+	sfx_env 12, 6
+	sfx_freq $34
+	sfx_freq $31
+	sfx_freq $24
+	sfx_freq $21
+	sfx_env 6, -7
+	sfx_freq $24
+	sfx_freq $21
+	sfx_freq $24
+	sfx_freq $21
+	sfx_env 15, 6
+	sfx_freq $84
+	sfx_freq $81
+	sfx_freq $84
+	sfx_freq $11
+	sfx_freq $14
+	sfx_freq $51
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $34
+	sfx_freq $31
+	sfx_freq $34
+	sfx_freq $31
+	sfx_freq $34
+	sfx_freq $31
+	sfx_freq $24
+	sfx_freq $21
+	sfx_freq $24
+	sfx_freq $21
+	sfx_freq $24
+	sfx_freq $21
+	sfx_env 8, 6
+	sfx_freq $54
+	sfx_freq $51
+	sfx_freq $54
+	sfx_freq $51
+	sfx_freq $54
+	sfx_freq $51
+	sfx_freq $54
+	sfx_freq $51
+	sfx_freq $54
+	sfx_freq $51
+	sfx_freq $54
+	sfx_freq $51
+	sfx_freq $54
+	sfx_freq $51
+	sfx_freq $54
+	sfx_freq $51
+	sfx_env 6, 6
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $44
+	sfx_freq $41
+	sfx_freq $44
+	sfx_freq $41
+	sfx_env 4, 6
+	sfx_freq $34
+	sfx_freq $31
+	sfx_freq $34
+	sfx_freq $31
+	sfx_freq $34
+	sfx_freq $31
+	sfx_freq $34
+	sfx_freq $31
+	sfx_freq $34
+	sfx_freq $31
+	sfx_freq $34
+	sfx_freq $31
+	sfx_freq $34
+	sfx_freq $31
+	sfx_freq $34
+	sfx_freq $31
+	sfx_env 1, 6
+	sfx_freq $24
+	sfx_freq $21
+	sfx_freq $24
+	sfx_freq $21
+	sfx_freq $24
+	sfx_freq $21
+	sfx_freq $24
+	sfx_freq $21
+	sfx_freq $24
+	sfx_freq $21
+	sfx_freq $24
+	sfx_freq $21
+	sfx_freq $24
+	sfx_freq $21
+	sfx_freq $24
+	sfx_freq $21
 	sfx_end
diff --git a/src/audio/sfx/sfx_hyper_beam.asm b/src/audio/sfx/sfx_hyper_beam.asm
index d5fefe1..2000955 100644
--- a/src/audio/sfx/sfx_hyper_beam.asm
+++ b/src/audio/sfx/sfx_hyper_beam.asm
@@ -1,81 +1,81 @@
 Sfx_HyperBeam_Ch1:
-	sfx_1 100
-	sfx_8 17
-	sfx_2 4
-	sfx_0 7, 186
-	sfx_0 7, 190
+	sfx_env 6, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 1
+	sfx_freq $7ba
+	sfx_freq $7be
 	sfx_loop 5
-	sfx_1 228
-	sfx_2 4
-	sfx_0 7, 131
-	sfx_0 7, 138
-	sfx_0 7, 144
+	sfx_env 14, 4
+	sfx_duty 1
+	sfx_freq $783
+	sfx_freq $78a
+	sfx_freq $790
 	sfx_endloop
-	sfx_1 100
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_1 52
-	sfx_2 0
-	sfx_0 7, 131
+	sfx_env 6, 4
+	sfx_duty 0
+	sfx_freq $783
+	sfx_env 3, 4
+	sfx_duty 0
+	sfx_freq $783
 	sfx_end
 
 Sfx_HyperBeam_Ch2:
-	sfx_8 17
-	sfx_1 0
-	sfx_5 0
-	sfx_6 16
-	sfx_5 255
-	sfx_1 1
-	sfx_1 255
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 143
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 79
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 47
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 31
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
+	sfx_pan TRUE, TRUE
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 16
+	sfx_pitch_offset -1
+	sfx_env 0, 1
+	sfx_env 15, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 8, -7
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 4, -7
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 2, -7
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 1, -7
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
 	sfx_end
diff --git a/src/audio/sfx/sfx_ice_punch.asm b/src/audio/sfx/sfx_ice_punch.asm
index 37c7445..2e09af0 100644
--- a/src/audio/sfx/sfx_ice_punch.asm
+++ b/src/audio/sfx/sfx_ice_punch.asm
@@ -1,158 +1,158 @@
 Sfx_IcePunch_Ch1:
-	sfx_1 255
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_6 1
-	sfx_1 255
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_6 1
-	sfx_1 143
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_6 1
-	sfx_1 79
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_6 1
-	sfx_1 31
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_1 0
-	sfx_6 15
-	sfx_1 33
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_1 65
-	sfx_2 0
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_1 97
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_1 129
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_1 97
-	sfx_2 0
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_1 65
-	sfx_2 0
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_1 33
-	sfx_2 0
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_1 255
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_6 1
-	sfx_1 255
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_6 1
-	sfx_1 143
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_6 1
-	sfx_1 79
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_6 1
-	sfx_1 31
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 107
-	sfx_1 0
-	sfx_6 15
-	sfx_1 33
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_1 65
-	sfx_2 0
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_1 97
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_1 129
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_1 97
-	sfx_2 0
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_1 65
-	sfx_2 0
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_1 33
-	sfx_2 0
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 219
-	sfx_0 7, 223
-	sfx_0 7, 209
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 4, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 1, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_env 0, 0
+	sfx_wait 15
+	sfx_env 2, 1
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_env 4, 1
+	sfx_duty 0
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_env 6, 1
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_env 8, 1
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_env 6, 1
+	sfx_duty 0
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_env 4, 1
+	sfx_duty 0
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_env 2, 1
+	sfx_duty 0
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 4, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 1, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $76b
+	sfx_env 0, 0
+	sfx_wait 15
+	sfx_env 2, 1
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_env 4, 1
+	sfx_duty 0
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_env 6, 1
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_env 8, 1
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_env 6, 1
+	sfx_duty 0
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_env 4, 1
+	sfx_duty 0
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_env 2, 1
+	sfx_duty 0
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7db
+	sfx_freq $7df
+	sfx_freq $7d1
 	sfx_end
diff --git a/src/audio/sfx/sfx_jingle.asm b/src/audio/sfx/sfx_jingle.asm
index df160a8..08a3728 100644
--- a/src/audio/sfx/sfx_jingle.asm
+++ b/src/audio/sfx/sfx_jingle.asm
@@ -1,66 +1,66 @@
 Sfx_Jingle_Ch1:
-	sfx_1 241
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 5
-	sfx_0 7, 33
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_0 7, 89
-	sfx_1 241
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 172
-	sfx_1 241
-	sfx_2 8
-	sfx_0 7, 193
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 214
-	sfx_1 129
-	sfx_2 4
-	sfx_0 7, 33
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_0 7, 89
-	sfx_0 7, 107
-	sfx_1 129
-	sfx_2 4
-	sfx_0 7, 144
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_1 129
-	sfx_2 4
-	sfx_0 7, 200
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 214
-	sfx_0 7, 219
-	sfx_1 49
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_0 7, 89
-	sfx_0 7, 107
-	sfx_0 7, 123
-	sfx_1 49
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_0 7, 190
-	sfx_1 49
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 214
-	sfx_0 7, 219
-	sfx_0 7, 223
+	sfx_env 15, 1
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $705
+	sfx_freq $721
+	sfx_freq $739
+	sfx_freq $744
+	sfx_freq $759
+	sfx_env 15, 1
+	sfx_duty 2
+	sfx_freq $783
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7ac
+	sfx_env 15, 1
+	sfx_duty 2
+	sfx_freq $7c1
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d6
+	sfx_env 8, 1
+	sfx_duty 1
+	sfx_freq $721
+	sfx_freq $739
+	sfx_freq $744
+	sfx_freq $759
+	sfx_freq $76b
+	sfx_env 8, 1
+	sfx_duty 1
+	sfx_freq $790
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_env 8, 1
+	sfx_duty 1
+	sfx_freq $7c8
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d6
+	sfx_freq $7db
+	sfx_env 3, 1
+	sfx_duty 0
+	sfx_freq $739
+	sfx_freq $744
+	sfx_freq $759
+	sfx_freq $76b
+	sfx_freq $77b
+	sfx_env 3, 1
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_freq $7be
+	sfx_env 3, 1
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d6
+	sfx_freq $7db
+	sfx_freq $7df
 	sfx_end
diff --git a/src/audio/sfx/sfx_kick.asm b/src/audio/sfx/sfx_kick.asm
index 78b3ba2..3425b02 100644
--- a/src/audio/sfx/sfx_kick.asm
+++ b/src/audio/sfx/sfx_kick.asm
@@ -1,90 +1,90 @@
 Sfx_Kick_Ch1:
-	sfx_1 61
-	sfx_8 17
-	sfx_2 4
-	sfx_0 2, 198
-	sfx_0 3, 18
-	sfx_0 3, 88
-	sfx_0 3, 18
-	sfx_0 3, 88
-	sfx_0 3, 18
-	sfx_1 93
-	sfx_2 4
-	sfx_0 3, 155
-	sfx_0 3, 88
-	sfx_0 3, 155
-	sfx_0 3, 218
-	sfx_0 4, 22
-	sfx_0 3, 218
-	sfx_1 173
-	sfx_2 4
-	sfx_0 3, 155
-	sfx_0 3, 218
-	sfx_0 4, 22
-	sfx_0 4, 78
-	sfx_0 4, 131
-	sfx_1 205
-	sfx_2 4
-	sfx_0 4, 181
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 5, 205
-	sfx_0 5, 172
-	sfx_0 6, 11
-	sfx_1 244
-	sfx_2 4
-	sfx_0 6, 40
-	sfx_0 5, 137
-	sfx_0 5, 60
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 4, 131
-	sfx_1 103
-	sfx_2 4
-	sfx_0 4, 78
-	sfx_0 4, 22
-	sfx_0 3, 218
-	sfx_0 3, 155
-	sfx_1 55
-	sfx_2 4
-	sfx_0 3, 88
-	sfx_0 3, 18
-	sfx_0 2, 198
-	sfx_0 2, 120
-	sfx_1 23
-	sfx_2 4
-	sfx_0 2, 34
-	sfx_0 1, 201
-	sfx_0 1, 107
+	sfx_env 3, -5
+	sfx_pan TRUE, TRUE
+	sfx_duty 1
+	sfx_freq $2c6
+	sfx_freq $312
+	sfx_freq $358
+	sfx_freq $312
+	sfx_freq $358
+	sfx_freq $312
+	sfx_env 5, -5
+	sfx_duty 1
+	sfx_freq $39b
+	sfx_freq $358
+	sfx_freq $39b
+	sfx_freq $3da
+	sfx_freq $416
+	sfx_freq $3da
+	sfx_env 10, -5
+	sfx_duty 1
+	sfx_freq $39b
+	sfx_freq $3da
+	sfx_freq $416
+	sfx_freq $44e
+	sfx_freq $483
+	sfx_env 12, -5
+	sfx_duty 1
+	sfx_freq $4b5
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $5cd
+	sfx_freq $5ac
+	sfx_freq $60b
+	sfx_env 15, 4
+	sfx_duty 1
+	sfx_freq $628
+	sfx_freq $589
+	sfx_freq $53c
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $483
+	sfx_env 6, 7
+	sfx_duty 1
+	sfx_freq $44e
+	sfx_freq $416
+	sfx_freq $3da
+	sfx_freq $39b
+	sfx_env 3, 7
+	sfx_duty 1
+	sfx_freq $358
+	sfx_freq $312
+	sfx_freq $2c6
+	sfx_freq $278
+	sfx_env 1, 7
+	sfx_duty 1
+	sfx_freq $222
+	sfx_freq $1c9
+	sfx_freq $16b
 	sfx_end
 
 Sfx_Kick_Ch2:
-	sfx_8 17
-	sfx_1 0
-	sfx_6 23
-	sfx_1 164
-	sfx_0 0, 53
-	sfx_0 0, 69
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_0 0, 85
-	sfx_0 0, 68
-	sfx_1 247
-	sfx_0 0, 21
-	sfx_0 0, 21
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 84
-	sfx_1 102
-	sfx_0 0, 84
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_1 53
-	sfx_0 0, 85
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 101
+	sfx_pan TRUE, TRUE
+	sfx_env 0, 0
+	sfx_wait 23
+	sfx_env 10, 4
+	sfx_freq $35
+	sfx_freq $45
+	sfx_freq $64
+	sfx_freq $64
+	sfx_freq $55
+	sfx_freq $44
+	sfx_env 15, 7
+	sfx_freq $15
+	sfx_freq $15
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $54
+	sfx_env 6, 6
+	sfx_freq $54
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_env 3, 5
+	sfx_freq $55
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $65
 	sfx_end
diff --git a/src/audio/sfx/sfx_leer.asm b/src/audio/sfx/sfx_leer.asm
index 3a04218..6284d2a 100644
--- a/src/audio/sfx/sfx_leer.asm
+++ b/src/audio/sfx/sfx_leer.asm
@@ -1,60 +1,60 @@
 Sfx_Leer_Ch1:
-	sfx_1 255
-	sfx_8 17
-	sfx_2 0
-	sfx_0 4, 22
-	sfx_0 4, 78
-	sfx_0 4, 131
-	sfx_0 4, 181
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 131
-	sfx_0 4, 78
-	sfx_0 4, 22
-	sfx_0 4, 131
-	sfx_0 4, 181
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 5, 60
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 131
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 5, 60
-	sfx_0 5, 99
-	sfx_0 5, 137
-	sfx_0 5, 99
-	sfx_0 5, 60
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_1 143
-	sfx_2 0
-	sfx_0 5, 17
-	sfx_0 5, 60
-	sfx_0 5, 99
-	sfx_0 5, 137
-	sfx_0 5, 172
-	sfx_0 5, 205
-	sfx_0 5, 172
-	sfx_0 5, 137
-	sfx_0 5, 99
-	sfx_0 5, 60
-	sfx_0 5, 17
-	sfx_1 79
-	sfx_2 0
-	sfx_0 5, 99
-	sfx_0 5, 137
-	sfx_0 5, 172
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_1 47
-	sfx_2 0
-	sfx_0 6, 11
-	sfx_0 6, 246
-	sfx_0 6, 231
-	sfx_0 6, 214
-	sfx_0 6, 196
-	sfx_0 6, 178
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $416
+	sfx_freq $44e
+	sfx_freq $483
+	sfx_freq $4b5
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $483
+	sfx_freq $44e
+	sfx_freq $416
+	sfx_freq $483
+	sfx_freq $4b5
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $53c
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $483
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $53c
+	sfx_freq $563
+	sfx_freq $589
+	sfx_freq $563
+	sfx_freq $53c
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $511
+	sfx_freq $53c
+	sfx_freq $563
+	sfx_freq $589
+	sfx_freq $5ac
+	sfx_freq $5cd
+	sfx_freq $5ac
+	sfx_freq $589
+	sfx_freq $563
+	sfx_freq $53c
+	sfx_freq $511
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $563
+	sfx_freq $589
+	sfx_freq $5ac
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $60b
+	sfx_freq $6f6
+	sfx_freq $6e7
+	sfx_freq $6d6
+	sfx_freq $6c4
+	sfx_freq $6b2
 	sfx_end
diff --git a/src/audio/sfx/sfx_lightning.asm b/src/audio/sfx/sfx_lightning.asm
index 0e6fc48..e3d844b 100644
--- a/src/audio/sfx/sfx_lightning.asm
+++ b/src/audio/sfx/sfx_lightning.asm
@@ -1,68 +1,68 @@
 Sfx_Lightning_Ch1:
-	sfx_8 17
-	sfx_1 240
-	sfx_0 0, 98
-	sfx_0 0, 96
-	sfx_0 0, 98
-	sfx_0 0, 96
-	sfx_0 0, 98
-	sfx_0 0, 96
-	sfx_0 0, 98
-	sfx_0 0, 96
-	sfx_0 0, 98
-	sfx_0 0, 96
-	sfx_0 0, 98
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_1 128
-	sfx_0 0, 98
-	sfx_0 0, 20
-	sfx_0 0, 20
-	sfx_0 0, 20
-	sfx_0 0, 20
-	sfx_0 0, 20
-	sfx_0 0, 21
-	sfx_0 0, 21
-	sfx_0 0, 21
-	sfx_0 0, 21
-	sfx_0 0, 21
-	sfx_1 64
-	sfx_0 0, 21
-	sfx_0 0, 21
-	sfx_0 0, 23
-	sfx_0 0, 23
-	sfx_0 0, 23
-	sfx_0 0, 23
-	sfx_0 0, 23
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_1 32
-	sfx_0 0, 20
-	sfx_0 0, 20
-	sfx_0 0, 20
-	sfx_0 0, 20
-	sfx_0 0, 21
-	sfx_0 0, 21
-	sfx_0 0, 21
-	sfx_1 16
-	sfx_0 0, 21
-	sfx_0 0, 21
-	sfx_0 0, 23
-	sfx_0 0, 23
-	sfx_0 0, 23
-	sfx_0 0, 23
-	sfx_0 0, 23
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 0
+	sfx_freq $62
+	sfx_freq $60
+	sfx_freq $62
+	sfx_freq $60
+	sfx_freq $62
+	sfx_freq $60
+	sfx_freq $62
+	sfx_freq $60
+	sfx_freq $62
+	sfx_freq $60
+	sfx_freq $62
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_env 8, 0
+	sfx_freq $62
+	sfx_freq $14
+	sfx_freq $14
+	sfx_freq $14
+	sfx_freq $14
+	sfx_freq $14
+	sfx_freq $15
+	sfx_freq $15
+	sfx_freq $15
+	sfx_freq $15
+	sfx_freq $15
+	sfx_env 4, 0
+	sfx_freq $15
+	sfx_freq $15
+	sfx_freq $17
+	sfx_freq $17
+	sfx_freq $17
+	sfx_freq $17
+	sfx_freq $17
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_env 2, 0
+	sfx_freq $14
+	sfx_freq $14
+	sfx_freq $14
+	sfx_freq $14
+	sfx_freq $15
+	sfx_freq $15
+	sfx_freq $15
+	sfx_env 1, 0
+	sfx_freq $15
+	sfx_freq $15
+	sfx_freq $17
+	sfx_freq $17
+	sfx_freq $17
+	sfx_freq $17
+	sfx_freq $17
 	sfx_end
diff --git a/src/audio/sfx/sfx_lure.asm b/src/audio/sfx/sfx_lure.asm
index c61f871..9f3b3ef 100644
--- a/src/audio/sfx/sfx_lure.asm
+++ b/src/audio/sfx/sfx_lure.asm
@@ -1,41 +1,41 @@
 Sfx_Lure_Ch1:
-	sfx_8 17
-	sfx_1 255
-	sfx_2 0
-	sfx_1 0
-	sfx_5 0
-	sfx_6 8
-	sfx_5 255
-	sfx_1 255
+	sfx_pan TRUE, TRUE
+	sfx_env 15, -7
+	sfx_duty 0
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 8
+	sfx_pitch_offset -1
+	sfx_env 15, -7
 	sfx_loop 4
-	sfx_0 7, 223
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
+	sfx_freq $7df
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
 	sfx_endloop
-	sfx_1 143
-	sfx_2 0
+	sfx_env 8, -7
+	sfx_duty 0
 	sfx_loop 4
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
 	sfx_endloop
-	sfx_1 79
-	sfx_2 0
+	sfx_env 4, -7
+	sfx_duty 0
 	sfx_loop 4
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
 	sfx_endloop
-	sfx_1 31
-	sfx_2 0
+	sfx_env 1, -7
+	sfx_duty 0
 	sfx_loop 4
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_mega_punch.asm b/src/audio/sfx/sfx_mega_punch.asm
index dd0c928..ccb2b97 100644
--- a/src/audio/sfx/sfx_mega_punch.asm
+++ b/src/audio/sfx/sfx_mega_punch.asm
@@ -1,109 +1,109 @@
 Sfx_MegaPunch_Ch1:
-	sfx_1 247
-	sfx_8 17
-	sfx_2 0
-	sfx_0 1, 201
-	sfx_0 2, 34
-	sfx_0 2, 120
-	sfx_0 2, 198
-	sfx_0 3, 18
-	sfx_0 3, 88
-	sfx_0 3, 155
-	sfx_1 189
-	sfx_2 0
-	sfx_0 3, 218
-	sfx_0 4, 22
-	sfx_0 4, 78
-	sfx_0 4, 131
-	sfx_5 0
-	sfx_6 1
-	sfx_0 4, 78
-	sfx_6 1
-	sfx_1 240
-	sfx_2 0
-	sfx_0 4, 22
-	sfx_6 1
-	sfx_0 3, 218
-	sfx_6 1
-	sfx_0 3, 155
-	sfx_6 1
-	sfx_0 3, 88
-	sfx_6 1
-	sfx_1 255
-	sfx_2 8
-	sfx_0 6, 246
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_1 255
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 0, 156
-	sfx_0 0, 44
-	sfx_1 245
-	sfx_2 0
-	sfx_0 6, 11
-	sfx_0 6, 137
-	sfx_1 149
-	sfx_2 0
-	sfx_0 6, 231
-	sfx_0 6, 91
-	sfx_1 85
-	sfx_2 0
-	sfx_0 6, 231
-	sfx_0 6, 91
-	sfx_1 53
-	sfx_2 0
-	sfx_0 6, 231
-	sfx_0 6, 91
+	sfx_env 15, 7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $1c9
+	sfx_freq $222
+	sfx_freq $278
+	sfx_freq $2c6
+	sfx_freq $312
+	sfx_freq $358
+	sfx_freq $39b
+	sfx_env 11, -5
+	sfx_duty 0
+	sfx_freq $3da
+	sfx_freq $416
+	sfx_freq $44e
+	sfx_freq $483
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $44e
+	sfx_wait 1
+	sfx_env 15, 0
+	sfx_duty 0
+	sfx_freq $416
+	sfx_wait 1
+	sfx_freq $3da
+	sfx_wait 1
+	sfx_freq $39b
+	sfx_wait 1
+	sfx_freq $358
+	sfx_wait 1
+	sfx_env 15, -7
+	sfx_duty 2
+	sfx_freq $6f6
+	sfx_freq $563
+	sfx_freq $416
+	sfx_env 15, -7
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $9c
+	sfx_freq $2c
+	sfx_env 15, 5
+	sfx_duty 0
+	sfx_freq $60b
+	sfx_freq $689
+	sfx_env 9, 5
+	sfx_duty 0
+	sfx_freq $6e7
+	sfx_freq $65b
+	sfx_env 5, 5
+	sfx_duty 0
+	sfx_freq $6e7
+	sfx_freq $65b
+	sfx_env 3, 5
+	sfx_duty 0
+	sfx_freq $6e7
+	sfx_freq $65b
 	sfx_end
 
 Sfx_MegaPunch_Ch2:
-	sfx_8 17
-	sfx_1 31
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 3
-	sfx_0 0, 3
-	sfx_0 0, 3
-	sfx_0 0, 4
-	sfx_0 0, 5
-	sfx_0 0, 15
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_1 244
-	sfx_0 0, 15
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 67
-	sfx_0 0, 77
-	sfx_0 0, 76
-	sfx_0 0, 76
-	sfx_1 115
-	sfx_0 0, 67
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 76
-	sfx_0 0, 76
-	sfx_0 0, 76
-	sfx_0 0, 76
-	sfx_1 66
-	sfx_0 0, 67
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 76
-	sfx_0 0, 76
-	sfx_0 0, 76
-	sfx_0 0, 76
+	sfx_pan TRUE, TRUE
+	sfx_env 1, -7
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $3
+	sfx_freq $3
+	sfx_freq $3
+	sfx_freq $4
+	sfx_freq $5
+	sfx_freq $f
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $11
+	sfx_freq $11
+	sfx_env 15, 4
+	sfx_freq $f
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $43
+	sfx_freq $4d
+	sfx_freq $4c
+	sfx_freq $4c
+	sfx_env 7, 3
+	sfx_freq $43
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $4c
+	sfx_freq $4c
+	sfx_freq $4c
+	sfx_freq $4c
+	sfx_env 4, 2
+	sfx_freq $43
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $4c
+	sfx_freq $4c
+	sfx_freq $4c
+	sfx_freq $4c
 	sfx_end
diff --git a/src/audio/sfx/sfx_needles.asm b/src/audio/sfx/sfx_needles.asm
index 9c0789c..2930e52 100644
--- a/src/audio/sfx/sfx_needles.asm
+++ b/src/audio/sfx/sfx_needles.asm
@@ -1,19 +1,19 @@
 Sfx_Needles_Ch1:
-	sfx_8 17
-	sfx_2 8
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
 	sfx_loop 3
-	sfx_1 127
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 127
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 12
-	sfx_5 255
-	sfx_1 127
+	sfx_env 7, -7
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 7, -7
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 12
+	sfx_pitch_offset -1
+	sfx_env 7, -7
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_new_mail.asm b/src/audio/sfx/sfx_new_mail.asm
index 709e880..5acebaa 100644
--- a/src/audio/sfx/sfx_new_mail.asm
+++ b/src/audio/sfx/sfx_new_mail.asm
@@ -1,20 +1,20 @@
 Sfx_NewMail_Ch1:
-	sfx_8 17
-	sfx_1 195
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_5 0
-	sfx_6 15
-	sfx_1 197
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_6 15
-	sfx_1 69
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_6 7
-	sfx_1 37
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_6 7
+	sfx_pan TRUE, TRUE
+	sfx_env 12, 3
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_pitch_offset 0
+	sfx_wait 15
+	sfx_env 12, 5
+	sfx_duty 2
+	sfx_freq $783
+	sfx_wait 15
+	sfx_env 4, 5
+	sfx_duty 2
+	sfx_freq $783
+	sfx_wait 7
+	sfx_env 2, 5
+	sfx_duty 2
+	sfx_freq $783
+	sfx_wait 7
 	sfx_end
diff --git a/src/audio/sfx/sfx_nine_tails.asm b/src/audio/sfx/sfx_nine_tails.asm
index 89dde36..24ba9b3 100644
--- a/src/audio/sfx/sfx_nine_tails.asm
+++ b/src/audio/sfx/sfx_nine_tails.asm
@@ -1,96 +1,96 @@
 Sfx_NineTails_Ch1:
-	sfx_8 17
-	sfx_1 0
-	sfx_6 35
-	sfx_2 4
-	sfx_1 75
-	sfx_0 5, 17
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 66
-	sfx_0 6, 158
-	sfx_0 6, 231
-	sfx_0 7, 57
-	sfx_0 7, 98
-	sfx_0 7, 131
+	sfx_pan TRUE, TRUE
+	sfx_env 0, 0
+	sfx_wait 35
+	sfx_duty 1
+	sfx_env 4, -3
+	sfx_freq $511
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $642
+	sfx_freq $69e
+	sfx_freq $6e7
+	sfx_freq $739
+	sfx_freq $762
+	sfx_freq $783
 	sfx_loop 8
-	sfx_1 32
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_1 48
-	sfx_0 7, 209
-	sfx_1 80
-	sfx_0 7, 221
-	sfx_1 32
-	sfx_0 7, 209
-	sfx_1 48
-	sfx_0 7, 223
-	sfx_1 80
-	sfx_0 7, 214
+	sfx_env 2, 0
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_env 3, 0
+	sfx_freq $7d1
+	sfx_env 5, 0
+	sfx_freq $7dd
+	sfx_env 2, 0
+	sfx_freq $7d1
+	sfx_env 3, 0
+	sfx_freq $7df
+	sfx_env 5, 0
+	sfx_freq $7d6
 	sfx_endloop
-	sfx_1 32
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_1 48
-	sfx_0 7, 209
-	sfx_1 80
-	sfx_0 7, 221
+	sfx_env 2, 0
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_env 3, 0
+	sfx_freq $7d1
+	sfx_env 5, 0
+	sfx_freq $7dd
 	sfx_end
 
 Sfx_NineTails_Ch2:
-	sfx_8 17
-	sfx_1 27
-	sfx_0 0, 54
-	sfx_0 0, 54
-	sfx_0 0, 54
-	sfx_0 0, 54
-	sfx_1 75
-	sfx_0 0, 54
-	sfx_0 0, 54
-	sfx_0 0, 54
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_1 123
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 51
-	sfx_0 0, 50
-	sfx_0 0, 49
-	sfx_1 155
-	sfx_0 0, 48
-	sfx_0 0, 48
-	sfx_0 0, 48
-	sfx_0 0, 32
-	sfx_0 0, 32
-	sfx_0 0, 32
-	sfx_0 0, 32
-	sfx_0 0, 32
-	sfx_0 0, 32
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 3
+	sfx_pan TRUE, TRUE
+	sfx_env 1, -3
+	sfx_freq $36
+	sfx_freq $36
+	sfx_freq $36
+	sfx_freq $36
+	sfx_env 4, -3
+	sfx_freq $36
+	sfx_freq $36
+	sfx_freq $36
+	sfx_freq $34
+	sfx_freq $34
+	sfx_env 7, -3
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $33
+	sfx_freq $32
+	sfx_freq $31
+	sfx_env 9, -3
+	sfx_freq $30
+	sfx_freq $30
+	sfx_freq $30
+	sfx_freq $20
+	sfx_freq $20
+	sfx_freq $20
+	sfx_freq $20
+	sfx_freq $20
+	sfx_freq $20
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $3
 	sfx_loop 9
-	sfx_1 240
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 0
-	sfx_1 144
-	sfx_0 0, 0
-	sfx_0 0, 1
-	sfx_0 0, 0
+	sfx_env 15, 0
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $0
+	sfx_env 9, 0
+	sfx_freq $0
+	sfx_freq $1
+	sfx_freq $0
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_npc_warp_transform.asm b/src/audio/sfx/sfx_npc_warp_transform.asm
index bee018b..508a309 100644
--- a/src/audio/sfx/sfx_npc_warp_transform.asm
+++ b/src/audio/sfx/sfx_npc_warp_transform.asm
@@ -1,95 +1,95 @@
 Sfx_NpcWarpTransform_Ch1:
-	sfx_8 17
-	sfx_9 38
-	sfx_1 16
-	sfx_2 0
-	sfx_0 6, 137
-	sfx_5 0
-	sfx_6 8
-	sfx_1 16
-	sfx_2 0
-	sfx_0 6, 137
-	sfx_6 8
-	sfx_1 32
-	sfx_2 0
-	sfx_0 6, 137
-	sfx_6 8
-	sfx_1 48
-	sfx_2 0
-	sfx_0 6, 137
-	sfx_6 8
-	sfx_1 64
-	sfx_2 0
-	sfx_0 6, 137
-	sfx_6 7
-	sfx_1 64
-	sfx_2 0
-	sfx_0 6, 158
-	sfx_6 7
-	sfx_1 80
-	sfx_2 0
-	sfx_0 6, 158
-	sfx_6 6
-	sfx_1 96
-	sfx_2 0
-	sfx_0 6, 158
-	sfx_6 6
-	sfx_1 112
-	sfx_2 0
-	sfx_0 6, 178
-	sfx_6 5
-	sfx_1 128
-	sfx_2 0
-	sfx_0 6, 178
-	sfx_6 5
-	sfx_1 144
-	sfx_2 0
-	sfx_0 6, 196
-	sfx_6 4
-	sfx_1 160
-	sfx_2 0
-	sfx_0 6, 196
-	sfx_6 4
-	sfx_1 160
-	sfx_2 0
-	sfx_0 6, 214
-	sfx_6 3
-	sfx_9 69
-	sfx_1 160
-	sfx_2 0
-	sfx_0 6, 231
-	sfx_6 3
-	sfx_1 160
-	sfx_2 0
-	sfx_0 6, 246
-	sfx_6 2
-	sfx_1 160
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_6 2
-	sfx_1 160
-	sfx_2 0
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_9 38
-	sfx_1 243
-	sfx_2 4
-	sfx_0 7, 89
-	sfx_6 2
-	sfx_1 131
-	sfx_2 4
-	sfx_0 7, 89
-	sfx_6 2
-	sfx_1 99
-	sfx_2 4
-	sfx_0 7, 89
-	sfx_6 2
-	sfx_1 67
-	sfx_2 4
-	sfx_0 7, 89
-	sfx_6 2
-	sfx_1 36
-	sfx_2 4
-	sfx_0 7, 89
-	sfx_6 2
+	sfx_pan TRUE, TRUE
+	sfx_sweep_up 2, 6
+	sfx_env 1, 0
+	sfx_duty 0
+	sfx_freq $689
+	sfx_pitch_offset 0
+	sfx_wait 8
+	sfx_env 1, 0
+	sfx_duty 0
+	sfx_freq $689
+	sfx_wait 8
+	sfx_env 2, 0
+	sfx_duty 0
+	sfx_freq $689
+	sfx_wait 8
+	sfx_env 3, 0
+	sfx_duty 0
+	sfx_freq $689
+	sfx_wait 8
+	sfx_env 4, 0
+	sfx_duty 0
+	sfx_freq $689
+	sfx_wait 7
+	sfx_env 4, 0
+	sfx_duty 0
+	sfx_freq $69e
+	sfx_wait 7
+	sfx_env 5, 0
+	sfx_duty 0
+	sfx_freq $69e
+	sfx_wait 6
+	sfx_env 6, 0
+	sfx_duty 0
+	sfx_freq $69e
+	sfx_wait 6
+	sfx_env 7, 0
+	sfx_duty 0
+	sfx_freq $6b2
+	sfx_wait 5
+	sfx_env 8, 0
+	sfx_duty 0
+	sfx_freq $6b2
+	sfx_wait 5
+	sfx_env 9, 0
+	sfx_duty 0
+	sfx_freq $6c4
+	sfx_wait 4
+	sfx_env 10, 0
+	sfx_duty 0
+	sfx_freq $6c4
+	sfx_wait 4
+	sfx_env 10, 0
+	sfx_duty 0
+	sfx_freq $6d6
+	sfx_wait 3
+	sfx_sweep_up 4, 5
+	sfx_env 10, 0
+	sfx_duty 0
+	sfx_freq $6e7
+	sfx_wait 3
+	sfx_env 10, 0
+	sfx_duty 0
+	sfx_freq $6f6
+	sfx_wait 2
+	sfx_env 10, 0
+	sfx_duty 0
+	sfx_freq $705
+	sfx_wait 2
+	sfx_env 10, 0
+	sfx_duty 0
+	sfx_freq $721
+	sfx_wait 1
+	sfx_sweep_up 2, 6
+	sfx_env 15, 3
+	sfx_duty 1
+	sfx_freq $759
+	sfx_wait 2
+	sfx_env 8, 3
+	sfx_duty 1
+	sfx_freq $759
+	sfx_wait 2
+	sfx_env 6, 3
+	sfx_duty 1
+	sfx_freq $759
+	sfx_wait 2
+	sfx_env 4, 3
+	sfx_duty 1
+	sfx_freq $759
+	sfx_wait 2
+	sfx_env 2, 4
+	sfx_duty 1
+	sfx_freq $759
+	sfx_wait 2
 	sfx_end
diff --git a/src/audio/sfx/sfx_open_chest.asm b/src/audio/sfx/sfx_open_chest.asm
index 343c50e..85bb045 100644
--- a/src/audio/sfx/sfx_open_chest.asm
+++ b/src/audio/sfx/sfx_open_chest.asm
@@ -1,31 +1,31 @@
 Sfx_OpenChest_Ch1:
-	sfx_8 17
-	sfx_9 45
-	sfx_1 241
-	sfx_2 8
-	sfx_0 7, 57
-	sfx_1 241
-	sfx_0 6, 114
-	sfx_1 241
-	sfx_2 0
-	sfx_0 4, 131
-	sfx_9 21
-	sfx_2 4
-	sfx_1 242
-	sfx_0 6, 246
-	sfx_5 0
-	sfx_6 1
-	sfx_1 130
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_6 2
-	sfx_1 98
-	sfx_0 7, 123
-	sfx_6 2
-	sfx_1 66
-	sfx_0 7, 123
-	sfx_6 2
-	sfx_1 35
-	sfx_0 7, 123
-	sfx_6 2
+	sfx_pan TRUE, TRUE
+	sfx_sweep_down 2, 5
+	sfx_env 15, 1
+	sfx_duty 2
+	sfx_freq $739
+	sfx_env 15, 1
+	sfx_freq $672
+	sfx_env 15, 1
+	sfx_duty 0
+	sfx_freq $483
+	sfx_sweep_up 1, 5
+	sfx_duty 1
+	sfx_env 15, 2
+	sfx_freq $6f6
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 8, 2
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_wait 2
+	sfx_env 6, 2
+	sfx_freq $77b
+	sfx_wait 2
+	sfx_env 4, 2
+	sfx_freq $77b
+	sfx_wait 2
+	sfx_env 2, 3
+	sfx_freq $77b
+	sfx_wait 2
 	sfx_end
diff --git a/src/audio/sfx/sfx_paralysis.asm b/src/audio/sfx/sfx_paralysis.asm
index 0b42989..30dd3b1 100644
--- a/src/audio/sfx/sfx_paralysis.asm
+++ b/src/audio/sfx/sfx_paralysis.asm
@@ -1,35 +1,35 @@
 Sfx_Paralysis_Ch1:
-	sfx_1 228
-	sfx_8 17
-	sfx_2 0
+	sfx_env 14, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
 	sfx_loop 7
-	sfx_0 7, 162
-	sfx_0 6, 137
-	sfx_0 7, 172
-	sfx_0 6, 178
+	sfx_freq $7a2
+	sfx_freq $689
+	sfx_freq $7ac
+	sfx_freq $6b2
 	sfx_endloop
-	sfx_1 143
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 6, 137
-	sfx_0 7, 172
-	sfx_0 6, 178
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 6, 137
-	sfx_0 7, 172
-	sfx_0 6, 178
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 6, 137
-	sfx_0 7, 172
-	sfx_0 6, 178
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 6, 137
-	sfx_0 7, 172
-	sfx_0 6, 178
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $689
+	sfx_freq $7ac
+	sfx_freq $6b2
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $689
+	sfx_freq $7ac
+	sfx_freq $6b2
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $689
+	sfx_freq $7ac
+	sfx_freq $6b2
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $689
+	sfx_freq $7ac
+	sfx_freq $6b2
 	sfx_end
diff --git a/src/audio/sfx/sfx_perplex.asm b/src/audio/sfx/sfx_perplex.asm
index f983451..3eac3ec 100644
--- a/src/audio/sfx/sfx_perplex.asm
+++ b/src/audio/sfx/sfx_perplex.asm
@@ -1,63 +1,63 @@
 Sfx_Perplex_Ch1:
-	sfx_8 17
-	sfx_1 16
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_5 0
-	sfx_6 1
-	sfx_0 4, 78
-	sfx_6 1
-	sfx_0 4, 131
-	sfx_6 1
-	sfx_0 4, 181
-	sfx_6 1
-	sfx_0 4, 229
-	sfx_6 1
-	sfx_1 44
-	sfx_0 5, 17
-	sfx_0 5, 60
-	sfx_0 5, 99
-	sfx_1 59
-	sfx_0 5, 137
-	sfx_0 5, 172
-	sfx_1 91
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
-	sfx_1 59
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
-	sfx_1 43
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
-	sfx_1 0
-	sfx_6 2
-	sfx_8 17
-	sfx_1 255
-	sfx_2 4
-	sfx_0 6, 114
-	sfx_0 6, 66
-	sfx_0 6, 114
-	sfx_0 6, 66
-	sfx_0 6, 114
-	sfx_0 6, 66
-	sfx_0 6, 114
-	sfx_0 6, 66
-	sfx_1 0
-	sfx_6 9
-	sfx_1 255
-	sfx_2 4
-	sfx_0 6, 114
-	sfx_0 6, 66
-	sfx_0 6, 114
-	sfx_0 6, 66
-	sfx_0 6, 114
-	sfx_0 6, 66
-	sfx_0 6, 114
-	sfx_0 6, 66
+	sfx_pan TRUE, TRUE
+	sfx_env 1, 0
+	sfx_duty 2
+	sfx_freq $416
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $44e
+	sfx_wait 1
+	sfx_freq $483
+	sfx_wait 1
+	sfx_freq $4b5
+	sfx_wait 1
+	sfx_freq $4e5
+	sfx_wait 1
+	sfx_env 2, -4
+	sfx_freq $511
+	sfx_freq $53c
+	sfx_freq $563
+	sfx_env 3, -3
+	sfx_freq $589
+	sfx_freq $5ac
+	sfx_env 5, -3
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
+	sfx_env 3, -3
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
+	sfx_env 2, -3
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
+	sfx_env 0, 0
+	sfx_wait 2
+	sfx_pan TRUE, TRUE
+	sfx_env 15, -7
+	sfx_duty 1
+	sfx_freq $672
+	sfx_freq $642
+	sfx_freq $672
+	sfx_freq $642
+	sfx_freq $672
+	sfx_freq $642
+	sfx_freq $672
+	sfx_freq $642
+	sfx_env 0, 0
+	sfx_wait 9
+	sfx_env 15, -7
+	sfx_duty 1
+	sfx_freq $672
+	sfx_freq $642
+	sfx_freq $672
+	sfx_freq $642
+	sfx_freq $672
+	sfx_freq $642
+	sfx_freq $672
+	sfx_freq $642
 	sfx_end
diff --git a/src/audio/sfx/sfx_petal_dance.asm b/src/audio/sfx/sfx_petal_dance.asm
index b78ba8b..f16f3ca 100644
--- a/src/audio/sfx/sfx_petal_dance.asm
+++ b/src/audio/sfx/sfx_petal_dance.asm
@@ -1,123 +1,123 @@
 Sfx_PetalDance_Ch1:
-	sfx_8 17
-	sfx_1 255
-	sfx_2 0
+	sfx_pan TRUE, TRUE
+	sfx_env 15, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
 	sfx_endloop
-	sfx_1 239
-	sfx_2 0
+	sfx_env 14, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 219
-	sfx_0 7, 209
-	sfx_0 7, 206
-	sfx_0 7, 214
+	sfx_freq $7db
+	sfx_freq $7d1
+	sfx_freq $7ce
+	sfx_freq $7d6
 	sfx_endloop
-	sfx_1 223
-	sfx_2 0
+	sfx_env 13, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 214
-	sfx_0 7, 206
-	sfx_0 7, 200
-	sfx_0 7, 209
+	sfx_freq $7d6
+	sfx_freq $7ce
+	sfx_freq $7c8
+	sfx_freq $7d1
 	sfx_endloop
-	sfx_1 207
-	sfx_2 0
+	sfx_env 12, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
 	sfx_endloop
-	sfx_1 191
-	sfx_2 0
+	sfx_env 11, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 219
-	sfx_0 7, 209
-	sfx_0 7, 214
-	sfx_0 7, 206
+	sfx_freq $7db
+	sfx_freq $7d1
+	sfx_freq $7d6
+	sfx_freq $7ce
 	sfx_endloop
-	sfx_1 175
-	sfx_2 0
+	sfx_env 10, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 214
-	sfx_0 7, 206
-	sfx_0 7, 200
-	sfx_0 7, 209
+	sfx_freq $7d6
+	sfx_freq $7ce
+	sfx_freq $7c8
+	sfx_freq $7d1
 	sfx_endloop
-	sfx_1 159
-	sfx_2 0
+	sfx_env 9, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
 	sfx_endloop
-	sfx_1 143
-	sfx_2 0
+	sfx_env 8, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 219
-	sfx_0 7, 209
-	sfx_0 7, 206
-	sfx_0 7, 214
+	sfx_freq $7db
+	sfx_freq $7d1
+	sfx_freq $7ce
+	sfx_freq $7d6
 	sfx_endloop
-	sfx_1 127
-	sfx_2 0
+	sfx_env 7, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 214
-	sfx_0 7, 206
-	sfx_0 7, 200
-	sfx_0 7, 209
+	sfx_freq $7d6
+	sfx_freq $7ce
+	sfx_freq $7c8
+	sfx_freq $7d1
 	sfx_endloop
-	sfx_1 111
-	sfx_2 0
+	sfx_env 6, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
 	sfx_endloop
-	sfx_1 95
-	sfx_2 0
+	sfx_env 5, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 219
-	sfx_0 7, 209
-	sfx_0 7, 206
-	sfx_0 7, 214
+	sfx_freq $7db
+	sfx_freq $7d1
+	sfx_freq $7ce
+	sfx_freq $7d6
 	sfx_endloop
-	sfx_1 79
-	sfx_2 0
+	sfx_env 4, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 214
-	sfx_0 7, 206
-	sfx_0 7, 200
-	sfx_0 7, 209
+	sfx_freq $7d6
+	sfx_freq $7ce
+	sfx_freq $7c8
+	sfx_freq $7d1
 	sfx_endloop
-	sfx_1 63
-	sfx_2 0
+	sfx_env 3, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 223
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 219
+	sfx_freq $7df
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7db
 	sfx_endloop
-	sfx_1 47
-	sfx_2 0
+	sfx_env 2, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 219
-	sfx_0 7, 209
-	sfx_0 7, 206
-	sfx_0 7, 214
+	sfx_freq $7db
+	sfx_freq $7d1
+	sfx_freq $7ce
+	sfx_freq $7d6
 	sfx_endloop
-	sfx_1 31
-	sfx_2 0
+	sfx_env 1, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 214
-	sfx_0 7, 206
-	sfx_0 7, 200
-	sfx_0 7, 209
+	sfx_freq $7d6
+	sfx_freq $7ce
+	sfx_freq $7c8
+	sfx_freq $7d1
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_pitfall.asm b/src/audio/sfx/sfx_pitfall.asm
index cadc0b2..7326c7b 100644
--- a/src/audio/sfx/sfx_pitfall.asm
+++ b/src/audio/sfx/sfx_pitfall.asm
@@ -1,54 +1,54 @@
 Sfx_Pitfall_Ch1:
-	sfx_8 17
-	sfx_1 60
-	sfx_2 8
-	sfx_0 7, 214
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_0 7, 209
-	sfx_6 1
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_0 7, 203
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_0 7, 197
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_0 7, 177
-	sfx_0 7, 172
-	sfx_1 198
-	sfx_0 7, 167
-	sfx_0 7, 162
-	sfx_0 7, 157
-	sfx_0 7, 151
-	sfx_0 7, 144
-	sfx_0 7, 138
-	sfx_0 7, 131
-	sfx_0 7, 123
-	sfx_0 7, 115
-	sfx_0 7, 107
-	sfx_0 7, 98
-	sfx_0 7, 89
-	sfx_0 7, 79
-	sfx_1 100
-	sfx_0 7, 68
-	sfx_0 7, 57
-	sfx_0 7, 45
-	sfx_0 7, 33
-	sfx_0 7, 20
-	sfx_0 7, 5
-	sfx_1 68
-	sfx_0 6, 246
-	sfx_0 6, 231
-	sfx_0 6, 214
-	sfx_0 6, 196
-	sfx_0 6, 178
+	sfx_pan TRUE, TRUE
+	sfx_env 3, -4
+	sfx_duty 2
+	sfx_freq $7d6
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_freq $7d1
+	sfx_wait 1
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_freq $7cb
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_freq $7c5
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_freq $7b1
+	sfx_freq $7ac
+	sfx_env 12, 6
+	sfx_freq $7a7
+	sfx_freq $7a2
+	sfx_freq $79d
+	sfx_freq $797
+	sfx_freq $790
+	sfx_freq $78a
+	sfx_freq $783
+	sfx_freq $77b
+	sfx_freq $773
+	sfx_freq $76b
+	sfx_freq $762
+	sfx_freq $759
+	sfx_freq $74f
+	sfx_env 6, 4
+	sfx_freq $744
+	sfx_freq $739
+	sfx_freq $72d
+	sfx_freq $721
+	sfx_freq $714
+	sfx_freq $705
+	sfx_env 4, 4
+	sfx_freq $6f6
+	sfx_freq $6e7
+	sfx_freq $6d6
+	sfx_freq $6c4
+	sfx_freq $6b2
 	sfx_end
diff --git a/src/audio/sfx/sfx_place_prize.asm b/src/audio/sfx/sfx_place_prize.asm
index 586080a..c0ef920 100644
--- a/src/audio/sfx/sfx_place_prize.asm
+++ b/src/audio/sfx/sfx_place_prize.asm
@@ -1,25 +1,25 @@
 Sfx_PlacePrize_Ch1:
-	sfx_8 17
-	sfx_1 224
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_1 128
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_1 64
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_1 32
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_1 20
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
+	sfx_pan TRUE, TRUE
+	sfx_env 14, 0
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $40
+	sfx_env 8, 0
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_env 4, 0
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_env 2, 0
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_env 1, 4
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
 	sfx_end
diff --git a/src/audio/sfx/sfx_placeholder_cursor.asm b/src/audio/sfx/sfx_placeholder_cursor.asm
index 1170653..496d682 100644
--- a/src/audio/sfx/sfx_placeholder_cursor.asm
+++ b/src/audio/sfx/sfx_placeholder_cursor.asm
@@ -3,15 +3,15 @@ Sfx_Placeholder60_Ch1:
 Sfx_Placeholder61_Ch1:
 Sfx_Placeholder62_Ch1:
 Sfx_Placeholder63_Ch1:
-	sfx_1 196
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 193
-	sfx_1 100
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_1 52
-	sfx_2 0
-	sfx_0 7, 193
+	sfx_env 12, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $7c1
+	sfx_env 6, 4
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_env 3, 4
+	sfx_duty 0
+	sfx_freq $7c1
 	sfx_end
diff --git a/src/audio/sfx/sfx_player_walk_map.asm b/src/audio/sfx/sfx_player_walk_map.asm
index 49b1d2d..8253de7 100644
--- a/src/audio/sfx/sfx_player_walk_map.asm
+++ b/src/audio/sfx/sfx_player_walk_map.asm
@@ -1,23 +1,23 @@
 Sfx_PlayerWalkMap_Ch1:
 	sfx_loop 50
-	sfx_1 164
-	sfx_8 17
-	sfx_2 0
-	sfx_0 6, 66
-	sfx_0 6, 91
-	sfx_0 6, 114
-	sfx_0 5, 172
-	sfx_0 5, 137
-	sfx_1 100
-	sfx_2 0
-	sfx_0 6, 178
-	sfx_1 52
-	sfx_2 0
-	sfx_0 6, 158
-	sfx_1 0
-	sfx_5 0
-	sfx_6 10
-	sfx_5 255
-	sfx_1 52
+	sfx_env 10, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $642
+	sfx_freq $65b
+	sfx_freq $672
+	sfx_freq $5ac
+	sfx_freq $589
+	sfx_env 6, 4
+	sfx_duty 0
+	sfx_freq $6b2
+	sfx_env 3, 4
+	sfx_duty 0
+	sfx_freq $69e
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 10
+	sfx_pitch_offset -1
+	sfx_env 3, 4
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_pod_doors.asm b/src/audio/sfx/sfx_pod_doors.asm
index 7d1966b..62bb927 100644
--- a/src/audio/sfx/sfx_pod_doors.asm
+++ b/src/audio/sfx/sfx_pod_doors.asm
@@ -1,38 +1,38 @@
 Sfx_PodDoors_Ch1:
-	sfx_8 17
-	sfx_9 38
-	sfx_1 60
-	sfx_2 8
-	sfx_0 6, 137
-	sfx_5 0
-	sfx_6 3
-	sfx_9 0
-	sfx_1 144
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_0 6, 231
-	sfx_1 176
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_0 6, 231
-	sfx_1 144
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_0 6, 231
-	sfx_1 96
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_0 6, 231
-	sfx_1 64
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_0 6, 231
-	sfx_1 32
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_0 6, 231
-	sfx_1 16
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_0 6, 231
+	sfx_pan TRUE, TRUE
+	sfx_sweep_up 2, 6
+	sfx_env 3, -4
+	sfx_duty 2
+	sfx_freq $689
+	sfx_pitch_offset 0
+	sfx_wait 3
+	sfx_sweep_up 0, 0
+	sfx_env 9, 0
+	sfx_duty 2
+	sfx_freq $721
+	sfx_freq $6e7
+	sfx_env 11, 0
+	sfx_duty 2
+	sfx_freq $721
+	sfx_freq $6e7
+	sfx_env 9, 0
+	sfx_duty 2
+	sfx_freq $721
+	sfx_freq $6e7
+	sfx_env 6, 0
+	sfx_duty 2
+	sfx_freq $721
+	sfx_freq $6e7
+	sfx_env 4, 0
+	sfx_duty 2
+	sfx_freq $721
+	sfx_freq $6e7
+	sfx_env 2, 0
+	sfx_duty 2
+	sfx_freq $721
+	sfx_freq $6e7
+	sfx_env 1, 0
+	sfx_duty 2
+	sfx_freq $721
+	sfx_freq $6e7
 	sfx_end
diff --git a/src/audio/sfx/sfx_poison.asm b/src/audio/sfx/sfx_poison.asm
index fd3ff55..1957204 100644
--- a/src/audio/sfx/sfx_poison.asm
+++ b/src/audio/sfx/sfx_poison.asm
@@ -1,31 +1,31 @@
 Sfx_Poison_Ch1:
-	sfx_1 239
-	sfx_8 17
-	sfx_2 0
+	sfx_env 14, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
 	sfx_loop 15
-	sfx_0 5, 237
-	sfx_0 5, 17
+	sfx_freq $5ed
+	sfx_freq $511
 	sfx_endloop
-	sfx_1 159
-	sfx_2 0
+	sfx_env 9, -7
+	sfx_duty 0
 	sfx_loop 10
-	sfx_0 5, 237
-	sfx_0 5, 17
+	sfx_freq $5ed
+	sfx_freq $511
 	sfx_endloop
-	sfx_1 79
-	sfx_2 0
+	sfx_env 4, -7
+	sfx_duty 0
 	sfx_loop 3
-	sfx_0 5, 172
-	sfx_0 4, 229
+	sfx_freq $5ac
+	sfx_freq $4e5
 	sfx_endloop
 	sfx_loop 3
-	sfx_0 5, 99
-	sfx_0 4, 131
+	sfx_freq $563
+	sfx_freq $483
 	sfx_endloop
-	sfx_1 31
-	sfx_2 0
+	sfx_env 1, -7
+	sfx_duty 0
 	sfx_loop 6
-	sfx_0 5, 17
-	sfx_0 4, 22
+	sfx_freq $511
+	sfx_freq $416
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_pokemon_evolution.asm b/src/audio/sfx/sfx_pokemon_evolution.asm
index 2fadcd6..34ae99d 100644
--- a/src/audio/sfx/sfx_pokemon_evolution.asm
+++ b/src/audio/sfx/sfx_pokemon_evolution.asm
@@ -1,58 +1,58 @@
 Sfx_PokemonEvolution_Ch1:
-	sfx_1 167
-	sfx_8 17
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_5 0
-	sfx_6 1
-	sfx_0 4, 229
-	sfx_6 1
-	sfx_0 5, 99
-	sfx_6 1
-	sfx_0 6, 11
-	sfx_6 1
-	sfx_0 6, 114
-	sfx_6 1
-	sfx_0 6, 11
-	sfx_6 1
-	sfx_0 6, 114
-	sfx_6 1
-	sfx_0 6, 178
-	sfx_6 1
-	sfx_1 167
-	sfx_2 4
-	sfx_0 6, 66
-	sfx_6 1
-	sfx_0 6, 158
-	sfx_6 1
-	sfx_0 6, 214
-	sfx_6 1
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_1 167
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_6 1
-	sfx_0 7, 98
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 177
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 177
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
+	sfx_env 10, 7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $416
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $4e5
+	sfx_wait 1
+	sfx_freq $563
+	sfx_wait 1
+	sfx_freq $60b
+	sfx_wait 1
+	sfx_freq $672
+	sfx_wait 1
+	sfx_freq $60b
+	sfx_wait 1
+	sfx_freq $672
+	sfx_wait 1
+	sfx_freq $6b2
+	sfx_wait 1
+	sfx_env 10, 7
+	sfx_duty 1
+	sfx_freq $642
+	sfx_wait 1
+	sfx_freq $69e
+	sfx_wait 1
+	sfx_freq $6d6
+	sfx_wait 1
+	sfx_freq $721
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $721
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_env 10, 7
+	sfx_duty 0
+	sfx_freq $739
+	sfx_wait 1
+	sfx_freq $762
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7b1
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7b1
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_pot_smash.asm b/src/audio/sfx/sfx_pot_smash.asm
index b2c4cd1..fc7b122 100644
--- a/src/audio/sfx/sfx_pot_smash.asm
+++ b/src/audio/sfx/sfx_pot_smash.asm
@@ -1,96 +1,96 @@
 Sfx_PotSmash_Ch1:
-	sfx_8 17
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 219
-	sfx_0 7, 214
-	sfx_0 7, 209
-	sfx_0 7, 206
-	sfx_0 7, 200
-	sfx_0 7, 193
-	sfx_0 7, 190
-	sfx_0 7, 182
-	sfx_0 7, 172
-	sfx_0 7, 162
-	sfx_0 7, 157
-	sfx_0 7, 144
-	sfx_0 7, 131
-	sfx_0 7, 123
-	sfx_0 7, 107
-	sfx_0 7, 89
-	sfx_0 7, 68
-	sfx_0 7, 57
-	sfx_0 7, 33
-	sfx_0 7, 5
-	sfx_0 6, 246
-	sfx_0 6, 214
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_0 6, 114
-	sfx_0 6, 66
-	sfx_1 159
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_1 255
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 207
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 159
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 239
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 207
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 159
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 143
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 127
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 111
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 95
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 79
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 63
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 47
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_1 31
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
+	sfx_pan TRUE, TRUE
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7db
+	sfx_freq $7d6
+	sfx_freq $7d1
+	sfx_freq $7ce
+	sfx_freq $7c8
+	sfx_freq $7c1
+	sfx_freq $7be
+	sfx_freq $7b6
+	sfx_freq $7ac
+	sfx_freq $7a2
+	sfx_freq $79d
+	sfx_freq $790
+	sfx_freq $783
+	sfx_freq $77b
+	sfx_freq $76b
+	sfx_freq $759
+	sfx_freq $744
+	sfx_freq $739
+	sfx_freq $721
+	sfx_freq $705
+	sfx_freq $6f6
+	sfx_freq $6d6
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_freq $672
+	sfx_freq $642
+	sfx_env 9, -7
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_env 15, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 12, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 9, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 14, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 12, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 9, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 8, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 7, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 6, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 5, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 4, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 3, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 2, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_env 1, -7
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
 	sfx_end
diff --git a/src/audio/sfx/sfx_powder.asm b/src/audio/sfx/sfx_powder.asm
index 9a1c7eb..bc6adee 100644
--- a/src/audio/sfx/sfx_powder.asm
+++ b/src/audio/sfx/sfx_powder.asm
@@ -1,123 +1,123 @@
 Sfx_Powder_Ch1:
-	sfx_8 17
-	sfx_1 255
-	sfx_2 0
+	sfx_pan TRUE, TRUE
+	sfx_env 15, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 190
-	sfx_0 7, 172
-	sfx_0 7, 162
-	sfx_0 7, 182
+	sfx_freq $7be
+	sfx_freq $7ac
+	sfx_freq $7a2
+	sfx_freq $7b6
 	sfx_endloop
-	sfx_1 239
-	sfx_2 0
+	sfx_env 14, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 182
-	sfx_0 7, 162
-	sfx_0 7, 157
-	sfx_0 7, 172
+	sfx_freq $7b6
+	sfx_freq $7a2
+	sfx_freq $79d
+	sfx_freq $7ac
 	sfx_endloop
-	sfx_1 223
-	sfx_2 0
+	sfx_env 13, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 172
-	sfx_0 7, 157
-	sfx_0 7, 144
-	sfx_0 7, 162
+	sfx_freq $7ac
+	sfx_freq $79d
+	sfx_freq $790
+	sfx_freq $7a2
 	sfx_endloop
-	sfx_1 207
-	sfx_2 0
+	sfx_env 12, -7
+	sfx_duty 0
 	sfx_loop 3
-	sfx_0 7, 182
-	sfx_0 7, 162
-	sfx_0 7, 157
-	sfx_0 7, 172
+	sfx_freq $7b6
+	sfx_freq $7a2
+	sfx_freq $79d
+	sfx_freq $7ac
 	sfx_endloop
-	sfx_1 191
-	sfx_2 0
+	sfx_env 11, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 172
-	sfx_0 7, 157
-	sfx_0 7, 144
-	sfx_0 7, 162
+	sfx_freq $7ac
+	sfx_freq $79d
+	sfx_freq $790
+	sfx_freq $7a2
 	sfx_endloop
-	sfx_1 175
-	sfx_2 0
+	sfx_env 10, -7
+	sfx_duty 0
 	sfx_loop 3
-	sfx_0 7, 162
-	sfx_0 7, 144
-	sfx_0 7, 131
-	sfx_0 7, 157
+	sfx_freq $7a2
+	sfx_freq $790
+	sfx_freq $783
+	sfx_freq $79d
 	sfx_endloop
-	sfx_1 159
-	sfx_2 0
+	sfx_env 9, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 172
-	sfx_0 7, 157
-	sfx_0 7, 144
-	sfx_0 7, 162
+	sfx_freq $7ac
+	sfx_freq $79d
+	sfx_freq $790
+	sfx_freq $7a2
 	sfx_endloop
-	sfx_1 143
-	sfx_2 0
+	sfx_env 8, -7
+	sfx_duty 0
 	sfx_loop 3
-	sfx_0 7, 162
-	sfx_0 7, 144
-	sfx_0 7, 131
-	sfx_0 7, 157
+	sfx_freq $7a2
+	sfx_freq $790
+	sfx_freq $783
+	sfx_freq $79d
 	sfx_endloop
-	sfx_1 127
-	sfx_2 0
+	sfx_env 7, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 157
-	sfx_0 7, 131
-	sfx_0 7, 123
-	sfx_0 7, 144
+	sfx_freq $79d
+	sfx_freq $783
+	sfx_freq $77b
+	sfx_freq $790
 	sfx_endloop
-	sfx_1 111
-	sfx_2 0
+	sfx_env 6, -7
+	sfx_duty 0
 	sfx_loop 3
-	sfx_0 7, 162
-	sfx_0 7, 144
-	sfx_0 7, 131
-	sfx_0 7, 157
+	sfx_freq $7a2
+	sfx_freq $790
+	sfx_freq $783
+	sfx_freq $79d
 	sfx_endloop
-	sfx_1 95
-	sfx_2 0
+	sfx_env 5, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 157
-	sfx_0 7, 131
-	sfx_0 7, 123
-	sfx_0 7, 144
+	sfx_freq $79d
+	sfx_freq $783
+	sfx_freq $77b
+	sfx_freq $790
 	sfx_endloop
-	sfx_1 79
-	sfx_2 0
+	sfx_env 4, -7
+	sfx_duty 0
 	sfx_loop 3
-	sfx_0 7, 144
-	sfx_0 7, 123
-	sfx_0 7, 107
-	sfx_0 7, 131
+	sfx_freq $790
+	sfx_freq $77b
+	sfx_freq $76b
+	sfx_freq $783
 	sfx_endloop
-	sfx_1 63
-	sfx_2 0
+	sfx_env 3, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 157
-	sfx_0 7, 131
-	sfx_0 7, 123
-	sfx_0 7, 144
+	sfx_freq $79d
+	sfx_freq $783
+	sfx_freq $77b
+	sfx_freq $790
 	sfx_endloop
-	sfx_1 47
-	sfx_2 0
+	sfx_env 2, -7
+	sfx_duty 0
 	sfx_loop 3
-	sfx_0 7, 144
-	sfx_0 7, 123
-	sfx_0 7, 107
-	sfx_0 7, 131
+	sfx_freq $790
+	sfx_freq $77b
+	sfx_freq $76b
+	sfx_freq $783
 	sfx_endloop
-	sfx_1 31
-	sfx_2 0
+	sfx_env 1, -7
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 131
-	sfx_0 7, 107
-	sfx_0 7, 89
-	sfx_0 7, 123
+	sfx_freq $783
+	sfx_freq $76b
+	sfx_freq $759
+	sfx_freq $77b
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_protect.asm b/src/audio/sfx/sfx_protect.asm
index 35f860d..4fc17b6 100644
--- a/src/audio/sfx/sfx_protect.asm
+++ b/src/audio/sfx/sfx_protect.asm
@@ -1,60 +1,60 @@
 Sfx_Protect_Ch1:
-	sfx_1 239
-	sfx_8 17
-	sfx_2 0
+	sfx_env 14, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
 	sfx_loop 18
-	sfx_0 6, 11
-	sfx_0 6, 66
+	sfx_freq $60b
+	sfx_freq $642
 	sfx_endloop
-	sfx_0 6, 114
-	sfx_0 6, 66
-	sfx_0 6, 114
-	sfx_0 6, 66
-	sfx_0 6, 114
-	sfx_0 6, 137
-	sfx_0 6, 114
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_1 143
-	sfx_2 0
+	sfx_freq $672
+	sfx_freq $642
+	sfx_freq $672
+	sfx_freq $642
+	sfx_freq $672
+	sfx_freq $689
+	sfx_freq $672
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_env 8, -7
+	sfx_duty 0
 	sfx_loop 10
-	sfx_0 6, 66
-	sfx_0 6, 114
+	sfx_freq $642
+	sfx_freq $672
 	sfx_endloop
-	sfx_0 6, 137
-	sfx_0 6, 114
-	sfx_0 6, 137
-	sfx_0 6, 114
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_1 79
-	sfx_2 0
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_1 31
-	sfx_2 0
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 137
+	sfx_freq $689
+	sfx_freq $672
+	sfx_freq $689
+	sfx_freq $672
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $689
 	sfx_end
diff --git a/src/audio/sfx/sfx_psychic.asm b/src/audio/sfx/sfx_psychic.asm
index ea535de..2654acd 100644
--- a/src/audio/sfx/sfx_psychic.asm
+++ b/src/audio/sfx/sfx_psychic.asm
@@ -1,111 +1,111 @@
 Sfx_Psychic_Ch1:
-	sfx_1 207
-	sfx_8 17
-	sfx_2 8
+	sfx_env 12, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
 	sfx_loop 4
-	sfx_0 4, 22
-	sfx_0 4, 78
-	sfx_0 4, 131
-	sfx_0 4, 181
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 131
-	sfx_0 4, 78
-	sfx_0 4, 22
+	sfx_freq $416
+	sfx_freq $44e
+	sfx_freq $483
+	sfx_freq $4b5
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $483
+	sfx_freq $44e
+	sfx_freq $416
 	sfx_endloop
-	sfx_1 175
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_5 0
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 175
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 175
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 143
-	sfx_0 7, 219
-	sfx_1 111
-	sfx_0 7, 219
-	sfx_1 79
-	sfx_0 7, 219
-	sfx_1 47
-	sfx_0 7, 219
-	sfx_1 31
-	sfx_0 7, 219
-	sfx_1 207
-	sfx_2 8
+	sfx_env 10, -7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 10, -7
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 10, -7
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_freq $7db
+	sfx_env 6, -7
+	sfx_freq $7db
+	sfx_env 4, -7
+	sfx_freq $7db
+	sfx_env 2, -7
+	sfx_freq $7db
+	sfx_env 1, -7
+	sfx_freq $7db
+	sfx_env 12, -7
+	sfx_duty 2
 	sfx_loop 4
-	sfx_0 6, 11
-	sfx_0 6, 40
-	sfx_0 6, 66
-	sfx_0 6, 91
-	sfx_0 6, 114
-	sfx_0 6, 137
-	sfx_0 6, 91
-	sfx_0 6, 66
-	sfx_0 6, 40
-	sfx_0 6, 11
+	sfx_freq $60b
+	sfx_freq $628
+	sfx_freq $642
+	sfx_freq $65b
+	sfx_freq $672
+	sfx_freq $689
+	sfx_freq $65b
+	sfx_freq $642
+	sfx_freq $628
+	sfx_freq $60b
 	sfx_endloop
-	sfx_1 175
-	sfx_2 0
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 175
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 175
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 175
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 143
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 111
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 79
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 47
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 31
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
+	sfx_env 10, -7
+	sfx_duty 0
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 10, -7
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 10, -7
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 10, -7
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 6, -7
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 4, -7
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 2, -7
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 1, -7
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_psychic_beam.asm b/src/audio/sfx/sfx_psychic_beam.asm
index 041a4cf..7d151b4 100644
--- a/src/audio/sfx/sfx_psychic_beam.asm
+++ b/src/audio/sfx/sfx_psychic_beam.asm
@@ -1,126 +1,126 @@
 Sfx_PsychicBeam_Ch1:
-	sfx_1 127
-	sfx_8 17
-	sfx_2 4
+	sfx_env 7, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 1
 	sfx_loop 5
-	sfx_0 7, 68
-	sfx_0 7, 123
+	sfx_freq $744
+	sfx_freq $77b
 	sfx_endloop
-	sfx_1 160
+	sfx_env 10, 0
 	sfx_loop 11
-	sfx_0 7, 68
-	sfx_0 7, 123
+	sfx_freq $744
+	sfx_freq $77b
 	sfx_endloop
-	sfx_2 4
-	sfx_1 240
-	sfx_0 5, 237
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 131
-	sfx_0 4, 78
-	sfx_0 4, 22
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 131
-	sfx_0 4, 78
-	sfx_0 4, 22
-	sfx_1 148
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 131
-	sfx_0 4, 78
-	sfx_0 4, 22
-	sfx_1 84
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 131
-	sfx_0 4, 78
-	sfx_0 4, 22
+	sfx_duty 1
+	sfx_env 15, 0
+	sfx_freq $5ed
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $483
+	sfx_freq $44e
+	sfx_freq $416
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $483
+	sfx_freq $44e
+	sfx_freq $416
+	sfx_env 9, 4
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $483
+	sfx_freq $44e
+	sfx_freq $416
+	sfx_env 5, 4
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $483
+	sfx_freq $44e
+	sfx_freq $416
 	sfx_end
 
 Sfx_PsychicBeam_Ch2:
-	sfx_8 17
-	sfx_1 199
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 9
-	sfx_0 0, 2
-	sfx_1 241
-	sfx_0 0, 105
-	sfx_0 0, 98
-	sfx_1 215
-	sfx_0 0, 2
-	sfx_0 0, 66
-	sfx_0 0, 9
-	sfx_0 0, 2
-	sfx_0 0, 98
-	sfx_0 0, 105
-	sfx_1 241
-	sfx_0 0, 2
-	sfx_0 0, 34
-	sfx_0 0, 66
-	sfx_1 199
-	sfx_0 0, 9
-	sfx_0 0, 2
-	sfx_0 0, 98
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_1 241
-	sfx_0 0, 98
-	sfx_0 0, 2
-	sfx_0 0, 9
-	sfx_1 199
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 73
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 9
-	sfx_0 0, 2
-	sfx_1 240
-	sfx_0 0, 22
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_0 0, 84
-	sfx_1 245
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_1 135
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 87
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 68
-	sfx_1 55
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_1 55
-	sfx_0 0, 68
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 68
+	sfx_pan TRUE, TRUE
+	sfx_env 12, 7
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $9
+	sfx_freq $2
+	sfx_env 15, 1
+	sfx_freq $69
+	sfx_freq $62
+	sfx_env 13, 7
+	sfx_freq $2
+	sfx_freq $42
+	sfx_freq $9
+	sfx_freq $2
+	sfx_freq $62
+	sfx_freq $69
+	sfx_env 15, 1
+	sfx_freq $2
+	sfx_freq $22
+	sfx_freq $42
+	sfx_env 12, 7
+	sfx_freq $9
+	sfx_freq $2
+	sfx_freq $62
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_env 15, 1
+	sfx_freq $62
+	sfx_freq $2
+	sfx_freq $9
+	sfx_env 12, 7
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $49
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $9
+	sfx_freq $2
+	sfx_env 15, 0
+	sfx_freq $16
+	sfx_freq $64
+	sfx_freq $64
+	sfx_freq $64
+	sfx_freq $54
+	sfx_env 15, 5
+	sfx_freq $54
+	sfx_freq $54
+	sfx_env 8, 7
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 5, 7
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $44
+	sfx_env 3, 7
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_env 3, 7
+	sfx_freq $44
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $44
 	sfx_end
diff --git a/src/audio/sfx/sfx_psychic_beam_bench.asm b/src/audio/sfx/sfx_psychic_beam_bench.asm
index b07aa6d..8ffcd0d 100644
--- a/src/audio/sfx/sfx_psychic_beam_bench.asm
+++ b/src/audio/sfx/sfx_psychic_beam_bench.asm
@@ -1,106 +1,106 @@
 Sfx_PsychicBeam_Bench_Ch1:
-	sfx_1 95
-	sfx_8 17
-	sfx_2 4
+	sfx_env 5, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 1
 	sfx_loop 5
-	sfx_0 7, 182
-	sfx_0 7, 203
+	sfx_freq $7b6
+	sfx_freq $7cb
 	sfx_endloop
-	sfx_1 128
+	sfx_env 8, 0
 	sfx_loop 11
-	sfx_0 7, 182
-	sfx_0 7, 203
+	sfx_freq $7b6
+	sfx_freq $7cb
 	sfx_endloop
-	sfx_2 8
-	sfx_1 244
-	sfx_0 6, 114
-	sfx_0 5, 99
-	sfx_0 5, 17
-	sfx_0 5, 237
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 6, 11
-	sfx_0 5, 17
-	sfx_0 4, 131
-	sfx_0 5, 99
-	sfx_0 4, 229
-	sfx_0 4, 22
-	sfx_0 4, 229
-	sfx_0 4, 22
-	sfx_1 84
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 131
-	sfx_0 4, 78
-	sfx_0 4, 22
-	sfx_1 36
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 131
-	sfx_0 4, 78
-	sfx_0 4, 22
+	sfx_duty 2
+	sfx_env 15, 4
+	sfx_freq $672
+	sfx_freq $563
+	sfx_freq $511
+	sfx_freq $5ed
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $60b
+	sfx_freq $511
+	sfx_freq $483
+	sfx_freq $563
+	sfx_freq $4e5
+	sfx_freq $416
+	sfx_freq $4e5
+	sfx_freq $416
+	sfx_env 5, 4
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $483
+	sfx_freq $44e
+	sfx_freq $416
+	sfx_env 2, 4
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $483
+	sfx_freq $44e
+	sfx_freq $416
 	sfx_end
 
 Sfx_PsychicBeam_Bench_Ch2:
-	sfx_8 17
-	sfx_1 0
-	sfx_6 18
-	sfx_1 103
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_1 145
-	sfx_0 0, 98
-	sfx_0 0, 2
-	sfx_0 0, 9
-	sfx_1 103
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 73
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 9
-	sfx_0 0, 2
-	sfx_1 247
-	sfx_0 0, 22
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_1 119
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 87
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 68
-	sfx_1 55
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_1 39
-	sfx_0 0, 68
-	sfx_0 0, 84
-	sfx_0 0, 84
-	sfx_0 0, 68
+	sfx_pan TRUE, TRUE
+	sfx_env 0, 0
+	sfx_wait 18
+	sfx_env 6, 7
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_env 9, 1
+	sfx_freq $62
+	sfx_freq $2
+	sfx_freq $9
+	sfx_env 6, 7
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $49
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $9
+	sfx_freq $2
+	sfx_env 15, 7
+	sfx_freq $16
+	sfx_freq $64
+	sfx_freq $64
+	sfx_freq $64
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_env 7, 7
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 5, 7
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $44
+	sfx_env 3, 7
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $54
+	sfx_env 2, 7
+	sfx_freq $44
+	sfx_freq $54
+	sfx_freq $54
+	sfx_freq $44
 	sfx_end
diff --git a/src/audio/sfx/sfx_psypunch.asm b/src/audio/sfx/sfx_psypunch.asm
index 77dd03a..692f91b 100644
--- a/src/audio/sfx/sfx_psypunch.asm
+++ b/src/audio/sfx/sfx_psypunch.asm
@@ -1,127 +1,127 @@
 Sfx_PsyPunch_Ch1:
-	sfx_1 255
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_6 1
-	sfx_1 255
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_6 1
-	sfx_1 143
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_6 1
-	sfx_1 79
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_6 1
-	sfx_1 31
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_1 0
-	sfx_6 15
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 4, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 1, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_env 0, 0
+	sfx_wait 15
 	sfx_loop 2
-	sfx_1 42
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_1 74
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_1 122
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_1 74
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
+	sfx_env 2, -2
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_env 4, -2
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_env 7, -2
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_env 4, -2
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
 	sfx_endloop
-	sfx_1 42
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_1 255
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_6 1
-	sfx_1 255
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_6 1
-	sfx_1 143
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_6 1
-	sfx_1 79
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_6 1
-	sfx_1 31
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 107
-	sfx_1 0
-	sfx_6 15
+	sfx_env 2, -2
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 4, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 1, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $76b
+	sfx_env 0, 0
+	sfx_wait 15
 	sfx_loop 2
-	sfx_1 42
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_1 74
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_1 122
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_1 74
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
+	sfx_env 2, -2
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_env 4, -2
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_env 7, -2
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_env 4, -2
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
 	sfx_endloop
-	sfx_1 42
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
+	sfx_env 2, -2
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_punch.asm b/src/audio/sfx/sfx_punch.asm
index 9aee07b..5984a61 100644
--- a/src/audio/sfx/sfx_punch.asm
+++ b/src/audio/sfx/sfx_punch.asm
@@ -1,78 +1,78 @@
 Sfx_Punch_Ch1:
-	sfx_1 255
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_1 255
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_1 143
-	sfx_2 8
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 143
-	sfx_1 79
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 79
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_1 0
-	sfx_5 0
-	sfx_6 15
-	sfx_5 255
-	sfx_1 31
-	sfx_1 255
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_1 255
-	sfx_2 0
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_1 143
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 143
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 79
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 107
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_env 15, -7
+	sfx_duty 2
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_env 8, -7
+	sfx_duty 2
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, -7
+	sfx_env 4, -7
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, -7
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 15
+	sfx_pitch_offset -1
+	sfx_env 1, -7
+	sfx_env 15, -7
+	sfx_duty 0
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_env 15, -7
+	sfx_duty 0
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, -7
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, -7
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $76b
 	sfx_end
diff --git a/src/audio/sfx/sfx_question_mark.asm b/src/audio/sfx/sfx_question_mark.asm
index 81e28f3..784e258 100644
--- a/src/audio/sfx/sfx_question_mark.asm
+++ b/src/audio/sfx/sfx_question_mark.asm
@@ -1,102 +1,102 @@
 Sfx_QuestionMark_Ch1:
-	sfx_1 239
-	sfx_8 17
-	sfx_2 8
+	sfx_env 14, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
 	sfx_loop 7
-	sfx_0 7, 190
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
+	sfx_freq $7be
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
 	sfx_endloop
-	sfx_1 175
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 209
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 111
-	sfx_2 8
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_0 7, 209
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 47
-	sfx_2 8
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_0 7, 182
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 10
-	sfx_5 0
-	sfx_1 47
+	sfx_env 10, -7
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7d1
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 6, -7
+	sfx_duty 2
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_freq $7d1
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 2, -7
+	sfx_duty 2
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_freq $7b6
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 10
+	sfx_pitch_offset 0
+	sfx_env 2, -7
 	sfx_loop 2
-	sfx_1 231
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 172
-	sfx_0 7, 177
-	sfx_0 7, 182
-	sfx_1 231
-	sfx_2 8
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 135
-	sfx_2 8
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 119
-	sfx_2 8
-	sfx_0 7, 182
-	sfx_6 1
-	sfx_1 103
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_1 81
-	sfx_2 8
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_1 65
-	sfx_2 8
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_1 49
-	sfx_2 8
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_1 33
-	sfx_2 8
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_1 17
-	sfx_2 8
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_1 1
-	sfx_2 8
-	sfx_0 7, 162
-	sfx_6 1
+	sfx_env 14, 7
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7ac
+	sfx_freq $7b1
+	sfx_freq $7b6
+	sfx_env 14, 7
+	sfx_duty 2
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 8, 7
+	sfx_duty 2
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 7, 7
+	sfx_duty 2
+	sfx_freq $7b6
+	sfx_wait 1
+	sfx_env 6, 7
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_env 5, 1
+	sfx_duty 2
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_env 4, 1
+	sfx_duty 2
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_env 3, 1
+	sfx_duty 2
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_env 2, 1
+	sfx_duty 2
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_env 1, 1
+	sfx_duty 2
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_env 0, 1
+	sfx_duty 2
+	sfx_freq $7a2
+	sfx_wait 1
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_question_mark_bench.asm b/src/audio/sfx/sfx_question_mark_bench.asm
index d0aecff..b9d203b 100644
--- a/src/audio/sfx/sfx_question_mark_bench.asm
+++ b/src/audio/sfx/sfx_question_mark_bench.asm
@@ -1,74 +1,74 @@
 Sfx_QuestionMark_Bench_Ch1:
-	sfx_1 176
-	sfx_8 17
-	sfx_2 8
+	sfx_env 11, 0
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
 	sfx_loop 8
-	sfx_0 7, 206
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
+	sfx_freq $7ce
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
 	sfx_endloop
-	sfx_1 112
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 209
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 80
-	sfx_2 8
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 209
-	sfx_6 1
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_1 32
-	sfx_2 8
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_0 7, 182
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_1 0
-	sfx_6 2
+	sfx_env 7, 0
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7d1
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 5, 0
+	sfx_duty 2
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7d1
+	sfx_wait 1
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_env 2, 0
+	sfx_duty 2
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_freq $7b6
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_wait 2
 	sfx_loop 2
-	sfx_1 57
-	sfx_2 8
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_0 7, 193
-	sfx_0 7, 197
-	sfx_0 7, 200
-	sfx_0 7, 203
-	sfx_1 151
-	sfx_2 8
-	sfx_0 7, 217
-	sfx_0 7, 219
-	sfx_0 7, 221
-	sfx_0 7, 223
-	sfx_1 53
-	sfx_2 8
-	sfx_0 7, 217
-	sfx_0 7, 219
-	sfx_0 7, 221
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_6 9
+	sfx_env 3, -1
+	sfx_duty 2
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_freq $7c1
+	sfx_freq $7c5
+	sfx_freq $7c8
+	sfx_freq $7cb
+	sfx_env 9, 7
+	sfx_duty 2
+	sfx_freq $7d9
+	sfx_freq $7db
+	sfx_freq $7dd
+	sfx_freq $7df
+	sfx_env 3, 5
+	sfx_duty 2
+	sfx_freq $7d9
+	sfx_freq $7db
+	sfx_freq $7dd
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_wait 9
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_razor_leaf.asm b/src/audio/sfx/sfx_razor_leaf.asm
index d6cf58e..a2d39fe 100644
--- a/src/audio/sfx/sfx_razor_leaf.asm
+++ b/src/audio/sfx/sfx_razor_leaf.asm
@@ -1,77 +1,77 @@
 Sfx_RazorLeaf_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 77
-	sfx_0 0, 22
-	sfx_0 0, 21
-	sfx_1 124
-	sfx_0 0, 21
-	sfx_0 0, 20
-	sfx_0 0, 19
-	sfx_0 0, 19
-	sfx_1 172
-	sfx_0 0, 18
-	sfx_0 0, 17
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_1 119
-	sfx_0 0, 16
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_1 71
-	sfx_0 0, 19
-	sfx_0 0, 20
-	sfx_0 0, 21
-	sfx_0 0, 22
+	sfx_env 4, -5
+	sfx_freq $16
+	sfx_freq $15
+	sfx_env 7, -4
+	sfx_freq $15
+	sfx_freq $14
+	sfx_freq $13
+	sfx_freq $13
+	sfx_env 10, -4
+	sfx_freq $12
+	sfx_freq $11
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $10
+	sfx_env 7, 7
+	sfx_freq $10
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_env 4, 7
+	sfx_freq $13
+	sfx_freq $14
+	sfx_freq $15
+	sfx_freq $16
 	sfx_endloop
-	sfx_1 61
-	sfx_0 0, 22
-	sfx_0 0, 21
-	sfx_1 92
-	sfx_0 0, 21
-	sfx_0 0, 20
-	sfx_0 0, 19
-	sfx_0 0, 19
-	sfx_1 124
-	sfx_0 0, 18
-	sfx_0 0, 17
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_1 87
-	sfx_0 0, 16
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_1 71
-	sfx_0 0, 19
-	sfx_0 0, 20
-	sfx_0 0, 21
-	sfx_0 0, 22
-	sfx_1 45
-	sfx_0 0, 22
-	sfx_0 0, 21
-	sfx_1 60
-	sfx_0 0, 21
-	sfx_0 0, 20
-	sfx_0 0, 19
-	sfx_0 0, 19
-	sfx_1 92
-	sfx_0 0, 18
-	sfx_0 0, 17
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_0 0, 16
-	sfx_1 55
-	sfx_0 0, 16
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_1 16
-	sfx_0 0, 19
-	sfx_0 0, 20
-	sfx_0 0, 21
-	sfx_0 0, 22
+	sfx_env 3, -5
+	sfx_freq $16
+	sfx_freq $15
+	sfx_env 5, -4
+	sfx_freq $15
+	sfx_freq $14
+	sfx_freq $13
+	sfx_freq $13
+	sfx_env 7, -4
+	sfx_freq $12
+	sfx_freq $11
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $10
+	sfx_env 5, 7
+	sfx_freq $10
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_env 4, 7
+	sfx_freq $13
+	sfx_freq $14
+	sfx_freq $15
+	sfx_freq $16
+	sfx_env 2, -5
+	sfx_freq $16
+	sfx_freq $15
+	sfx_env 3, -4
+	sfx_freq $15
+	sfx_freq $14
+	sfx_freq $13
+	sfx_freq $13
+	sfx_env 5, -4
+	sfx_freq $12
+	sfx_freq $11
+	sfx_freq $10
+	sfx_freq $10
+	sfx_freq $10
+	sfx_env 3, 7
+	sfx_freq $10
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_env 1, 0
+	sfx_freq $13
+	sfx_freq $14
+	sfx_freq $15
+	sfx_freq $16
 	sfx_end
diff --git a/src/audio/sfx/sfx_receive_card_pop.asm b/src/audio/sfx/sfx_receive_card_pop.asm
index b5c2809..34e0015 100644
--- a/src/audio/sfx/sfx_receive_card_pop.asm
+++ b/src/audio/sfx/sfx_receive_card_pop.asm
@@ -1,57 +1,57 @@
 Sfx_ReceiveCardPop_Ch1:
-	sfx_1 208
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 89
-	sfx_5 0
-	sfx_6 1
-	sfx_1 113
-	sfx_0 7, 68
-	sfx_1 65
-	sfx_0 7, 57
-	sfx_0 7, 33
-	sfx_0 7, 5
-	sfx_0 6, 246
+	sfx_env 13, 0
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $759
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 7, 1
+	sfx_freq $744
+	sfx_env 4, 1
+	sfx_freq $739
+	sfx_freq $721
+	sfx_freq $705
+	sfx_freq $6f6
 	sfx_end
 
 Sfx_ReceiveCardPop_Ch2:
-	sfx_1 29
-	sfx_8 17
-	sfx_2 0
+	sfx_env 1, -5
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
 	sfx_loop 3
-	sfx_0 7, 214
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
+	sfx_freq $7d6
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
 	sfx_endloop
-	sfx_1 71
+	sfx_env 4, 7
 	sfx_loop 8
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
 	sfx_endloop
 	sfx_end
 
 Sfx_ReceiveCardPop_Ch3:
-	sfx_8 17
-	sfx_1 241
-	sfx_0 0, 99
-	sfx_1 64
-	sfx_0 0, 17
-	sfx_0 0, 33
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 1
+	sfx_freq $63
+	sfx_env 4, 0
+	sfx_freq $11
+	sfx_freq $21
 	sfx_loop 6
-	sfx_0 0, 17
-	sfx_0 0, 33
+	sfx_freq $11
+	sfx_freq $21
 	sfx_endloop
-	sfx_1 71
+	sfx_env 4, 7
 	sfx_loop 20
-	sfx_0 0, 17
-	sfx_0 0, 33
+	sfx_freq $11
+	sfx_freq $21
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_save_game.asm b/src/audio/sfx/sfx_save_game.asm
index c733310..861632f 100644
--- a/src/audio/sfx/sfx_save_game.asm
+++ b/src/audio/sfx/sfx_save_game.asm
@@ -1,74 +1,74 @@
 Sfx_SaveGame_Ch1:
-	sfx_1 247
-	sfx_8 17
-	sfx_2 0
-	sfx_0 6, 11
-	sfx_5 0
-	sfx_6 1
-	sfx_0 6, 178
-	sfx_6 1
-	sfx_0 6, 114
-	sfx_6 1
-	sfx_0 6, 214
-	sfx_6 1
-	sfx_1 215
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_0 7, 57
-	sfx_6 1
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_1 199
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 182
-	sfx_6 1
-	sfx_1 135
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 71
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 39
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 23
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
+	sfx_env 15, 7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $60b
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $6b2
+	sfx_wait 1
+	sfx_freq $672
+	sfx_wait 1
+	sfx_freq $6d6
+	sfx_wait 1
+	sfx_env 13, 7
+	sfx_duty 0
+	sfx_freq $705
+	sfx_wait 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_freq $739
+	sfx_wait 1
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_env 12, 7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7b6
+	sfx_wait 1
+	sfx_env 8, 7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 4, 7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 2, 7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 1, 7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_seismic_toss.asm b/src/audio/sfx/sfx_seismic_toss.asm
index b27de7e..d1e9480 100644
--- a/src/audio/sfx/sfx_seismic_toss.asm
+++ b/src/audio/sfx/sfx_seismic_toss.asm
@@ -1,117 +1,117 @@
 Sfx_SeismicToss_Ch1:
-	sfx_1 255
-	sfx_8 17
-	sfx_2 0
-	sfx_0 5, 237
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 5, 205
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 5, 172
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 5, 137
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 5, 99
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 5, 60
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 5, 17
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 4, 229
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 4, 181
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 4, 131
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 4, 78
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_0 4, 22
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $5ed
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $5cd
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $5ac
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $589
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $563
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $53c
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $511
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $4e5
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $4b5
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $483
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $44e
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_freq $416
 	sfx_end
 
 Sfx_SeismicToss_Ch2:
-	sfx_8 17
-	sfx_1 0
-	sfx_5 0
-	sfx_6 18
-	sfx_5 255
-	sfx_1 1
-	sfx_1 223
-	sfx_0 0, 49
-	sfx_0 0, 55
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 143
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 79
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 47
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
+	sfx_pan TRUE, TRUE
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 18
+	sfx_pitch_offset -1
+	sfx_env 0, 1
+	sfx_env 13, -7
+	sfx_freq $31
+	sfx_freq $37
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 8, -7
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 4, -7
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 2, -7
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
 	sfx_end
diff --git a/src/audio/sfx/sfx_self_destruct.asm b/src/audio/sfx/sfx_self_destruct.asm
index aba3585..d0262bc 100644
--- a/src/audio/sfx/sfx_self_destruct.asm
+++ b/src/audio/sfx/sfx_self_destruct.asm
@@ -1,43 +1,43 @@
 Sfx_SelfDestruct_Ch1:
-	sfx_8 17
-	sfx_1 207
-	sfx_0 0, 113
-	sfx_0 0, 113
-	sfx_0 0, 113
-	sfx_0 0, 113
-	sfx_1 255
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_1 207
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_1 143
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_1 79
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_1 31
-	sfx_0 0, 81
-	sfx_0 0, 81
+	sfx_pan TRUE, TRUE
+	sfx_env 12, -7
+	sfx_freq $71
+	sfx_freq $71
+	sfx_freq $71
+	sfx_freq $71
+	sfx_env 15, -7
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_env 12, -7
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_env 8, -7
+	sfx_freq $51
+	sfx_freq $51
+	sfx_env 4, -7
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_env 1, -7
+	sfx_freq $51
+	sfx_freq $51
 	sfx_end
diff --git a/src/audio/sfx/sfx_sing.asm b/src/audio/sfx/sfx_sing.asm
index 234f96b..e20315f 100644
--- a/src/audio/sfx/sfx_sing.asm
+++ b/src/audio/sfx/sfx_sing.asm
@@ -1,26 +1,26 @@
 Sfx_Sing_Ch1:
-	sfx_1 207
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 89
-	sfx_5 0
-	sfx_6 15
-	sfx_0 7, 5
-	sfx_6 15
-	sfx_0 7, 123
-	sfx_6 15
-	sfx_0 7, 89
-	sfx_6 15
-	sfx_1 143
-	sfx_2 8
-	sfx_0 7, 89
-	sfx_6 7
-	sfx_1 79
-	sfx_2 8
-	sfx_0 7, 89
-	sfx_6 7
-	sfx_1 47
-	sfx_2 8
-	sfx_0 7, 89
-	sfx_6 7
+	sfx_env 12, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $759
+	sfx_pitch_offset 0
+	sfx_wait 15
+	sfx_freq $705
+	sfx_wait 15
+	sfx_freq $77b
+	sfx_wait 15
+	sfx_freq $759
+	sfx_wait 15
+	sfx_env 8, -7
+	sfx_duty 2
+	sfx_freq $759
+	sfx_wait 7
+	sfx_env 4, -7
+	sfx_duty 2
+	sfx_freq $759
+	sfx_wait 7
+	sfx_env 2, -7
+	sfx_duty 2
+	sfx_freq $759
+	sfx_wait 7
 	sfx_end
diff --git a/src/audio/sfx/sfx_skull_bash.asm b/src/audio/sfx/sfx_skull_bash.asm
index de7210b..293f0f1 100644
--- a/src/audio/sfx/sfx_skull_bash.asm
+++ b/src/audio/sfx/sfx_skull_bash.asm
@@ -1,83 +1,83 @@
 Sfx_SkullBash_Ch1:
-	sfx_1 224
-	sfx_8 17
-	sfx_2 4
+	sfx_env 14, 0
+	sfx_pan TRUE, TRUE
+	sfx_duty 1
 	sfx_loop 10
-	sfx_0 4, 78
-	sfx_0 3, 88
-	sfx_0 2, 198
+	sfx_freq $44e
+	sfx_freq $358
+	sfx_freq $2c6
 	sfx_endloop
-	sfx_0 4, 78
-	sfx_0 3, 88
-	sfx_2 0
-	sfx_1 247
-	sfx_0 6, 137
-	sfx_0 6, 66
-	sfx_0 5, 99
-	sfx_0 5, 17
-	sfx_0 4, 22
-	sfx_0 2, 198
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_1 103
-	sfx_2 8
+	sfx_freq $44e
+	sfx_freq $358
+	sfx_duty 0
+	sfx_env 15, 7
+	sfx_freq $689
+	sfx_freq $642
+	sfx_freq $563
+	sfx_freq $511
+	sfx_freq $416
+	sfx_freq $2c6
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_env 6, 7
+	sfx_duty 2
 	sfx_loop 2
-	sfx_0 7, 182
-	sfx_0 7, 186
+	sfx_freq $7b6
+	sfx_freq $7ba
 	sfx_endloop
-	sfx_1 55
-	sfx_2 8
+	sfx_env 3, 7
+	sfx_duty 2
 	sfx_loop 3
-	sfx_0 7, 182
-	sfx_0 7, 186
+	sfx_freq $7b6
+	sfx_freq $7ba
 	sfx_endloop
-	sfx_1 23
-	sfx_2 8
+	sfx_env 1, 7
+	sfx_duty 2
 	sfx_loop 3
-	sfx_0 7, 182
-	sfx_0 7, 186
+	sfx_freq $7b6
+	sfx_freq $7ba
 	sfx_endloop
 	sfx_end
 
 Sfx_SkullBash_Ch2:
-	sfx_8 17
-	sfx_1 80
+	sfx_pan TRUE, TRUE
+	sfx_env 5, 0
 	sfx_loop 4
-	sfx_0 0, 102
-	sfx_0 0, 86
-	sfx_0 0, 100
-	sfx_0 0, 82
-	sfx_0 0, 100
-	sfx_0 0, 102
-	sfx_0 0, 83
+	sfx_freq $66
+	sfx_freq $56
+	sfx_freq $64
+	sfx_freq $52
+	sfx_freq $64
+	sfx_freq $66
+	sfx_freq $53
 	sfx_endloop
-	sfx_0 0, 102
-	sfx_0 0, 86
-	sfx_0 0, 100
-	sfx_0 0, 82
-	sfx_1 244
-	sfx_0 0, 21
-	sfx_0 0, 66
-	sfx_0 0, 101
-	sfx_0 0, 99
-	sfx_0 0, 99
-	sfx_0 0, 82
-	sfx_1 116
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_1 68
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_1 36
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
-	sfx_0 0, 82
+	sfx_freq $66
+	sfx_freq $56
+	sfx_freq $64
+	sfx_freq $52
+	sfx_env 15, 4
+	sfx_freq $15
+	sfx_freq $42
+	sfx_freq $65
+	sfx_freq $63
+	sfx_freq $63
+	sfx_freq $52
+	sfx_env 7, 4
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_env 4, 4
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_env 2, 4
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
+	sfx_freq $52
 	sfx_end
diff --git a/src/audio/sfx/sfx_slap.asm b/src/audio/sfx/sfx_slap.asm
index 9e40cf5..5fdc3f9 100644
--- a/src/audio/sfx/sfx_slap.asm
+++ b/src/audio/sfx/sfx_slap.asm
@@ -1,61 +1,61 @@
 Sfx_Slap_Ch1:
-	sfx_1 44
-	sfx_8 17
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 4, 78
-	sfx_0 4, 131
-	sfx_1 76
-	sfx_2 8
-	sfx_0 4, 181
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_1 108
-	sfx_2 8
-	sfx_0 5, 99
-	sfx_0 5, 137
-	sfx_0 5, 172
-	sfx_1 140
-	sfx_2 8
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_1 172
-	sfx_2 8
-	sfx_0 6, 66
-	sfx_0 6, 91
-	sfx_0 6, 114
-	sfx_1 204
-	sfx_2 8
-	sfx_0 6, 137
-	sfx_0 6, 158
-	sfx_0 6, 178
+	sfx_env 2, -4
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $44e
+	sfx_freq $483
+	sfx_env 4, -4
+	sfx_duty 2
+	sfx_freq $4b5
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_env 6, -4
+	sfx_duty 2
+	sfx_freq $563
+	sfx_freq $589
+	sfx_freq $5ac
+	sfx_env 8, -4
+	sfx_duty 2
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_env 10, -4
+	sfx_duty 2
+	sfx_freq $642
+	sfx_freq $65b
+	sfx_freq $672
+	sfx_env 12, -4
+	sfx_duty 2
+	sfx_freq $689
+	sfx_freq $69e
+	sfx_freq $6b2
 	sfx_end
 
 Sfx_Slap_Ch2:
-	sfx_8 17
-	sfx_1 0
-	sfx_6 18
+	sfx_pan TRUE, TRUE
+	sfx_env 0, 0
+	sfx_wait 18
 	sfx_loop 2
-	sfx_1 240
-	sfx_0 0, 53
-	sfx_0 0, 19
-	sfx_0 0, 17
-	sfx_1 245
-	sfx_0 0, 17
-	sfx_0 0, 1
-	sfx_1 183
-	sfx_0 0, 19
-	sfx_0 0, 1
-	sfx_0 0, 17
-	sfx_0 0, 1
-	sfx_1 103
-	sfx_0 0, 19
-	sfx_0 0, 1
-	sfx_0 0, 17
-	sfx_0 0, 1
-	sfx_1 71
-	sfx_0 0, 19
-	sfx_0 0, 1
+	sfx_env 15, 0
+	sfx_freq $35
+	sfx_freq $13
+	sfx_freq $11
+	sfx_env 15, 5
+	sfx_freq $11
+	sfx_freq $1
+	sfx_env 11, 7
+	sfx_freq $13
+	sfx_freq $1
+	sfx_freq $11
+	sfx_freq $1
+	sfx_env 6, 7
+	sfx_freq $13
+	sfx_freq $1
+	sfx_freq $11
+	sfx_freq $1
+	sfx_env 4, 7
+	sfx_freq $13
+	sfx_freq $1
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_slash.asm b/src/audio/sfx/sfx_slash.asm
index ae32554..ed978c0 100644
--- a/src/audio/sfx/sfx_slash.asm
+++ b/src/audio/sfx/sfx_slash.asm
@@ -1,38 +1,38 @@
 Sfx_Slash_Ch1:
-	sfx_8 17
-	sfx_1 223
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_1 255
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_1 223
-	sfx_0 0, 33
-	sfx_0 0, 50
-	sfx_1 143
-	sfx_0 0, 33
-	sfx_0 0, 50
-	sfx_0 0, 34
-	sfx_0 0, 51
-	sfx_0 0, 34
-	sfx_0 0, 51
-	sfx_0 0, 35
-	sfx_0 0, 52
-	sfx_1 79
-	sfx_0 0, 35
-	sfx_0 0, 52
-	sfx_0 0, 35
-	sfx_0 0, 52
-	sfx_0 0, 35
-	sfx_0 0, 52
-	sfx_1 31
-	sfx_0 0, 36
-	sfx_0 0, 53
+	sfx_pan TRUE, TRUE
+	sfx_env 13, -7
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_env 15, -7
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_env 13, -7
+	sfx_freq $21
+	sfx_freq $32
+	sfx_env 8, -7
+	sfx_freq $21
+	sfx_freq $32
+	sfx_freq $22
+	sfx_freq $33
+	sfx_freq $22
+	sfx_freq $33
+	sfx_freq $23
+	sfx_freq $34
+	sfx_env 4, -7
+	sfx_freq $23
+	sfx_freq $34
+	sfx_freq $23
+	sfx_freq $34
+	sfx_freq $23
+	sfx_freq $34
+	sfx_env 1, -7
+	sfx_freq $24
+	sfx_freq $35
 	sfx_end
diff --git a/src/audio/sfx/sfx_sleep.asm b/src/audio/sfx/sfx_sleep.asm
index a9cbfe9..87a58c7 100644
--- a/src/audio/sfx/sfx_sleep.asm
+++ b/src/audio/sfx/sfx_sleep.asm
@@ -1,131 +1,131 @@
 Sfx_Sleep_Ch1:
-	sfx_1 228
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 182
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 172
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 162
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 157
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_0 7, 144
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 228
-	sfx_1 228
-	sfx_2 0
-	sfx_0 7, 89
-	sfx_5 0
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 228
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 228
-	sfx_0 7, 57
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 228
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 228
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 228
-	sfx_1 228
-	sfx_2 0
-	sfx_0 6, 66
-	sfx_6 1
-	sfx_0 6, 11
-	sfx_6 1
-	sfx_0 6, 114
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 228
-	sfx_0 6, 11
-	sfx_6 1
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_0 6, 66
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 228
-	sfx_0 5, 237
-	sfx_6 1
-	sfx_0 5, 172
-	sfx_6 1
-	sfx_0 6, 11
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 228
-	sfx_0 5, 172
-	sfx_6 1
-	sfx_0 5, 99
-	sfx_6 1
-	sfx_0 5, 237
-	sfx_6 1
-	sfx_1 0
-	sfx_5 0
-	sfx_6 2
-	sfx_5 0
-	sfx_1 228
-	sfx_0 5, 99
-	sfx_6 1
-	sfx_0 5, 17
-	sfx_6 1
-	sfx_0 5, 172
-	sfx_6 1
+	sfx_env 14, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $7b6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $7ac
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $7a2
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $79d
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_freq $790
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 14, 4
+	sfx_env 14, 4
+	sfx_duty 0
+	sfx_freq $759
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $744
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $739
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $721
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $705
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_env 14, 4
+	sfx_duty 0
+	sfx_freq $642
+	sfx_wait 1
+	sfx_freq $60b
+	sfx_wait 1
+	sfx_freq $672
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $60b
+	sfx_wait 1
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_freq $642
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $5ed
+	sfx_wait 1
+	sfx_freq $5ac
+	sfx_wait 1
+	sfx_freq $60b
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $5ac
+	sfx_wait 1
+	sfx_freq $563
+	sfx_wait 1
+	sfx_freq $5ed
+	sfx_wait 1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_pitch_offset 0
+	sfx_env 14, 4
+	sfx_freq $563
+	sfx_wait 1
+	sfx_freq $511
+	sfx_wait 1
+	sfx_freq $5ac
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_slot_big_hit.asm b/src/audio/sfx/sfx_slot_big_hit.asm
index 97b3866..da6c519 100644
--- a/src/audio/sfx/sfx_slot_big_hit.asm
+++ b/src/audio/sfx/sfx_slot_big_hit.asm
@@ -1,62 +1,62 @@
 Sfx_SlotBigHit_Ch1:
-	sfx_8 17
-	sfx_1 192
-	sfx_2 4
-	sfx_0 7, 131
-	sfx_5 0
-	sfx_6 1
-	sfx_1 96
-	sfx_2 4
-	sfx_0 7, 57
-	sfx_6 1
-	sfx_1 192
-	sfx_2 4
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_1 96
-	sfx_2 4
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_1 192
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_1 96
-	sfx_2 4
-	sfx_0 7, 131
-	sfx_6 1
+	sfx_pan TRUE, TRUE
+	sfx_env 12, 0
+	sfx_duty 1
+	sfx_freq $783
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 6, 0
+	sfx_duty 1
+	sfx_freq $739
+	sfx_wait 1
+	sfx_env 12, 0
+	sfx_duty 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_env 6, 0
+	sfx_duty 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_env 12, 0
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_env 6, 0
+	sfx_duty 1
+	sfx_freq $783
+	sfx_wait 1
 	sfx_loop 2
-	sfx_1 192
-	sfx_2 4
-	sfx_0 7, 193
-	sfx_6 2
-	sfx_1 117
-	sfx_2 4
-	sfx_0 7, 157
-	sfx_6 2
+	sfx_env 12, 0
+	sfx_duty 1
+	sfx_freq $7c1
+	sfx_wait 2
+	sfx_env 7, 5
+	sfx_duty 1
+	sfx_freq $79d
+	sfx_wait 2
 	sfx_endloop
 	sfx_loop 2
-	sfx_1 116
-	sfx_2 4
-	sfx_0 7, 193
-	sfx_6 2
-	sfx_1 68
-	sfx_2 4
-	sfx_0 7, 157
-	sfx_6 2
+	sfx_env 7, 4
+	sfx_duty 1
+	sfx_freq $7c1
+	sfx_wait 2
+	sfx_env 4, 4
+	sfx_duty 1
+	sfx_freq $79d
+	sfx_wait 2
 	sfx_endloop
 	sfx_loop 2
-	sfx_1 68
-	sfx_2 4
-	sfx_0 7, 193
-	sfx_6 2
-	sfx_1 36
-	sfx_2 4
-	sfx_0 7, 157
-	sfx_6 2
+	sfx_env 4, 4
+	sfx_duty 1
+	sfx_freq $7c1
+	sfx_wait 2
+	sfx_env 2, 4
+	sfx_duty 1
+	sfx_freq $79d
+	sfx_wait 2
 	sfx_endloop
-	sfx_1 39
-	sfx_2 4
-	sfx_0 7, 193
-	sfx_6 7
+	sfx_env 2, 7
+	sfx_duty 1
+	sfx_freq $7c1
+	sfx_wait 7
 	sfx_end
diff --git a/src/audio/sfx/sfx_slot_bonus_hit.asm b/src/audio/sfx/sfx_slot_bonus_hit.asm
index b644341..66ae8d9 100644
--- a/src/audio/sfx/sfx_slot_bonus_hit.asm
+++ b/src/audio/sfx/sfx_slot_bonus_hit.asm
@@ -1,46 +1,46 @@
 Sfx_SlotBonusHit_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 192
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_5 0
-	sfx_6 2
-	sfx_0 7, 177
-	sfx_6 2
-	sfx_0 7, 190
-	sfx_6 2
-	sfx_0 7, 177
-	sfx_6 2
-	sfx_0 7, 190
-	sfx_6 2
-	sfx_1 194
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_6 6
+	sfx_env 12, 0
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_freq $7b1
+	sfx_wait 2
+	sfx_freq $7be
+	sfx_wait 2
+	sfx_freq $7b1
+	sfx_wait 2
+	sfx_freq $7be
+	sfx_wait 2
+	sfx_env 12, 2
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_wait 6
 	sfx_endloop
-	sfx_1 192
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_6 2
-	sfx_0 7, 177
-	sfx_6 2
-	sfx_0 7, 190
-	sfx_6 2
-	sfx_0 7, 177
-	sfx_6 2
-	sfx_0 7, 190
-	sfx_6 2
-	sfx_1 196
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_6 5
-	sfx_1 100
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_6 5
-	sfx_1 52
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_6 5
+	sfx_env 12, 0
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_wait 2
+	sfx_freq $7b1
+	sfx_wait 2
+	sfx_freq $7be
+	sfx_wait 2
+	sfx_freq $7b1
+	sfx_wait 2
+	sfx_freq $7be
+	sfx_wait 2
+	sfx_env 12, 4
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_wait 5
+	sfx_env 6, 4
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_wait 5
+	sfx_env 3, 4
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_wait 5
 	sfx_end
diff --git a/src/audio/sfx/sfx_slot_reel.asm b/src/audio/sfx/sfx_slot_reel.asm
index 6a1a50a..732ed53 100644
--- a/src/audio/sfx/sfx_slot_reel.asm
+++ b/src/audio/sfx/sfx_slot_reel.asm
@@ -1,38 +1,38 @@
 Sfx_SlotReel_Ch1:
-	sfx_8 17
-	sfx_1 178
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_5 0
-	sfx_6 1
-	sfx_1 178
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_1 178
-	sfx_2 8
-	sfx_0 7, 89
-	sfx_1 212
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_1 180
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_1 116
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_1 100
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_1 52
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 20
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
+	sfx_pan TRUE, TRUE
+	sfx_env 11, 2
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 11, 2
+	sfx_duty 2
+	sfx_freq $783
+	sfx_env 11, 2
+	sfx_duty 2
+	sfx_freq $759
+	sfx_env 13, 4
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_env 11, 4
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_env 7, 4
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_env 6, 4
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_env 3, 4
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 1, 4
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_slot_small_hit.asm b/src/audio/sfx/sfx_slot_small_hit.asm
index 0b6e0aa..65993ec 100644
--- a/src/audio/sfx/sfx_slot_small_hit.asm
+++ b/src/audio/sfx/sfx_slot_small_hit.asm
@@ -1,46 +1,46 @@
 Sfx_SlotSmallHit_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 193
-	sfx_2 8
-	sfx_0 7, 206
-	sfx_5 0
-	sfx_6 2
-	sfx_1 193
-	sfx_2 8
-	sfx_0 7, 193
-	sfx_6 2
-	sfx_1 193
-	sfx_2 8
-	sfx_0 7, 206
-	sfx_6 2
-	sfx_1 193
-	sfx_2 8
-	sfx_0 7, 193
-	sfx_6 2
-	sfx_1 193
-	sfx_2 8
-	sfx_0 7, 206
-	sfx_6 2
-	sfx_1 193
-	sfx_2 8
-	sfx_0 7, 193
-	sfx_6 2
-	sfx_1 193
-	sfx_2 8
-	sfx_0 7, 206
-	sfx_6 2
-	sfx_1 196
-	sfx_2 8
-	sfx_0 7, 193
-	sfx_6 5
-	sfx_1 100
-	sfx_2 8
-	sfx_0 7, 193
-	sfx_6 5
-	sfx_1 52
-	sfx_2 8
-	sfx_0 7, 193
-	sfx_6 2
+	sfx_env 12, 1
+	sfx_duty 2
+	sfx_freq $7ce
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_env 12, 1
+	sfx_duty 2
+	sfx_freq $7c1
+	sfx_wait 2
+	sfx_env 12, 1
+	sfx_duty 2
+	sfx_freq $7ce
+	sfx_wait 2
+	sfx_env 12, 1
+	sfx_duty 2
+	sfx_freq $7c1
+	sfx_wait 2
+	sfx_env 12, 1
+	sfx_duty 2
+	sfx_freq $7ce
+	sfx_wait 2
+	sfx_env 12, 1
+	sfx_duty 2
+	sfx_freq $7c1
+	sfx_wait 2
+	sfx_env 12, 1
+	sfx_duty 2
+	sfx_freq $7ce
+	sfx_wait 2
+	sfx_env 12, 4
+	sfx_duty 2
+	sfx_freq $7c1
+	sfx_wait 5
+	sfx_env 6, 4
+	sfx_duty 2
+	sfx_freq $7c1
+	sfx_wait 5
+	sfx_env 3, 4
+	sfx_duty 2
+	sfx_freq $7c1
+	sfx_wait 2
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_slot_start.asm b/src/audio/sfx/sfx_slot_start.asm
index ef9b8c9..bda51d6 100644
--- a/src/audio/sfx/sfx_slot_start.asm
+++ b/src/audio/sfx/sfx_slot_start.asm
@@ -1,48 +1,48 @@
 Sfx_SlotStart_Ch1:
-	sfx_8 17
-	sfx_1 244
-	sfx_2 8
-	sfx_0 7, 89
-	sfx_1 244
-	sfx_2 0
-	sfx_0 6, 178
-	sfx_1 244
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_1 241
-	sfx_2 8
-	sfx_0 2, 198
-	sfx_1 241
-	sfx_2 4
-	sfx_0 0, 44
-	sfx_9 60
-	sfx_1 231
-	sfx_2 4
-	sfx_0 7, 57
-	sfx_5 0
-	sfx_6 2
-	sfx_1 135
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_6 2
-	sfx_1 103
-	sfx_2 8
-	sfx_0 7, 157
-	sfx_6 2
-	sfx_1 71
-	sfx_2 8
-	sfx_0 7, 190
-	sfx_6 2
-	sfx_1 55
-	sfx_2 8
-	sfx_0 7, 206
-	sfx_6 2
-	sfx_1 39
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_6 2
-	sfx_1 23
-	sfx_2 8
-	sfx_0 7, 223
-	sfx_6 2
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 4
+	sfx_duty 2
+	sfx_freq $759
+	sfx_env 15, 4
+	sfx_duty 0
+	sfx_freq $6b2
+	sfx_env 15, 4
+	sfx_duty 0
+	sfx_freq $705
+	sfx_env 15, 1
+	sfx_duty 2
+	sfx_freq $2c6
+	sfx_env 15, 1
+	sfx_duty 1
+	sfx_freq $2c
+	sfx_sweep_down 3, 4
+	sfx_env 14, 7
+	sfx_duty 1
+	sfx_freq $739
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_env 8, 7
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_wait 2
+	sfx_env 6, 7
+	sfx_duty 2
+	sfx_freq $79d
+	sfx_wait 2
+	sfx_env 4, 7
+	sfx_duty 2
+	sfx_freq $7be
+	sfx_wait 2
+	sfx_env 3, 7
+	sfx_duty 2
+	sfx_freq $7ce
+	sfx_wait 2
+	sfx_env 2, 7
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_wait 2
+	sfx_env 1, 7
+	sfx_duty 2
+	sfx_freq $7df
+	sfx_wait 2
 	sfx_end
diff --git a/src/audio/sfx/sfx_sludge_punch.asm b/src/audio/sfx/sfx_sludge_punch.asm
index 4c8f0b2..35910b7 100644
--- a/src/audio/sfx/sfx_sludge_punch.asm
+++ b/src/audio/sfx/sfx_sludge_punch.asm
@@ -1,208 +1,208 @@
 Sfx_SludgePunch_Ch1:
-	sfx_1 255
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_6 1
-	sfx_1 255
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_6 1
-	sfx_1 143
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_6 1
-	sfx_1 79
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_6 1
-	sfx_1 31
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_1 0
-	sfx_6 15
-	sfx_1 173
-	sfx_2 8
-	sfx_0 6, 137
-	sfx_0 4, 22
-	sfx_0 3, 155
-	sfx_0 4, 22
-	sfx_0 3, 155
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 0, 44
-	sfx_0 1, 6
-	sfx_0 0, 44
-	sfx_1 240
-	sfx_2 8
-	sfx_0 5, 17
-	sfx_0 6, 214
-	sfx_0 6, 11
-	sfx_0 4, 131
-	sfx_1 240
-	sfx_2 8
-	sfx_0 6, 214
-	sfx_0 4, 22
-	sfx_0 6, 137
-	sfx_1 215
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 6, 11
-	sfx_0 4, 22
-	sfx_1 167
-	sfx_2 8
-	sfx_0 6, 214
-	sfx_0 5, 17
-	sfx_0 6, 137
-	sfx_1 135
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 6, 66
-	sfx_1 0
-	sfx_6 10
-	sfx_1 255
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_6 1
-	sfx_1 255
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_6 1
-	sfx_1 143
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_6 1
-	sfx_1 79
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_6 1
-	sfx_1 31
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 107
-	sfx_1 0
-	sfx_6 15
-	sfx_1 173
-	sfx_2 8
-	sfx_0 6, 137
-	sfx_0 4, 22
-	sfx_0 3, 155
-	sfx_0 4, 22
-	sfx_0 3, 155
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 0, 44
-	sfx_0 1, 6
-	sfx_0 0, 44
-	sfx_1 240
-	sfx_2 8
-	sfx_0 5, 17
-	sfx_0 6, 214
-	sfx_0 6, 11
-	sfx_0 4, 131
-	sfx_1 240
-	sfx_2 8
-	sfx_0 6, 214
-	sfx_0 4, 22
-	sfx_0 6, 137
-	sfx_1 215
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 6, 11
-	sfx_0 4, 22
-	sfx_1 167
-	sfx_2 8
-	sfx_0 6, 214
-	sfx_0 5, 17
-	sfx_0 6, 137
-	sfx_1 135
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 6, 66
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 4, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 1, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_env 0, 0
+	sfx_wait 15
+	sfx_env 10, -5
+	sfx_duty 2
+	sfx_freq $689
+	sfx_freq $416
+	sfx_freq $39b
+	sfx_freq $416
+	sfx_freq $39b
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $2c
+	sfx_freq $106
+	sfx_freq $2c
+	sfx_env 15, 0
+	sfx_duty 2
+	sfx_freq $511
+	sfx_freq $6d6
+	sfx_freq $60b
+	sfx_freq $483
+	sfx_env 15, 0
+	sfx_duty 2
+	sfx_freq $6d6
+	sfx_freq $416
+	sfx_freq $689
+	sfx_env 13, 7
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $60b
+	sfx_freq $416
+	sfx_env 10, 7
+	sfx_duty 2
+	sfx_freq $6d6
+	sfx_freq $511
+	sfx_freq $689
+	sfx_env 8, 7
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $642
+	sfx_env 0, 0
+	sfx_wait 10
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 8, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 4, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 1, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $76b
+	sfx_env 0, 0
+	sfx_wait 15
+	sfx_env 10, -5
+	sfx_duty 2
+	sfx_freq $689
+	sfx_freq $416
+	sfx_freq $39b
+	sfx_freq $416
+	sfx_freq $39b
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $2c
+	sfx_freq $106
+	sfx_freq $2c
+	sfx_env 15, 0
+	sfx_duty 2
+	sfx_freq $511
+	sfx_freq $6d6
+	sfx_freq $60b
+	sfx_freq $483
+	sfx_env 15, 0
+	sfx_duty 2
+	sfx_freq $6d6
+	sfx_freq $416
+	sfx_freq $689
+	sfx_env 13, 7
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $60b
+	sfx_freq $416
+	sfx_env 10, 7
+	sfx_duty 2
+	sfx_freq $6d6
+	sfx_freq $511
+	sfx_freq $689
+	sfx_env 8, 7
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $642
 	sfx_end
 
 Sfx_SludgePunch_Ch2:
-	sfx_8 17
-	sfx_1 0
-	sfx_6 24
-	sfx_1 93
-	sfx_0 0, 21
-	sfx_0 0, 21
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_1 166
-	sfx_0 0, 103
-	sfx_0 0, 97
-	sfx_0 0, 97
-	sfx_0 0, 97
-	sfx_0 0, 113
-	sfx_0 0, 113
-	sfx_1 118
-	sfx_0 0, 97
-	sfx_0 0, 97
-	sfx_0 0, 97
-	sfx_0 0, 113
-	sfx_0 0, 113
-	sfx_1 70
-	sfx_0 0, 97
-	sfx_0 0, 97
-	sfx_0 0, 97
-	sfx_0 0, 113
-	sfx_0 0, 113
-	sfx_1 0
-	sfx_6 8
-	sfx_1 0
-	sfx_6 24
-	sfx_1 93
-	sfx_0 0, 21
-	sfx_0 0, 21
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_1 166
-	sfx_0 0, 103
-	sfx_0 0, 97
-	sfx_0 0, 97
-	sfx_0 0, 97
-	sfx_0 0, 113
-	sfx_0 0, 113
-	sfx_1 118
-	sfx_0 0, 97
-	sfx_0 0, 97
-	sfx_0 0, 97
-	sfx_0 0, 113
-	sfx_0 0, 113
-	sfx_1 70
-	sfx_0 0, 97
-	sfx_0 0, 97
-	sfx_0 0, 97
-	sfx_0 0, 113
-	sfx_0 0, 113
+	sfx_pan TRUE, TRUE
+	sfx_env 0, 0
+	sfx_wait 24
+	sfx_env 5, -5
+	sfx_freq $15
+	sfx_freq $15
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $65
+	sfx_env 10, 6
+	sfx_freq $67
+	sfx_freq $61
+	sfx_freq $61
+	sfx_freq $61
+	sfx_freq $71
+	sfx_freq $71
+	sfx_env 7, 6
+	sfx_freq $61
+	sfx_freq $61
+	sfx_freq $61
+	sfx_freq $71
+	sfx_freq $71
+	sfx_env 4, 6
+	sfx_freq $61
+	sfx_freq $61
+	sfx_freq $61
+	sfx_freq $71
+	sfx_freq $71
+	sfx_env 0, 0
+	sfx_wait 8
+	sfx_env 0, 0
+	sfx_wait 24
+	sfx_env 5, -5
+	sfx_freq $15
+	sfx_freq $15
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $65
+	sfx_env 10, 6
+	sfx_freq $67
+	sfx_freq $61
+	sfx_freq $61
+	sfx_freq $61
+	sfx_freq $71
+	sfx_freq $71
+	sfx_env 7, 6
+	sfx_freq $61
+	sfx_freq $61
+	sfx_freq $61
+	sfx_freq $71
+	sfx_freq $71
+	sfx_env 4, 6
+	sfx_freq $61
+	sfx_freq $61
+	sfx_freq $61
+	sfx_freq $71
+	sfx_freq $71
 	sfx_end
diff --git a/src/audio/sfx/sfx_small_flame.asm b/src/audio/sfx/sfx_small_flame.asm
index 8dae94e..944403d 100644
--- a/src/audio/sfx/sfx_small_flame.asm
+++ b/src/audio/sfx/sfx_small_flame.asm
@@ -1,97 +1,97 @@
 Sfx_SmallFlame_Ch1:
-	sfx_8 17
-	sfx_1 111
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_0 0, 83
-	sfx_0 0, 85
-	sfx_1 246
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 134
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 102
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 70
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 38
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_1 22
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
-	sfx_0 0, 68
+	sfx_pan TRUE, TRUE
+	sfx_env 6, -7
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_freq $54
+	sfx_freq $53
+	sfx_freq $55
+	sfx_env 15, 6
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 8, 6
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 6, 6
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 4, 6
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 2, 6
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_env 1, 6
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
+	sfx_freq $44
 	sfx_end
diff --git a/src/audio/sfx/sfx_small_hit.asm b/src/audio/sfx/sfx_small_hit.asm
index f743a9b..cc53e43 100644
--- a/src/audio/sfx/sfx_small_hit.asm
+++ b/src/audio/sfx/sfx_small_hit.asm
@@ -1,33 +1,33 @@
 Sfx_SmallHit_Ch1:
-	sfx_8 17
-	sfx_1 241
-	sfx_0 0, 45
-	sfx_0 0, 45
-	sfx_0 0, 77
-	sfx_0 0, 77
-	sfx_1 193
-	sfx_0 0, 71
-	sfx_0 0, 23
-	sfx_0 0, 69
-	sfx_0 0, 21
-	sfx_1 129
-	sfx_0 0, 69
-	sfx_0 0, 21
-	sfx_0 0, 68
-	sfx_0 0, 20
-	sfx_1 97
-	sfx_0 0, 20
-	sfx_0 0, 20
-	sfx_0 0, 19
-	sfx_0 0, 19
-	sfx_1 65
-	sfx_0 0, 19
-	sfx_0 0, 19
-	sfx_0 0, 19
-	sfx_0 0, 19
-	sfx_1 33
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
+	sfx_pan TRUE, TRUE
+	sfx_env 15, 1
+	sfx_freq $2d
+	sfx_freq $2d
+	sfx_freq $4d
+	sfx_freq $4d
+	sfx_env 12, 1
+	sfx_freq $47
+	sfx_freq $17
+	sfx_freq $45
+	sfx_freq $15
+	sfx_env 8, 1
+	sfx_freq $45
+	sfx_freq $15
+	sfx_freq $44
+	sfx_freq $14
+	sfx_env 6, 1
+	sfx_freq $14
+	sfx_freq $14
+	sfx_freq $13
+	sfx_freq $13
+	sfx_env 4, 1
+	sfx_freq $13
+	sfx_freq $13
+	sfx_freq $13
+	sfx_freq $13
+	sfx_env 2, 1
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
 	sfx_end
diff --git a/src/audio/sfx/sfx_sonic_boom.asm b/src/audio/sfx/sfx_sonic_boom.asm
index b330af4..9f876d0 100644
--- a/src/audio/sfx/sfx_sonic_boom.asm
+++ b/src/audio/sfx/sfx_sonic_boom.asm
@@ -1,54 +1,54 @@
 Sfx_SonicBoom_Ch1:
-	sfx_8 17
-	sfx_1 223
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_1 255
-	sfx_0 0, 37
-	sfx_0 0, 53
-	sfx_0 0, 37
-	sfx_0 0, 53
-	sfx_0 0, 37
-	sfx_0 0, 53
-	sfx_0 0, 53
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_0 0, 51
-	sfx_0 0, 51
-	sfx_0 0, 51
-	sfx_0 0, 51
-	sfx_0 0, 51
+	sfx_pan TRUE, TRUE
+	sfx_env 13, -7
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_env 15, -7
+	sfx_freq $25
+	sfx_freq $35
+	sfx_freq $25
+	sfx_freq $35
+	sfx_freq $25
+	sfx_freq $35
+	sfx_freq $35
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $34
+	sfx_freq $33
+	sfx_freq $33
+	sfx_freq $33
+	sfx_freq $33
+	sfx_freq $33
 	sfx_loop 5
-	sfx_0 0, 49
-	sfx_0 0, 34
-	sfx_0 0, 50
+	sfx_freq $31
+	sfx_freq $22
+	sfx_freq $32
 	sfx_endloop
-	sfx_1 223
-	sfx_0 0, 34
-	sfx_0 0, 50
-	sfx_1 143
-	sfx_0 0, 34
-	sfx_0 0, 50
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_1 79
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_0 0, 33
-	sfx_0 0, 49
-	sfx_1 31
-	sfx_0 0, 33
-	sfx_0 0, 49
+	sfx_env 13, -7
+	sfx_freq $22
+	sfx_freq $32
+	sfx_env 8, -7
+	sfx_freq $22
+	sfx_freq $32
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_env 4, -7
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_freq $21
+	sfx_freq $31
+	sfx_env 1, -7
+	sfx_freq $21
+	sfx_freq $31
 	sfx_end
diff --git a/src/audio/sfx/sfx_speed.asm b/src/audio/sfx/sfx_speed.asm
index 796d70f..c7fa3b8 100644
--- a/src/audio/sfx/sfx_speed.asm
+++ b/src/audio/sfx/sfx_speed.asm
@@ -1,46 +1,46 @@
 Sfx_Speed_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 31
-	sfx_0 0, 33
-	sfx_1 47
-	sfx_0 0, 33
-	sfx_1 79
-	sfx_0 0, 33
-	sfx_1 111
-	sfx_0 0, 33
-	sfx_1 143
-	sfx_0 0, 33
-	sfx_1 239
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_1 143
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_1 111
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_1 79
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_1 47
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_1 31
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
+	sfx_env 1, -7
+	sfx_freq $21
+	sfx_env 2, -7
+	sfx_freq $21
+	sfx_env 4, -7
+	sfx_freq $21
+	sfx_env 6, -7
+	sfx_freq $21
+	sfx_env 8, -7
+	sfx_freq $21
+	sfx_env 14, -7
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_env 8, -7
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_env 6, -7
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_env 4, -7
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_env 2, -7
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_env 1, -7
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_stone_barrage.asm b/src/audio/sfx/sfx_stone_barrage.asm
index db2c8a2..8bb7031 100644
--- a/src/audio/sfx/sfx_stone_barrage.asm
+++ b/src/audio/sfx/sfx_stone_barrage.asm
@@ -1,49 +1,49 @@
 Sfx_StoneBarrage_Ch1:
-	sfx_8 17
-	sfx_1 223
+	sfx_pan TRUE, TRUE
+	sfx_env 13, -7
 	sfx_loop 4
-	sfx_0 0, 80
-	sfx_0 0, 82
-	sfx_0 0, 80
-	sfx_0 0, 82
-	sfx_0 0, 80
-	sfx_0 0, 82
-	sfx_0 0, 80
-	sfx_0 0, 82
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
+	sfx_freq $50
+	sfx_freq $52
+	sfx_freq $50
+	sfx_freq $52
+	sfx_freq $50
+	sfx_freq $52
+	sfx_freq $50
+	sfx_freq $52
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
 	sfx_endloop
-	sfx_1 143
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_1 79
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_1 31
-	sfx_0 0, 112
-	sfx_0 0, 114
-	sfx_0 0, 112
-	sfx_0 0, 114
+	sfx_env 8, -7
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_env 4, -7
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
+	sfx_env 1, -7
+	sfx_freq $70
+	sfx_freq $72
+	sfx_freq $70
+	sfx_freq $72
 	sfx_end
diff --git a/src/audio/sfx/sfx_stretch_kick.asm b/src/audio/sfx/sfx_stretch_kick.asm
index 00f7606..0d9d939 100644
--- a/src/audio/sfx/sfx_stretch_kick.asm
+++ b/src/audio/sfx/sfx_stretch_kick.asm
@@ -1,30 +1,30 @@
 Sfx_StretchKick_Ch1:
-	sfx_1 255
-	sfx_8 17
-	sfx_2 8
-	sfx_0 6, 11
-	sfx_0 6, 66
-	sfx_0 6, 114
-	sfx_0 6, 137
-	sfx_0 6, 178
-	sfx_0 6, 214
-	sfx_0 6, 246
-	sfx_0 7, 5
-	sfx_0 7, 33
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_0 7, 89
-	sfx_0 7, 107
-	sfx_1 255
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_1 143
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_1 79
-	sfx_2 8
-	sfx_0 7, 144
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 157
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $60b
+	sfx_freq $642
+	sfx_freq $672
+	sfx_freq $689
+	sfx_freq $6b2
+	sfx_freq $6d6
+	sfx_freq $6f6
+	sfx_freq $705
+	sfx_freq $721
+	sfx_freq $739
+	sfx_freq $744
+	sfx_freq $759
+	sfx_freq $76b
+	sfx_env 15, -7
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_env 8, -7
+	sfx_duty 2
+	sfx_freq $783
+	sfx_env 4, -7
+	sfx_duty 2
+	sfx_freq $790
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $79d
 	sfx_end
diff --git a/src/audio/sfx/sfx_string_shot.asm b/src/audio/sfx/sfx_string_shot.asm
index c36232f..97880c5 100644
--- a/src/audio/sfx/sfx_string_shot.asm
+++ b/src/audio/sfx/sfx_string_shot.asm
@@ -1,137 +1,137 @@
 Sfx_StringShot_Ch1:
-	sfx_8 17
-	sfx_1 159
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 200
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 190
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 182
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 172
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 162
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 157
-	sfx_1 0
-	sfx_5 0
-	sfx_6 22
-	sfx_5 255
-	sfx_1 159
-	sfx_1 159
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 200
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 190
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 182
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 172
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 162
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
-	sfx_0 7, 157
+	sfx_pan TRUE, TRUE
+	sfx_env 9, -7
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $7c8
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $7be
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $7b6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $7ac
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $7a2
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $79d
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 22
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_env 9, -7
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $7c8
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $7be
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $7b6
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $7ac
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $7a2
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
+	sfx_freq $79d
 	sfx_end
 
 Sfx_StringShot_Ch2:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 207
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_1 127
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_1 95
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_1 47
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_1 0
-	sfx_5 0
-	sfx_6 10
-	sfx_5 255
-	sfx_1 47
+	sfx_env 12, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_env 7, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_env 5, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_env 2, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 10
+	sfx_pitch_offset -1
+	sfx_env 2, -7
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_stronghold_platform_down.asm b/src/audio/sfx/sfx_stronghold_platform_down.asm
index 3b61150..8be02f5 100644
--- a/src/audio/sfx/sfx_stronghold_platform_down.asm
+++ b/src/audio/sfx/sfx_stronghold_platform_down.asm
@@ -1,79 +1,79 @@
 Sfx_StrongholdPlatformDown_Ch1:
-	sfx_8 17
-	sfx_1 106
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 5, 205
-	sfx_1 170
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 5, 205
-	sfx_1 218
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 5, 205
-	sfx_1 240
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 5, 205
-	sfx_0 5, 172
-	sfx_0 5, 205
-	sfx_0 5, 172
-	sfx_0 5, 137
-	sfx_1 165
-	sfx_2 8
-	sfx_0 5, 172
-	sfx_0 5, 137
-	sfx_0 5, 99
-	sfx_0 5, 137
-	sfx_0 5, 99
-	sfx_0 5, 60
-	sfx_0 5, 99
-	sfx_0 5, 60
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_1 117
-	sfx_2 8
-	sfx_0 5, 137
-	sfx_0 5, 99
-	sfx_0 5, 60
-	sfx_0 5, 99
-	sfx_0 5, 60
-	sfx_0 5, 17
-	sfx_0 5, 60
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_1 85
-	sfx_2 8
-	sfx_0 5, 99
-	sfx_0 5, 60
-	sfx_0 5, 17
-	sfx_0 5, 60
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 131
-	sfx_1 53
-	sfx_2 8
-	sfx_0 5, 60
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 131
-	sfx_0 4, 78
+	sfx_pan TRUE, TRUE
+	sfx_env 6, -2
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $5cd
+	sfx_env 10, -2
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $5cd
+	sfx_env 13, -2
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $5cd
+	sfx_env 15, 0
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $5cd
+	sfx_freq $5ac
+	sfx_freq $5cd
+	sfx_freq $5ac
+	sfx_freq $589
+	sfx_env 10, 5
+	sfx_duty 2
+	sfx_freq $5ac
+	sfx_freq $589
+	sfx_freq $563
+	sfx_freq $589
+	sfx_freq $563
+	sfx_freq $53c
+	sfx_freq $563
+	sfx_freq $53c
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_env 7, 5
+	sfx_duty 2
+	sfx_freq $589
+	sfx_freq $563
+	sfx_freq $53c
+	sfx_freq $563
+	sfx_freq $53c
+	sfx_freq $511
+	sfx_freq $53c
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_env 5, 5
+	sfx_duty 2
+	sfx_freq $563
+	sfx_freq $53c
+	sfx_freq $511
+	sfx_freq $53c
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $483
+	sfx_env 3, 5
+	sfx_duty 2
+	sfx_freq $53c
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $483
+	sfx_freq $44e
 	sfx_end
diff --git a/src/audio/sfx/sfx_stronghold_platform_up.asm b/src/audio/sfx/sfx_stronghold_platform_up.asm
index 9371010..90d13ff 100644
--- a/src/audio/sfx/sfx_stronghold_platform_up.asm
+++ b/src/audio/sfx/sfx_stronghold_platform_up.asm
@@ -1,79 +1,79 @@
 Sfx_StrongholdPlatformUp_Ch1:
-	sfx_8 17
-	sfx_1 106
-	sfx_2 8
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_1 170
-	sfx_2 8
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_1 218
-	sfx_2 8
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_1 240
-	sfx_2 8
-	sfx_0 4, 229
-	sfx_0 5, 17
-	sfx_0 5, 60
-	sfx_0 5, 17
-	sfx_0 5, 60
-	sfx_0 5, 99
-	sfx_1 165
-	sfx_2 8
-	sfx_0 5, 60
-	sfx_0 5, 99
-	sfx_0 5, 137
-	sfx_0 5, 99
-	sfx_0 5, 137
-	sfx_0 5, 172
-	sfx_0 5, 137
-	sfx_0 5, 172
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_1 117
-	sfx_2 8
-	sfx_0 5, 99
-	sfx_0 5, 137
-	sfx_0 5, 172
-	sfx_0 5, 137
-	sfx_0 5, 172
-	sfx_0 5, 205
-	sfx_0 5, 172
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_1 85
-	sfx_2 8
-	sfx_0 5, 137
-	sfx_0 5, 172
-	sfx_0 5, 205
-	sfx_0 5, 172
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
-	sfx_1 53
-	sfx_2 8
-	sfx_0 5, 172
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 5, 205
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 5, 237
-	sfx_0 6, 11
-	sfx_0 6, 40
-	sfx_0 6, 66
+	sfx_pan TRUE, TRUE
+	sfx_env 6, -2
+	sfx_duty 2
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_env 10, -2
+	sfx_duty 2
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_env 13, -2
+	sfx_duty 2
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_env 15, 0
+	sfx_duty 2
+	sfx_freq $4e5
+	sfx_freq $511
+	sfx_freq $53c
+	sfx_freq $511
+	sfx_freq $53c
+	sfx_freq $563
+	sfx_env 10, 5
+	sfx_duty 2
+	sfx_freq $53c
+	sfx_freq $563
+	sfx_freq $589
+	sfx_freq $563
+	sfx_freq $589
+	sfx_freq $5ac
+	sfx_freq $589
+	sfx_freq $5ac
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_env 7, 5
+	sfx_duty 2
+	sfx_freq $563
+	sfx_freq $589
+	sfx_freq $5ac
+	sfx_freq $589
+	sfx_freq $5ac
+	sfx_freq $5cd
+	sfx_freq $5ac
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_env 5, 5
+	sfx_duty 2
+	sfx_freq $589
+	sfx_freq $5ac
+	sfx_freq $5cd
+	sfx_freq $5ac
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
+	sfx_env 3, 5
+	sfx_duty 2
+	sfx_freq $5ac
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $5cd
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $5ed
+	sfx_freq $60b
+	sfx_freq $628
+	sfx_freq $642
 	sfx_end
diff --git a/src/audio/sfx/sfx_supersonic.asm b/src/audio/sfx/sfx_supersonic.asm
index bfd6176..5f8e982 100644
--- a/src/audio/sfx/sfx_supersonic.asm
+++ b/src/audio/sfx/sfx_supersonic.asm
@@ -1,12 +1,12 @@
 Sfx_Supersonic_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 20
-	sfx_1 193
-	sfx_0 0, 15
-	sfx_0 0, 45
-	sfx_0 0, 15
-	sfx_0 0, 45
-	sfx_0 0, 15
-	sfx_0 0, 45
+	sfx_env 12, 1
+	sfx_freq $f
+	sfx_freq $2d
+	sfx_freq $f
+	sfx_freq $2d
+	sfx_freq $f
+	sfx_freq $2d
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_swift.asm b/src/audio/sfx/sfx_swift.asm
index 13a4ff6..d90f4d6 100644
--- a/src/audio/sfx/sfx_swift.asm
+++ b/src/audio/sfx/sfx_swift.asm
@@ -1,220 +1,220 @@
 Sfx_Swift_Ch1:
-	sfx_8 17
-	sfx_1 65
-	sfx_2 0
-	sfx_0 7, 182
-	sfx_5 0
-	sfx_6 1
-	sfx_1 65
-	sfx_2 0
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_1 81
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_1 81
-	sfx_2 0
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_1 97
-	sfx_2 0
-	sfx_0 7, 203
-	sfx_6 1
-	sfx_1 97
-	sfx_2 0
-	sfx_0 7, 217
-	sfx_6 1
-	sfx_1 97
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 97
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_1 113
-	sfx_2 0
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_1 113
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_1 129
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_6 1
-	sfx_1 129
-	sfx_2 0
-	sfx_0 7, 221
-	sfx_6 1
-	sfx_1 145
-	sfx_2 0
-	sfx_0 7, 197
-	sfx_6 1
-	sfx_1 145
-	sfx_2 0
-	sfx_0 7, 217
-	sfx_6 1
-	sfx_1 161
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 161
-	sfx_2 0
-	sfx_0 7, 197
-	sfx_6 1
-	sfx_1 161
-	sfx_2 0
-	sfx_0 7, 217
-	sfx_6 1
-	sfx_1 145
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 145
-	sfx_2 0
-	sfx_0 7, 197
-	sfx_6 1
-	sfx_1 145
-	sfx_2 0
-	sfx_0 7, 217
-	sfx_6 1
-	sfx_1 129
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 129
-	sfx_2 0
-	sfx_0 7, 197
-	sfx_6 1
-	sfx_1 129
-	sfx_2 0
-	sfx_0 7, 217
-	sfx_6 1
-	sfx_1 113
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 113
-	sfx_2 0
-	sfx_0 7, 197
-	sfx_6 1
-	sfx_1 113
-	sfx_2 0
-	sfx_0 7, 217
-	sfx_6 1
-	sfx_1 97
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_1 73
-	sfx_2 0
-	sfx_0 7, 172
-	sfx_0 7, 209
-	sfx_1 99
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_0 7, 223
-	sfx_1 51
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_0 7, 223
-	sfx_1 35
-	sfx_2 0
-	sfx_0 7, 214
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_6 2
-	sfx_1 244
-	sfx_2 4
-	sfx_0 7, 89
-	sfx_0 7, 190
-	sfx_0 7, 219
-	sfx_1 243
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_6 1
-	sfx_1 243
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_6 1
-	sfx_2 0
-	sfx_1 243
-	sfx_0 7, 144
-	sfx_1 0
-	sfx_6 1
-	sfx_2 4
-	sfx_1 243
-	sfx_0 7, 214
-	sfx_1 147
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_6 1
-	sfx_1 147
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_6 1
-	sfx_2 0
-	sfx_1 147
-	sfx_0 7, 144
-	sfx_1 0
-	sfx_6 1
-	sfx_1 147
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_1 83
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_6 1
-	sfx_1 83
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_6 1
-	sfx_2 0
-	sfx_1 83
-	sfx_0 7, 144
-	sfx_1 0
-	sfx_6 1
-	sfx_1 83
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_1 51
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_6 1
-	sfx_1 51
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_6 1
-	sfx_2 0
-	sfx_1 51
-	sfx_0 7, 144
-	sfx_1 0
-	sfx_6 1
-	sfx_1 51
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_1 35
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_6 1
-	sfx_1 35
-	sfx_0 7, 193
-	sfx_1 0
-	sfx_6 1
-	sfx_2 0
-	sfx_1 35
-	sfx_0 7, 144
-	sfx_1 0
-	sfx_6 1
-	sfx_1 35
-	sfx_2 4
-	sfx_0 7, 214
+	sfx_pan TRUE, TRUE
+	sfx_env 4, 1
+	sfx_duty 0
+	sfx_freq $7b6
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 4, 1
+	sfx_duty 0
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_env 5, 1
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_env 5, 1
+	sfx_duty 0
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_env 6, 1
+	sfx_duty 0
+	sfx_freq $7cb
+	sfx_wait 1
+	sfx_env 6, 1
+	sfx_duty 0
+	sfx_freq $7d9
+	sfx_wait 1
+	sfx_env 6, 1
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 6, 1
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_env 7, 1
+	sfx_duty 0
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_env 7, 1
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_env 8, 1
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_wait 1
+	sfx_env 8, 1
+	sfx_duty 0
+	sfx_freq $7dd
+	sfx_wait 1
+	sfx_env 9, 1
+	sfx_duty 0
+	sfx_freq $7c5
+	sfx_wait 1
+	sfx_env 9, 1
+	sfx_duty 0
+	sfx_freq $7d9
+	sfx_wait 1
+	sfx_env 10, 1
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 10, 1
+	sfx_duty 0
+	sfx_freq $7c5
+	sfx_wait 1
+	sfx_env 10, 1
+	sfx_duty 0
+	sfx_freq $7d9
+	sfx_wait 1
+	sfx_env 9, 1
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 9, 1
+	sfx_duty 0
+	sfx_freq $7c5
+	sfx_wait 1
+	sfx_env 9, 1
+	sfx_duty 0
+	sfx_freq $7d9
+	sfx_wait 1
+	sfx_env 8, 1
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 8, 1
+	sfx_duty 0
+	sfx_freq $7c5
+	sfx_wait 1
+	sfx_env 8, 1
+	sfx_duty 0
+	sfx_freq $7d9
+	sfx_wait 1
+	sfx_env 7, 1
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 7, 1
+	sfx_duty 0
+	sfx_freq $7c5
+	sfx_wait 1
+	sfx_env 7, 1
+	sfx_duty 0
+	sfx_freq $7d9
+	sfx_wait 1
+	sfx_env 6, 1
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_env 4, -1
+	sfx_duty 0
+	sfx_freq $7ac
+	sfx_freq $7d1
+	sfx_env 6, 3
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_freq $7df
+	sfx_env 3, 3
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_freq $7df
+	sfx_env 2, 3
+	sfx_duty 0
+	sfx_freq $7d6
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_wait 2
+	sfx_env 15, 4
+	sfx_duty 1
+	sfx_freq $759
+	sfx_freq $7be
+	sfx_freq $7db
+	sfx_env 15, 3
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 15, 3
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_duty 0
+	sfx_env 15, 3
+	sfx_freq $790
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_duty 1
+	sfx_env 15, 3
+	sfx_freq $7d6
+	sfx_env 9, 3
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 9, 3
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_duty 0
+	sfx_env 9, 3
+	sfx_freq $790
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 9, 3
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_env 5, 3
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 5, 3
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_duty 0
+	sfx_env 5, 3
+	sfx_freq $790
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 5, 3
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_env 3, 3
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 3, 3
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_duty 0
+	sfx_env 3, 3
+	sfx_freq $790
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 3, 3
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_env 2, 3
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 2, 3
+	sfx_freq $7c1
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_duty 0
+	sfx_env 2, 3
+	sfx_freq $790
+	sfx_env 0, 0
+	sfx_wait 1
+	sfx_env 2, 3
+	sfx_duty 1
+	sfx_freq $7d6
 	sfx_end
diff --git a/src/audio/sfx/sfx_tail_slap.asm b/src/audio/sfx/sfx_tail_slap.asm
index 9bb14bf..88581ff 100644
--- a/src/audio/sfx/sfx_tail_slap.asm
+++ b/src/audio/sfx/sfx_tail_slap.asm
@@ -1,102 +1,102 @@
 Sfx_TailSlap_Ch1:
-	sfx_1 139
-	sfx_8 17
-	sfx_2 4
-	sfx_0 4, 229
-	sfx_0 5, 99
-	sfx_0 5, 237
-	sfx_0 6, 66
-	sfx_0 6, 114
-	sfx_1 203
-	sfx_2 4
-	sfx_0 6, 11
-	sfx_0 5, 172
-	sfx_0 5, 99
-	sfx_1 247
-	sfx_2 4
-	sfx_0 5, 60
-	sfx_0 5, 17
-	sfx_0 4, 229
-	sfx_0 4, 181
-	sfx_0 4, 131
-	sfx_0 4, 78
-	sfx_0 4, 22
-	sfx_1 199
-	sfx_2 4
-	sfx_0 3, 218
-	sfx_0 3, 155
-	sfx_0 3, 88
-	sfx_0 3, 18
-	sfx_0 2, 198
-	sfx_1 151
-	sfx_2 4
-	sfx_0 2, 120
-	sfx_0 2, 34
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_1 244
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 2, 198
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 0, 156
-	sfx_1 247
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 2, 198
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 0, 156
-	sfx_0 0, 44
-	sfx_1 103
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 2, 198
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 0, 156
-	sfx_0 0, 44
-	sfx_1 55
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 2, 198
-	sfx_0 1, 201
-	sfx_0 1, 107
-	sfx_0 1, 6
-	sfx_0 0, 156
-	sfx_0 0, 44
+	sfx_env 8, -3
+	sfx_pan TRUE, TRUE
+	sfx_duty 1
+	sfx_freq $4e5
+	sfx_freq $563
+	sfx_freq $5ed
+	sfx_freq $642
+	sfx_freq $672
+	sfx_env 12, -3
+	sfx_duty 1
+	sfx_freq $60b
+	sfx_freq $5ac
+	sfx_freq $563
+	sfx_env 15, 7
+	sfx_duty 1
+	sfx_freq $53c
+	sfx_freq $511
+	sfx_freq $4e5
+	sfx_freq $4b5
+	sfx_freq $483
+	sfx_freq $44e
+	sfx_freq $416
+	sfx_env 12, 7
+	sfx_duty 1
+	sfx_freq $3da
+	sfx_freq $39b
+	sfx_freq $358
+	sfx_freq $312
+	sfx_freq $2c6
+	sfx_env 9, 7
+	sfx_duty 1
+	sfx_freq $278
+	sfx_freq $222
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_env 15, 4
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $2c6
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $9c
+	sfx_env 15, 7
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $2c6
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $9c
+	sfx_freq $2c
+	sfx_env 6, 7
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $2c6
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $9c
+	sfx_freq $2c
+	sfx_env 3, 7
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $2c6
+	sfx_freq $1c9
+	sfx_freq $16b
+	sfx_freq $106
+	sfx_freq $9c
+	sfx_freq $2c
 	sfx_end
 
 Sfx_TailSlap_Ch2:
-	sfx_8 17
-	sfx_1 0
-	sfx_6 23
-	sfx_1 196
-	sfx_0 0, 21
-	sfx_0 0, 53
-	sfx_0 0, 100
-	sfx_0 0, 100
-	sfx_0 0, 85
-	sfx_0 0, 84
-	sfx_1 247
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_1 103
-	sfx_0 0, 101
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_1 55
-	sfx_0 0, 101
-	sfx_0 0, 101
-	sfx_0 0, 85
-	sfx_0 0, 85
-	sfx_0 0, 85
+	sfx_pan TRUE, TRUE
+	sfx_env 0, 0
+	sfx_wait 23
+	sfx_env 12, 4
+	sfx_freq $15
+	sfx_freq $35
+	sfx_freq $64
+	sfx_freq $64
+	sfx_freq $55
+	sfx_freq $54
+	sfx_env 15, 7
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_env 6, 7
+	sfx_freq $65
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
+	sfx_env 3, 7
+	sfx_freq $65
+	sfx_freq $65
+	sfx_freq $55
+	sfx_freq $55
+	sfx_freq $55
 	sfx_end
diff --git a/src/audio/sfx/sfx_tail_whip.asm b/src/audio/sfx/sfx_tail_whip.asm
index eb3a994..00da6ec 100644
--- a/src/audio/sfx/sfx_tail_whip.asm
+++ b/src/audio/sfx/sfx_tail_whip.asm
@@ -1,95 +1,95 @@
 Sfx_TailWhip_Ch1:
-	sfx_1 27
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_5 0
-	sfx_6 1
-	sfx_1 43
-	sfx_2 8
-	sfx_0 7, 182
-	sfx_6 1
-	sfx_1 59
-	sfx_2 8
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_1 123
-	sfx_2 8
-	sfx_0 7, 193
-	sfx_1 155
-	sfx_2 8
-	sfx_0 7, 197
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 217
-	sfx_1 75
-	sfx_2 8
-	sfx_0 7, 197
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 217
-	sfx_1 43
-	sfx_2 8
-	sfx_0 7, 197
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 217
-	sfx_1 0
-	sfx_6 8
-	sfx_1 27
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_0 7, 157
-	sfx_1 43
-	sfx_2 8
-	sfx_0 7, 162
-	sfx_1 75
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_1 107
-	sfx_2 8
-	sfx_0 7, 177
-	sfx_0 7, 190
-	sfx_0 7, 193
-	sfx_0 7, 206
-	sfx_1 59
-	sfx_2 8
-	sfx_0 7, 177
-	sfx_0 7, 190
-	sfx_0 7, 193
-	sfx_0 7, 206
-	sfx_1 27
-	sfx_2 8
-	sfx_0 7, 177
-	sfx_0 7, 190
-	sfx_0 7, 193
-	sfx_0 7, 206
-	sfx_1 0
-	sfx_6 6
-	sfx_1 27
-	sfx_2 8
-	sfx_0 7, 172
-	sfx_0 7, 182
-	sfx_1 43
-	sfx_2 8
-	sfx_0 7, 186
-	sfx_0 7, 193
-	sfx_1 75
-	sfx_2 8
-	sfx_0 7, 197
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 217
-	sfx_1 43
-	sfx_2 8
-	sfx_0 7, 197
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 217
-	sfx_1 27
-	sfx_2 8
-	sfx_0 7, 197
-	sfx_0 7, 206
-	sfx_0 7, 209
-	sfx_0 7, 217
+	sfx_env 1, -3
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_env 2, -3
+	sfx_duty 2
+	sfx_freq $7b6
+	sfx_wait 1
+	sfx_env 3, -3
+	sfx_duty 2
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_env 7, -3
+	sfx_duty 2
+	sfx_freq $7c1
+	sfx_env 9, -3
+	sfx_duty 2
+	sfx_freq $7c5
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d9
+	sfx_env 4, -3
+	sfx_duty 2
+	sfx_freq $7c5
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d9
+	sfx_env 2, -3
+	sfx_duty 2
+	sfx_freq $7c5
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d9
+	sfx_env 0, 0
+	sfx_wait 8
+	sfx_env 1, -3
+	sfx_duty 2
+	sfx_freq $783
+	sfx_freq $79d
+	sfx_env 2, -3
+	sfx_duty 2
+	sfx_freq $7a2
+	sfx_env 4, -3
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_env 6, -3
+	sfx_duty 2
+	sfx_freq $7b1
+	sfx_freq $7be
+	sfx_freq $7c1
+	sfx_freq $7ce
+	sfx_env 3, -3
+	sfx_duty 2
+	sfx_freq $7b1
+	sfx_freq $7be
+	sfx_freq $7c1
+	sfx_freq $7ce
+	sfx_env 1, -3
+	sfx_duty 2
+	sfx_freq $7b1
+	sfx_freq $7be
+	sfx_freq $7c1
+	sfx_freq $7ce
+	sfx_env 0, 0
+	sfx_wait 6
+	sfx_env 1, -3
+	sfx_duty 2
+	sfx_freq $7ac
+	sfx_freq $7b6
+	sfx_env 2, -3
+	sfx_duty 2
+	sfx_freq $7ba
+	sfx_freq $7c1
+	sfx_env 4, -3
+	sfx_duty 2
+	sfx_freq $7c5
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d9
+	sfx_env 2, -3
+	sfx_duty 2
+	sfx_freq $7c5
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d9
+	sfx_env 1, -3
+	sfx_duty 2
+	sfx_freq $7c5
+	sfx_freq $7ce
+	sfx_freq $7d1
+	sfx_freq $7d9
 	sfx_end
diff --git a/src/audio/sfx/sfx_tcg1_intro_orb.asm b/src/audio/sfx/sfx_tcg1_intro_orb.asm
index c4f60e9..f8cf471 100644
--- a/src/audio/sfx/sfx_tcg1_intro_orb.asm
+++ b/src/audio/sfx/sfx_tcg1_intro_orb.asm
@@ -1,112 +1,112 @@
 Sfx_Tcg1_IntroOrb_Ch1:
-	sfx_1 207
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 190
-	sfx_0 7, 221
-	sfx_0 7, 186
-	sfx_0 7, 219
-	sfx_0 7, 182
-	sfx_0 7, 217
-	sfx_0 7, 177
-	sfx_0 7, 214
-	sfx_0 7, 172
-	sfx_0 7, 212
-	sfx_0 7, 167
-	sfx_0 7, 209
-	sfx_0 7, 162
-	sfx_0 7, 209
-	sfx_0 7, 162
-	sfx_0 7, 206
-	sfx_0 7, 157
-	sfx_0 7, 203
-	sfx_0 7, 151
-	sfx_0 7, 200
-	sfx_0 7, 144
-	sfx_0 7, 197
-	sfx_0 7, 138
-	sfx_0 7, 193
-	sfx_0 7, 131
-	sfx_1 143
-	sfx_0 7, 190
-	sfx_0 7, 123
-	sfx_0 7, 186
-	sfx_0 7, 115
-	sfx_0 7, 182
-	sfx_0 7, 107
-	sfx_0 7, 177
-	sfx_0 7, 98
-	sfx_0 7, 172
-	sfx_0 7, 89
-	sfx_0 7, 167
-	sfx_0 7, 79
-	sfx_0 7, 162
-	sfx_0 7, 68
-	sfx_0 7, 162
-	sfx_0 7, 68
-	sfx_0 7, 157
-	sfx_0 7, 57
-	sfx_0 7, 151
-	sfx_0 7, 45
-	sfx_0 7, 144
-	sfx_0 7, 33
-	sfx_0 7, 138
-	sfx_0 7, 20
-	sfx_0 7, 131
-	sfx_0 7, 5
-	sfx_1 79
-	sfx_0 7, 123
-	sfx_0 6, 246
-	sfx_0 7, 115
-	sfx_0 6, 231
-	sfx_0 7, 107
-	sfx_0 6, 214
-	sfx_0 7, 98
-	sfx_0 6, 196
-	sfx_0 7, 89
-	sfx_0 6, 178
-	sfx_0 7, 79
-	sfx_0 6, 158
-	sfx_0 7, 68
-	sfx_0 6, 137
-	sfx_0 7, 68
-	sfx_0 6, 137
-	sfx_0 7, 57
-	sfx_0 6, 114
-	sfx_0 7, 45
-	sfx_0 6, 91
-	sfx_0 7, 33
-	sfx_0 6, 66
-	sfx_0 7, 20
-	sfx_0 6, 40
-	sfx_0 7, 5
-	sfx_0 6, 11
-	sfx_1 47
-	sfx_0 6, 246
-	sfx_0 5, 237
-	sfx_0 6, 231
-	sfx_0 5, 205
-	sfx_0 6, 214
-	sfx_0 5, 172
-	sfx_0 6, 196
-	sfx_0 5, 137
-	sfx_0 6, 178
-	sfx_0 5, 99
-	sfx_0 6, 158
-	sfx_0 5, 60
-	sfx_0 6, 137
-	sfx_0 5, 17
-	sfx_0 6, 137
-	sfx_0 5, 17
-	sfx_0 6, 114
-	sfx_0 4, 229
-	sfx_0 6, 91
-	sfx_0 4, 181
-	sfx_0 6, 66
-	sfx_0 4, 131
-	sfx_0 6, 40
-	sfx_0 4, 78
-	sfx_0 6, 11
-	sfx_0 4, 22
+	sfx_env 12, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7be
+	sfx_freq $7dd
+	sfx_freq $7ba
+	sfx_freq $7db
+	sfx_freq $7b6
+	sfx_freq $7d9
+	sfx_freq $7b1
+	sfx_freq $7d6
+	sfx_freq $7ac
+	sfx_freq $7d4
+	sfx_freq $7a7
+	sfx_freq $7d1
+	sfx_freq $7a2
+	sfx_freq $7d1
+	sfx_freq $7a2
+	sfx_freq $7ce
+	sfx_freq $79d
+	sfx_freq $7cb
+	sfx_freq $797
+	sfx_freq $7c8
+	sfx_freq $790
+	sfx_freq $7c5
+	sfx_freq $78a
+	sfx_freq $7c1
+	sfx_freq $783
+	sfx_env 8, -7
+	sfx_freq $7be
+	sfx_freq $77b
+	sfx_freq $7ba
+	sfx_freq $773
+	sfx_freq $7b6
+	sfx_freq $76b
+	sfx_freq $7b1
+	sfx_freq $762
+	sfx_freq $7ac
+	sfx_freq $759
+	sfx_freq $7a7
+	sfx_freq $74f
+	sfx_freq $7a2
+	sfx_freq $744
+	sfx_freq $7a2
+	sfx_freq $744
+	sfx_freq $79d
+	sfx_freq $739
+	sfx_freq $797
+	sfx_freq $72d
+	sfx_freq $790
+	sfx_freq $721
+	sfx_freq $78a
+	sfx_freq $714
+	sfx_freq $783
+	sfx_freq $705
+	sfx_env 4, -7
+	sfx_freq $77b
+	sfx_freq $6f6
+	sfx_freq $773
+	sfx_freq $6e7
+	sfx_freq $76b
+	sfx_freq $6d6
+	sfx_freq $762
+	sfx_freq $6c4
+	sfx_freq $759
+	sfx_freq $6b2
+	sfx_freq $74f
+	sfx_freq $69e
+	sfx_freq $744
+	sfx_freq $689
+	sfx_freq $744
+	sfx_freq $689
+	sfx_freq $739
+	sfx_freq $672
+	sfx_freq $72d
+	sfx_freq $65b
+	sfx_freq $721
+	sfx_freq $642
+	sfx_freq $714
+	sfx_freq $628
+	sfx_freq $705
+	sfx_freq $60b
+	sfx_env 2, -7
+	sfx_freq $6f6
+	sfx_freq $5ed
+	sfx_freq $6e7
+	sfx_freq $5cd
+	sfx_freq $6d6
+	sfx_freq $5ac
+	sfx_freq $6c4
+	sfx_freq $589
+	sfx_freq $6b2
+	sfx_freq $563
+	sfx_freq $69e
+	sfx_freq $53c
+	sfx_freq $689
+	sfx_freq $511
+	sfx_freq $689
+	sfx_freq $511
+	sfx_freq $672
+	sfx_freq $4e5
+	sfx_freq $65b
+	sfx_freq $4b5
+	sfx_freq $642
+	sfx_freq $483
+	sfx_freq $628
+	sfx_freq $44e
+	sfx_freq $60b
+	sfx_freq $416
 	sfx_end
diff --git a/src/audio/sfx/sfx_tcg1_intro_orb_scatter.asm b/src/audio/sfx/sfx_tcg1_intro_orb_scatter.asm
index 43e78d9..cd93c3a 100644
--- a/src/audio/sfx/sfx_tcg1_intro_orb_scatter.asm
+++ b/src/audio/sfx/sfx_tcg1_intro_orb_scatter.asm
@@ -1,76 +1,76 @@
 Sfx_Tcg1_IntroOrbScatter_Ch1:
-	sfx_1 196
-	sfx_8 17
-	sfx_2 0
-	sfx_0 6, 66
-	sfx_5 0
-	sfx_6 1
-	sfx_0 6, 178
-	sfx_6 1
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_1 164
-	sfx_2 0
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 132
-	sfx_2 0
-	sfx_0 7, 144
-	sfx_6 1
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 116
-	sfx_2 0
-	sfx_0 6, 66
-	sfx_6 1
-	sfx_0 6, 178
-	sfx_6 1
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_1 100
-	sfx_2 0
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 84
-	sfx_2 0
-	sfx_0 7, 144
-	sfx_6 1
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 68
-	sfx_2 0
-	sfx_0 6, 66
-	sfx_6 1
-	sfx_0 6, 178
-	sfx_6 1
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_1 36
-	sfx_2 0
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 20
-	sfx_2 0
-	sfx_0 7, 144
-	sfx_6 1
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
+	sfx_env 12, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $642
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $6b2
+	sfx_wait 1
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_env 10, 4
+	sfx_duty 0
+	sfx_freq $721
+	sfx_wait 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 8, 4
+	sfx_duty 0
+	sfx_freq $790
+	sfx_wait 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 7, 4
+	sfx_duty 0
+	sfx_freq $642
+	sfx_wait 1
+	sfx_freq $6b2
+	sfx_wait 1
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_env 6, 4
+	sfx_duty 0
+	sfx_freq $721
+	sfx_wait 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 5, 4
+	sfx_duty 0
+	sfx_freq $790
+	sfx_wait 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 4, 4
+	sfx_duty 0
+	sfx_freq $642
+	sfx_wait 1
+	sfx_freq $6b2
+	sfx_wait 1
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_env 2, 4
+	sfx_duty 0
+	sfx_freq $721
+	sfx_wait 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 1, 4
+	sfx_duty 0
+	sfx_freq $790
+	sfx_wait 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_tcg1_intro_orb_swoop.asm b/src/audio/sfx/sfx_tcg1_intro_orb_swoop.asm
index f9f98f6..3199d2d 100644
--- a/src/audio/sfx/sfx_tcg1_intro_orb_swoop.asm
+++ b/src/audio/sfx/sfx_tcg1_intro_orb_swoop.asm
@@ -1,125 +1,125 @@
 Sfx_Tcg1_IntroOrbSwoop_Ch1:
-	sfx_1 207
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_0 7, 190
-	sfx_0 7, 219
-	sfx_0 7, 182
-	sfx_0 7, 214
-	sfx_0 7, 172
-	sfx_0 7, 209
-	sfx_0 7, 162
-	sfx_0 7, 206
-	sfx_0 7, 157
-	sfx_0 7, 200
-	sfx_0 7, 144
-	sfx_0 7, 193
-	sfx_0 7, 131
-	sfx_1 143
-	sfx_0 7, 190
-	sfx_0 7, 123
-	sfx_0 7, 182
-	sfx_0 7, 107
-	sfx_0 7, 172
-	sfx_0 7, 89
-	sfx_0 7, 162
-	sfx_0 7, 68
-	sfx_0 7, 157
-	sfx_0 7, 57
-	sfx_0 7, 144
-	sfx_0 7, 33
-	sfx_0 7, 131
-	sfx_0 7, 5
-	sfx_1 79
-	sfx_0 7, 123
-	sfx_0 6, 246
-	sfx_0 7, 107
-	sfx_0 6, 214
-	sfx_0 7, 89
-	sfx_0 6, 178
-	sfx_0 7, 68
-	sfx_0 6, 137
-	sfx_0 7, 57
-	sfx_0 6, 114
-	sfx_0 7, 33
-	sfx_0 6, 66
-	sfx_0 7, 5
-	sfx_0 6, 11
-	sfx_1 47
-	sfx_0 6, 246
-	sfx_0 5, 237
-	sfx_0 6, 214
-	sfx_0 5, 172
-	sfx_0 6, 178
-	sfx_0 5, 99
-	sfx_0 6, 137
-	sfx_0 5, 17
-	sfx_0 6, 114
-	sfx_0 4, 229
-	sfx_0 6, 66
-	sfx_0 4, 131
-	sfx_0 6, 11
-	sfx_0 4, 22
-	sfx_1 207
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 6, 11
-	sfx_0 4, 131
-	sfx_0 6, 66
-	sfx_0 4, 229
-	sfx_0 6, 114
-	sfx_0 5, 17
-	sfx_0 6, 137
-	sfx_0 5, 99
-	sfx_0 6, 178
-	sfx_0 5, 172
-	sfx_0 6, 214
-	sfx_0 5, 237
-	sfx_0 6, 246
-	sfx_1 143
-	sfx_0 6, 11
-	sfx_0 7, 5
-	sfx_0 6, 66
-	sfx_0 7, 33
-	sfx_0 6, 114
-	sfx_0 7, 57
-	sfx_0 6, 137
-	sfx_0 7, 68
-	sfx_0 6, 178
-	sfx_0 7, 89
-	sfx_0 6, 214
-	sfx_0 7, 107
-	sfx_0 6, 246
-	sfx_0 7, 123
-	sfx_1 79
-	sfx_0 7, 5
-	sfx_0 7, 131
-	sfx_0 7, 33
-	sfx_0 7, 144
-	sfx_0 7, 57
-	sfx_0 7, 157
-	sfx_0 7, 68
-	sfx_0 7, 162
-	sfx_0 7, 89
-	sfx_0 7, 172
-	sfx_0 7, 107
-	sfx_0 7, 182
-	sfx_0 7, 123
-	sfx_0 7, 190
-	sfx_1 47
-	sfx_0 7, 131
-	sfx_0 7, 193
-	sfx_0 7, 144
-	sfx_0 7, 200
-	sfx_0 7, 157
-	sfx_0 7, 206
-	sfx_0 7, 162
-	sfx_0 7, 209
-	sfx_0 7, 172
-	sfx_0 7, 214
-	sfx_0 7, 182
-	sfx_0 7, 219
-	sfx_0 7, 190
-	sfx_0 7, 223
+	sfx_env 12, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_freq $7be
+	sfx_freq $7db
+	sfx_freq $7b6
+	sfx_freq $7d6
+	sfx_freq $7ac
+	sfx_freq $7d1
+	sfx_freq $7a2
+	sfx_freq $7ce
+	sfx_freq $79d
+	sfx_freq $7c8
+	sfx_freq $790
+	sfx_freq $7c1
+	sfx_freq $783
+	sfx_env 8, -7
+	sfx_freq $7be
+	sfx_freq $77b
+	sfx_freq $7b6
+	sfx_freq $76b
+	sfx_freq $7ac
+	sfx_freq $759
+	sfx_freq $7a2
+	sfx_freq $744
+	sfx_freq $79d
+	sfx_freq $739
+	sfx_freq $790
+	sfx_freq $721
+	sfx_freq $783
+	sfx_freq $705
+	sfx_env 4, -7
+	sfx_freq $77b
+	sfx_freq $6f6
+	sfx_freq $76b
+	sfx_freq $6d6
+	sfx_freq $759
+	sfx_freq $6b2
+	sfx_freq $744
+	sfx_freq $689
+	sfx_freq $739
+	sfx_freq $672
+	sfx_freq $721
+	sfx_freq $642
+	sfx_freq $705
+	sfx_freq $60b
+	sfx_env 2, -7
+	sfx_freq $6f6
+	sfx_freq $5ed
+	sfx_freq $6d6
+	sfx_freq $5ac
+	sfx_freq $6b2
+	sfx_freq $563
+	sfx_freq $689
+	sfx_freq $511
+	sfx_freq $672
+	sfx_freq $4e5
+	sfx_freq $642
+	sfx_freq $483
+	sfx_freq $60b
+	sfx_freq $416
+	sfx_env 12, -7
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $60b
+	sfx_freq $483
+	sfx_freq $642
+	sfx_freq $4e5
+	sfx_freq $672
+	sfx_freq $511
+	sfx_freq $689
+	sfx_freq $563
+	sfx_freq $6b2
+	sfx_freq $5ac
+	sfx_freq $6d6
+	sfx_freq $5ed
+	sfx_freq $6f6
+	sfx_env 8, -7
+	sfx_freq $60b
+	sfx_freq $705
+	sfx_freq $642
+	sfx_freq $721
+	sfx_freq $672
+	sfx_freq $739
+	sfx_freq $689
+	sfx_freq $744
+	sfx_freq $6b2
+	sfx_freq $759
+	sfx_freq $6d6
+	sfx_freq $76b
+	sfx_freq $6f6
+	sfx_freq $77b
+	sfx_env 4, -7
+	sfx_freq $705
+	sfx_freq $783
+	sfx_freq $721
+	sfx_freq $790
+	sfx_freq $739
+	sfx_freq $79d
+	sfx_freq $744
+	sfx_freq $7a2
+	sfx_freq $759
+	sfx_freq $7ac
+	sfx_freq $76b
+	sfx_freq $7b6
+	sfx_freq $77b
+	sfx_freq $7be
+	sfx_env 2, -7
+	sfx_freq $783
+	sfx_freq $7c1
+	sfx_freq $790
+	sfx_freq $7c8
+	sfx_freq $79d
+	sfx_freq $7ce
+	sfx_freq $7a2
+	sfx_freq $7d1
+	sfx_freq $7ac
+	sfx_freq $7d6
+	sfx_freq $7b6
+	sfx_freq $7db
+	sfx_freq $7be
+	sfx_freq $7df
 	sfx_end
diff --git a/src/audio/sfx/sfx_tcg1_intro_orb_title.asm b/src/audio/sfx/sfx_tcg1_intro_orb_title.asm
index 6c43701..4362cd8 100644
--- a/src/audio/sfx/sfx_tcg1_intro_orb_title.asm
+++ b/src/audio/sfx/sfx_tcg1_intro_orb_title.asm
@@ -1,97 +1,97 @@
 Sfx_Tcg1_IntroOrbTitle_Ch1:
-	sfx_1 207
-	sfx_8 17
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_0 6, 11
-	sfx_0 4, 131
-	sfx_0 6, 66
-	sfx_0 4, 229
-	sfx_0 6, 114
-	sfx_0 5, 17
-	sfx_0 6, 137
-	sfx_0 5, 99
-	sfx_0 6, 178
-	sfx_0 5, 172
-	sfx_0 6, 214
-	sfx_0 5, 237
-	sfx_0 6, 246
-	sfx_1 143
-	sfx_0 6, 11
-	sfx_0 7, 5
-	sfx_0 6, 66
-	sfx_0 7, 33
-	sfx_0 6, 114
-	sfx_0 7, 57
-	sfx_0 6, 137
-	sfx_0 7, 68
-	sfx_0 6, 178
-	sfx_0 7, 89
-	sfx_0 6, 214
-	sfx_0 7, 107
-	sfx_0 6, 246
-	sfx_0 7, 123
-	sfx_1 79
-	sfx_0 7, 5
-	sfx_0 7, 131
-	sfx_0 7, 33
-	sfx_0 7, 144
-	sfx_0 7, 57
-	sfx_0 7, 157
-	sfx_0 7, 68
-	sfx_0 7, 162
-	sfx_0 7, 89
-	sfx_0 7, 172
-	sfx_0 7, 107
-	sfx_0 7, 182
-	sfx_0 7, 123
-	sfx_0 7, 190
-	sfx_1 47
-	sfx_0 7, 131
-	sfx_0 7, 193
-	sfx_0 7, 144
-	sfx_0 7, 200
-	sfx_0 7, 157
-	sfx_0 7, 206
-	sfx_0 7, 162
-	sfx_0 7, 209
-	sfx_0 7, 172
-	sfx_0 7, 214
-	sfx_0 7, 182
-	sfx_0 7, 219
-	sfx_0 7, 190
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 5
-	sfx_5 255
-	sfx_1 47
-	sfx_1 207
-	sfx_2 0
-	sfx_0 6, 246
-	sfx_0 7, 123
-	sfx_0 7, 190
-	sfx_0 7, 219
-	sfx_1 143
-	sfx_2 0
+	sfx_env 12, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $416
+	sfx_freq $60b
+	sfx_freq $483
+	sfx_freq $642
+	sfx_freq $4e5
+	sfx_freq $672
+	sfx_freq $511
+	sfx_freq $689
+	sfx_freq $563
+	sfx_freq $6b2
+	sfx_freq $5ac
+	sfx_freq $6d6
+	sfx_freq $5ed
+	sfx_freq $6f6
+	sfx_env 8, -7
+	sfx_freq $60b
+	sfx_freq $705
+	sfx_freq $642
+	sfx_freq $721
+	sfx_freq $672
+	sfx_freq $739
+	sfx_freq $689
+	sfx_freq $744
+	sfx_freq $6b2
+	sfx_freq $759
+	sfx_freq $6d6
+	sfx_freq $76b
+	sfx_freq $6f6
+	sfx_freq $77b
+	sfx_env 4, -7
+	sfx_freq $705
+	sfx_freq $783
+	sfx_freq $721
+	sfx_freq $790
+	sfx_freq $739
+	sfx_freq $79d
+	sfx_freq $744
+	sfx_freq $7a2
+	sfx_freq $759
+	sfx_freq $7ac
+	sfx_freq $76b
+	sfx_freq $7b6
+	sfx_freq $77b
+	sfx_freq $7be
+	sfx_env 2, -7
+	sfx_freq $783
+	sfx_freq $7c1
+	sfx_freq $790
+	sfx_freq $7c8
+	sfx_freq $79d
+	sfx_freq $7ce
+	sfx_freq $7a2
+	sfx_freq $7d1
+	sfx_freq $7ac
+	sfx_freq $7d6
+	sfx_freq $7b6
+	sfx_freq $7db
+	sfx_freq $7be
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 5
+	sfx_pitch_offset -1
+	sfx_env 2, -7
+	sfx_env 12, -7
+	sfx_duty 0
+	sfx_freq $6f6
+	sfx_freq $77b
+	sfx_freq $7be
+	sfx_freq $7db
+	sfx_env 8, -7
+	sfx_duty 0
 	sfx_loop 10
-	sfx_0 7, 219
+	sfx_freq $7db
 	sfx_endloop
-	sfx_1 111
-	sfx_2 0
+	sfx_env 6, -7
+	sfx_duty 0
 	sfx_loop 10
-	sfx_0 7, 219
+	sfx_freq $7db
 	sfx_endloop
-	sfx_1 79
+	sfx_env 4, -7
 	sfx_loop 10
-	sfx_0 7, 219
+	sfx_freq $7db
 	sfx_endloop
-	sfx_1 47
+	sfx_env 2, -7
 	sfx_loop 10
-	sfx_0 7, 219
+	sfx_freq $7db
 	sfx_endloop
-	sfx_1 31
+	sfx_env 1, -7
 	sfx_loop 10
-	sfx_0 7, 219
+	sfx_freq $7db
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_tcg1_legendary_cards.asm b/src/audio/sfx/sfx_tcg1_legendary_cards.asm
index 3eeb725..b4a70e3 100644
--- a/src/audio/sfx/sfx_tcg1_legendary_cards.asm
+++ b/src/audio/sfx/sfx_tcg1_legendary_cards.asm
@@ -1,67 +1,67 @@
 Sfx_Tcg1_LegendaryCards_Ch1:
 	sfx_loop 5
-	sfx_8 17
-	sfx_1 55
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_0 7, 20
-	sfx_0 7, 33
-	sfx_0 7, 45
-	sfx_0 7, 57
-	sfx_0 7, 68
-	sfx_0 7, 79
-	sfx_1 71
-	sfx_2 0
-	sfx_0 7, 89
-	sfx_0 7, 98
-	sfx_0 7, 107
-	sfx_0 7, 115
-	sfx_0 7, 123
-	sfx_1 87
-	sfx_2 4
-	sfx_0 7, 131
-	sfx_0 7, 138
-	sfx_0 7, 144
-	sfx_0 7, 151
-	sfx_0 7, 157
-	sfx_0 7, 162
-	sfx_0 7, 167
-	sfx_1 103
-	sfx_2 4
-	sfx_0 7, 172
-	sfx_0 7, 177
-	sfx_0 7, 182
-	sfx_0 7, 186
-	sfx_0 7, 190
-	sfx_1 87
-	sfx_2 4
-	sfx_0 7, 190
-	sfx_0 7, 186
-	sfx_0 7, 182
-	sfx_0 7, 177
-	sfx_0 7, 172
-	sfx_0 7, 167
-	sfx_1 71
-	sfx_2 4
-	sfx_0 7, 162
-	sfx_0 7, 157
-	sfx_0 7, 151
-	sfx_0 7, 144
-	sfx_0 7, 138
-	sfx_0 7, 131
-	sfx_1 55
-	sfx_2 0
-	sfx_0 7, 123
-	sfx_0 7, 115
-	sfx_0 7, 107
-	sfx_0 7, 98
-	sfx_0 7, 89
-	sfx_0 7, 79
-	sfx_0 7, 68
-	sfx_0 7, 57
-	sfx_0 7, 45
-	sfx_0 7, 33
-	sfx_0 7, 20
-	sfx_0 7, 5
+	sfx_pan TRUE, TRUE
+	sfx_env 3, 7
+	sfx_duty 0
+	sfx_freq $705
+	sfx_freq $714
+	sfx_freq $721
+	sfx_freq $72d
+	sfx_freq $739
+	sfx_freq $744
+	sfx_freq $74f
+	sfx_env 4, 7
+	sfx_duty 0
+	sfx_freq $759
+	sfx_freq $762
+	sfx_freq $76b
+	sfx_freq $773
+	sfx_freq $77b
+	sfx_env 5, 7
+	sfx_duty 1
+	sfx_freq $783
+	sfx_freq $78a
+	sfx_freq $790
+	sfx_freq $797
+	sfx_freq $79d
+	sfx_freq $7a2
+	sfx_freq $7a7
+	sfx_env 6, 7
+	sfx_duty 1
+	sfx_freq $7ac
+	sfx_freq $7b1
+	sfx_freq $7b6
+	sfx_freq $7ba
+	sfx_freq $7be
+	sfx_env 5, 7
+	sfx_duty 1
+	sfx_freq $7be
+	sfx_freq $7ba
+	sfx_freq $7b6
+	sfx_freq $7b1
+	sfx_freq $7ac
+	sfx_freq $7a7
+	sfx_env 4, 7
+	sfx_duty 1
+	sfx_freq $7a2
+	sfx_freq $79d
+	sfx_freq $797
+	sfx_freq $790
+	sfx_freq $78a
+	sfx_freq $783
+	sfx_env 3, 7
+	sfx_duty 0
+	sfx_freq $77b
+	sfx_freq $773
+	sfx_freq $76b
+	sfx_freq $762
+	sfx_freq $759
+	sfx_freq $74f
+	sfx_freq $744
+	sfx_freq $739
+	sfx_freq $72d
+	sfx_freq $721
+	sfx_freq $714
+	sfx_freq $705
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_tcg2_intro_orbs.asm b/src/audio/sfx/sfx_tcg2_intro_orbs.asm
index 6a90024..d805c71 100644
--- a/src/audio/sfx/sfx_tcg2_intro_orbs.asm
+++ b/src/audio/sfx/sfx_tcg2_intro_orbs.asm
@@ -1,312 +1,312 @@
 Sfx_Tcg2_IntroOrbs_Ch1:
-	sfx_1 16
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 223
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_0 7, 221
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_0 7, 182
-	sfx_6 1
-	sfx_1 32
-	sfx_0 7, 219
-	sfx_6 1
-	sfx_0 7, 177
-	sfx_6 1
-	sfx_0 7, 217
-	sfx_6 1
-	sfx_0 7, 177
-	sfx_6 1
-	sfx_1 48
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_0 7, 214
-	sfx_6 1
-	sfx_0 7, 167
-	sfx_6 1
-	sfx_1 64
-	sfx_0 7, 212
-	sfx_6 1
-	sfx_0 7, 167
-	sfx_6 1
-	sfx_0 7, 209
-	sfx_6 1
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_1 80
-	sfx_0 7, 209
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 206
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_1 96
-	sfx_0 7, 203
-	sfx_6 1
-	sfx_0 7, 151
-	sfx_6 1
-	sfx_0 7, 203
-	sfx_6 1
-	sfx_0 7, 144
-	sfx_6 1
-	sfx_1 112
-	sfx_0 7, 200
-	sfx_6 1
-	sfx_0 7, 144
-	sfx_6 1
-	sfx_0 7, 197
-	sfx_6 1
-	sfx_0 7, 138
-	sfx_6 1
-	sfx_1 128
-	sfx_0 7, 197
-	sfx_6 1
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 193
-	sfx_6 1
-	sfx_0 7, 131
-	sfx_6 1
+	sfx_env 1, 0
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $7df
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_freq $7dd
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_freq $7b6
+	sfx_wait 1
+	sfx_env 2, 0
+	sfx_freq $7db
+	sfx_wait 1
+	sfx_freq $7b1
+	sfx_wait 1
+	sfx_freq $7d9
+	sfx_wait 1
+	sfx_freq $7b1
+	sfx_wait 1
+	sfx_env 3, 0
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_freq $7d6
+	sfx_wait 1
+	sfx_freq $7a7
+	sfx_wait 1
+	sfx_env 4, 0
+	sfx_freq $7d4
+	sfx_wait 1
+	sfx_freq $7a7
+	sfx_wait 1
+	sfx_freq $7d1
+	sfx_wait 1
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_env 5, 0
+	sfx_freq $7d1
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7ce
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_env 6, 0
+	sfx_freq $7cb
+	sfx_wait 1
+	sfx_freq $797
+	sfx_wait 1
+	sfx_freq $7cb
+	sfx_wait 1
+	sfx_freq $790
+	sfx_wait 1
+	sfx_env 7, 0
+	sfx_freq $7c8
+	sfx_wait 1
+	sfx_freq $790
+	sfx_wait 1
+	sfx_freq $7c5
+	sfx_wait 1
+	sfx_freq $78a
+	sfx_wait 1
+	sfx_env 8, 0
+	sfx_freq $7c5
+	sfx_wait 1
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $7c1
+	sfx_wait 1
+	sfx_freq $783
+	sfx_wait 1
 	sfx_loop 5
-	sfx_1 144
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 160
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 176
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 192
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 208
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 224
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 240
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 224
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 208
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 192
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 176
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_1 160
-	sfx_2 0
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
+	sfx_env 9, 0
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 10, 0
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 11, 0
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 12, 0
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 13, 0
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 14, 0
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 15, 0
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 14, 0
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 13, 0
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 12, 0
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 11, 0
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_env 10, 0
+	sfx_duty 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
 	sfx_endloop
-	sfx_5 0
-	sfx_1 128
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_0 7, 186
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_0 7, 182
-	sfx_6 1
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_0 7, 177
-	sfx_6 1
-	sfx_0 7, 98
-	sfx_6 1
-	sfx_0 7, 172
-	sfx_6 1
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_0 7, 167
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_1 112
-	sfx_0 7, 162
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 57
-	sfx_6 1
-	sfx_0 7, 151
-	sfx_6 1
-	sfx_0 7, 45
-	sfx_6 1
-	sfx_0 7, 144
-	sfx_6 1
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_0 7, 138
-	sfx_6 1
-	sfx_0 7, 20
-	sfx_6 1
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_1 96
-	sfx_0 7, 123
-	sfx_6 1
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_0 7, 115
-	sfx_6 1
-	sfx_0 6, 231
-	sfx_6 1
-	sfx_0 7, 107
-	sfx_6 1
-	sfx_0 6, 214
-	sfx_6 1
-	sfx_1 80
-	sfx_0 7, 98
-	sfx_6 1
-	sfx_0 6, 196
-	sfx_6 1
-	sfx_0 7, 89
-	sfx_6 1
-	sfx_0 6, 178
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_0 6, 158
-	sfx_6 1
-	sfx_1 64
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_0 6, 137
-	sfx_6 1
-	sfx_0 7, 57
-	sfx_6 1
-	sfx_0 6, 114
-	sfx_6 1
-	sfx_0 7, 45
-	sfx_6 1
-	sfx_0 6, 91
-	sfx_6 1
-	sfx_1 48
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_0 6, 66
-	sfx_6 1
-	sfx_0 7, 20
-	sfx_6 1
-	sfx_0 6, 40
-	sfx_6 1
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_0 6, 11
-	sfx_6 1
-	sfx_1 32
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_0 5, 237
-	sfx_6 1
-	sfx_0 6, 231
-	sfx_6 1
-	sfx_0 5, 205
-	sfx_6 1
-	sfx_0 6, 214
-	sfx_6 1
-	sfx_0 5, 172
-	sfx_6 1
-	sfx_0 6, 196
-	sfx_6 1
-	sfx_0 5, 137
-	sfx_6 1
-	sfx_0 6, 178
-	sfx_6 1
-	sfx_0 5, 99
-	sfx_6 1
-	sfx_0 6, 158
-	sfx_6 1
-	sfx_0 5, 60
-	sfx_6 1
-	sfx_1 16
-	sfx_0 6, 137
-	sfx_6 1
-	sfx_0 5, 17
-	sfx_6 1
-	sfx_0 6, 114
-	sfx_6 1
-	sfx_0 4, 229
-	sfx_6 1
-	sfx_0 6, 91
-	sfx_6 1
-	sfx_0 4, 181
-	sfx_6 1
-	sfx_0 6, 66
-	sfx_6 1
-	sfx_0 4, 131
-	sfx_6 1
-	sfx_0 6, 40
-	sfx_6 1
-	sfx_0 4, 78
-	sfx_6 1
-	sfx_0 6, 11
-	sfx_6 1
-	sfx_0 4, 22
-	sfx_6 1
+	sfx_pitch_offset 0
+	sfx_env 8, 0
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_freq $7ba
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_freq $7b6
+	sfx_wait 1
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_freq $7b1
+	sfx_wait 1
+	sfx_freq $762
+	sfx_wait 1
+	sfx_freq $7ac
+	sfx_wait 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_freq $7a7
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_env 7, 0
+	sfx_freq $7a2
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $739
+	sfx_wait 1
+	sfx_freq $797
+	sfx_wait 1
+	sfx_freq $72d
+	sfx_wait 1
+	sfx_freq $790
+	sfx_wait 1
+	sfx_freq $721
+	sfx_wait 1
+	sfx_freq $78a
+	sfx_wait 1
+	sfx_freq $714
+	sfx_wait 1
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $705
+	sfx_wait 1
+	sfx_env 6, 0
+	sfx_freq $77b
+	sfx_wait 1
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_freq $773
+	sfx_wait 1
+	sfx_freq $6e7
+	sfx_wait 1
+	sfx_freq $76b
+	sfx_wait 1
+	sfx_freq $6d6
+	sfx_wait 1
+	sfx_env 5, 0
+	sfx_freq $762
+	sfx_wait 1
+	sfx_freq $6c4
+	sfx_wait 1
+	sfx_freq $759
+	sfx_wait 1
+	sfx_freq $6b2
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_freq $69e
+	sfx_wait 1
+	sfx_env 4, 0
+	sfx_freq $744
+	sfx_wait 1
+	sfx_freq $689
+	sfx_wait 1
+	sfx_freq $739
+	sfx_wait 1
+	sfx_freq $672
+	sfx_wait 1
+	sfx_freq $72d
+	sfx_wait 1
+	sfx_freq $65b
+	sfx_wait 1
+	sfx_env 3, 0
+	sfx_freq $721
+	sfx_wait 1
+	sfx_freq $642
+	sfx_wait 1
+	sfx_freq $714
+	sfx_wait 1
+	sfx_freq $628
+	sfx_wait 1
+	sfx_freq $705
+	sfx_wait 1
+	sfx_freq $60b
+	sfx_wait 1
+	sfx_env 2, 0
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_freq $5ed
+	sfx_wait 1
+	sfx_freq $6e7
+	sfx_wait 1
+	sfx_freq $5cd
+	sfx_wait 1
+	sfx_freq $6d6
+	sfx_wait 1
+	sfx_freq $5ac
+	sfx_wait 1
+	sfx_freq $6c4
+	sfx_wait 1
+	sfx_freq $589
+	sfx_wait 1
+	sfx_freq $6b2
+	sfx_wait 1
+	sfx_freq $563
+	sfx_wait 1
+	sfx_freq $69e
+	sfx_wait 1
+	sfx_freq $53c
+	sfx_wait 1
+	sfx_env 1, 0
+	sfx_freq $689
+	sfx_wait 1
+	sfx_freq $511
+	sfx_wait 1
+	sfx_freq $672
+	sfx_wait 1
+	sfx_freq $4e5
+	sfx_wait 1
+	sfx_freq $65b
+	sfx_wait 1
+	sfx_freq $4b5
+	sfx_wait 1
+	sfx_freq $642
+	sfx_wait 1
+	sfx_freq $483
+	sfx_wait 1
+	sfx_freq $628
+	sfx_wait 1
+	sfx_freq $44e
+	sfx_wait 1
+	sfx_freq $60b
+	sfx_wait 1
+	sfx_freq $416
+	sfx_wait 1
 	sfx_end
diff --git a/src/audio/sfx/sfx_tcg2_intro_subtitle.asm b/src/audio/sfx/sfx_tcg2_intro_subtitle.asm
index 0bd5447..411e44a 100644
--- a/src/audio/sfx/sfx_tcg2_intro_subtitle.asm
+++ b/src/audio/sfx/sfx_tcg2_intro_subtitle.asm
@@ -1,112 +1,112 @@
 Sfx_Tcg2_IntroSubtitle_Ch1:
-	sfx_8 17
-	sfx_2 0
-	sfx_9 39
-	sfx_1 16
-	sfx_0 7, 131
-	sfx_5 0
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 32
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 48
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 64
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 80
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 96
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 112
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 128
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 144
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_1 160
-	sfx_0 7, 131
-	sfx_6 1
-	sfx_0 7, 157
-	sfx_6 1
-	sfx_0 7, 190
-	sfx_6 1
-	sfx_9 0
-	sfx_1 73
-	sfx_2 4
-	sfx_0 5, 99
-	sfx_0 5, 237
-	sfx_0 6, 66
-	sfx_1 105
-	sfx_2 4
-	sfx_0 6, 178
-	sfx_0 6, 246
-	sfx_0 7, 33
-	sfx_1 153
-	sfx_2 4
-	sfx_0 7, 89
-	sfx_0 7, 123
-	sfx_0 7, 144
-	sfx_1 231
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_6 7
-	sfx_1 135
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_6 5
-	sfx_1 103
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_6 5
-	sfx_1 71
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_6 5
-	sfx_1 39
-	sfx_2 4
-	sfx_0 7, 214
-	sfx_6 5
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_sweep_up 2, 7
+	sfx_env 1, 0
+	sfx_freq $783
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 2, 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 3, 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 4, 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 5, 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 6, 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 7, 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 8, 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 9, 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_env 10, 0
+	sfx_freq $783
+	sfx_wait 1
+	sfx_freq $79d
+	sfx_wait 1
+	sfx_freq $7be
+	sfx_wait 1
+	sfx_sweep_up 0, 0
+	sfx_env 4, -1
+	sfx_duty 1
+	sfx_freq $563
+	sfx_freq $5ed
+	sfx_freq $642
+	sfx_env 6, -1
+	sfx_duty 1
+	sfx_freq $6b2
+	sfx_freq $6f6
+	sfx_freq $721
+	sfx_env 9, -1
+	sfx_duty 1
+	sfx_freq $759
+	sfx_freq $77b
+	sfx_freq $790
+	sfx_env 14, 7
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_wait 7
+	sfx_env 8, 7
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_wait 5
+	sfx_env 6, 7
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_wait 5
+	sfx_env 4, 7
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_wait 5
+	sfx_env 2, 7
+	sfx_duty 1
+	sfx_freq $7d6
+	sfx_wait 5
 	sfx_end
diff --git a/src/audio/sfx/sfx_tcg2_intro_title.asm b/src/audio/sfx/sfx_tcg2_intro_title.asm
index a7b5ead..2d58d3b 100644
--- a/src/audio/sfx/sfx_tcg2_intro_title.asm
+++ b/src/audio/sfx/sfx_tcg2_intro_title.asm
@@ -1,147 +1,147 @@
 Sfx_Tcg2_IntroTitle_Ch1:
-	sfx_8 17
-	sfx_2 4
-	sfx_9 39
-	sfx_1 32
-	sfx_0 6, 178
-	sfx_5 0
-	sfx_6 1
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_1 48
-	sfx_0 6, 66
-	sfx_6 1
-	sfx_0 6, 158
-	sfx_6 1
-	sfx_0 6, 214
-	sfx_6 1
-	sfx_1 64
-	sfx_0 6, 196
-	sfx_6 1
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_0 7, 45
-	sfx_6 1
-	sfx_1 80
-	sfx_0 6, 91
-	sfx_6 1
-	sfx_0 6, 178
-	sfx_6 1
-	sfx_0 6, 231
-	sfx_6 1
-	sfx_1 96
-	sfx_0 6, 214
-	sfx_6 1
-	sfx_0 7, 20
-	sfx_6 1
-	sfx_0 7, 57
-	sfx_6 1
-	sfx_1 112
-	sfx_0 6, 114
-	sfx_6 1
-	sfx_0 6, 196
-	sfx_6 1
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_1 128
-	sfx_0 6, 231
-	sfx_6 1
-	sfx_0 7, 33
-	sfx_6 1
-	sfx_0 7, 68
-	sfx_6 1
-	sfx_1 144
-	sfx_0 6, 137
-	sfx_6 1
-	sfx_0 6, 214
-	sfx_6 1
-	sfx_0 7, 5
-	sfx_6 1
-	sfx_1 103
-	sfx_0 6, 246
-	sfx_6 1
-	sfx_0 7, 45
-	sfx_6 1
-	sfx_0 7, 79
-	sfx_6 1
-	sfx_1 55
-	sfx_0 6, 158
-	sfx_6 1
-	sfx_0 6, 231
-	sfx_6 1
-	sfx_0 7, 20
-	sfx_6 1
+	sfx_pan TRUE, TRUE
+	sfx_duty 1
+	sfx_sweep_up 2, 7
+	sfx_env 2, 0
+	sfx_freq $6b2
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_freq $721
+	sfx_wait 1
+	sfx_env 3, 0
+	sfx_freq $642
+	sfx_wait 1
+	sfx_freq $69e
+	sfx_wait 1
+	sfx_freq $6d6
+	sfx_wait 1
+	sfx_env 4, 0
+	sfx_freq $6c4
+	sfx_wait 1
+	sfx_freq $705
+	sfx_wait 1
+	sfx_freq $72d
+	sfx_wait 1
+	sfx_env 5, 0
+	sfx_freq $65b
+	sfx_wait 1
+	sfx_freq $6b2
+	sfx_wait 1
+	sfx_freq $6e7
+	sfx_wait 1
+	sfx_env 6, 0
+	sfx_freq $6d6
+	sfx_wait 1
+	sfx_freq $714
+	sfx_wait 1
+	sfx_freq $739
+	sfx_wait 1
+	sfx_env 7, 0
+	sfx_freq $672
+	sfx_wait 1
+	sfx_freq $6c4
+	sfx_wait 1
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_env 8, 0
+	sfx_freq $6e7
+	sfx_wait 1
+	sfx_freq $721
+	sfx_wait 1
+	sfx_freq $744
+	sfx_wait 1
+	sfx_env 9, 0
+	sfx_freq $689
+	sfx_wait 1
+	sfx_freq $6d6
+	sfx_wait 1
+	sfx_freq $705
+	sfx_wait 1
+	sfx_env 6, 7
+	sfx_freq $6f6
+	sfx_wait 1
+	sfx_freq $72d
+	sfx_wait 1
+	sfx_freq $74f
+	sfx_wait 1
+	sfx_env 3, 7
+	sfx_freq $69e
+	sfx_wait 1
+	sfx_freq $6e7
+	sfx_wait 1
+	sfx_freq $714
+	sfx_wait 1
 	sfx_end
 
 Sfx_Tcg2_IntroTitle_Ch2:
-	sfx_8 17
-	sfx_1 16
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_1 32
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_1 48
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_1 64
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_1 80
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_1 55
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_1 16
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
+	sfx_pan TRUE, TRUE
+	sfx_env 1, 0
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_env 2, 0
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_env 3, 0
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_env 4, 0
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_env 5, 0
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_env 3, 7
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_env 1, 0
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
 	sfx_end
diff --git a/src/audio/sfx/sfx_teleport.asm b/src/audio/sfx/sfx_teleport.asm
index b532a01..8ada979 100644
--- a/src/audio/sfx/sfx_teleport.asm
+++ b/src/audio/sfx/sfx_teleport.asm
@@ -1,139 +1,139 @@
 Sfx_Teleport_Ch1:
-	sfx_1 63
-	sfx_8 17
-	sfx_2 0
+	sfx_env 3, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
 	sfx_loop 2
-	sfx_0 7, 172
-	sfx_5 0
-	sfx_6 2
-	sfx_0 7, 193
-	sfx_6 2
-	sfx_0 7, 209
-	sfx_6 2
+	sfx_freq $7ac
+	sfx_pitch_offset 0
+	sfx_wait 2
+	sfx_freq $7c1
+	sfx_wait 2
+	sfx_freq $7d1
+	sfx_wait 2
 	sfx_endloop
-	sfx_1 95
+	sfx_env 5, -7
 	sfx_loop 2
-	sfx_0 7, 172
-	sfx_6 2
-	sfx_0 7, 193
-	sfx_6 2
-	sfx_0 7, 209
-	sfx_6 2
+	sfx_freq $7ac
+	sfx_wait 2
+	sfx_freq $7c1
+	sfx_wait 2
+	sfx_freq $7d1
+	sfx_wait 2
 	sfx_endloop
-	sfx_1 112
+	sfx_env 7, 0
 	sfx_loop 3
-	sfx_0 7, 172
-	sfx_6 2
-	sfx_0 7, 193
-	sfx_6 2
-	sfx_0 7, 209
-	sfx_6 2
+	sfx_freq $7ac
+	sfx_wait 2
+	sfx_freq $7c1
+	sfx_wait 2
+	sfx_freq $7d1
+	sfx_wait 2
 	sfx_endloop
-	sfx_1 87
+	sfx_env 5, 7
 	sfx_loop 2
-	sfx_0 7, 172
-	sfx_6 2
-	sfx_0 7, 193
-	sfx_6 2
-	sfx_0 7, 209
-	sfx_6 2
+	sfx_freq $7ac
+	sfx_wait 2
+	sfx_freq $7c1
+	sfx_wait 2
+	sfx_freq $7d1
+	sfx_wait 2
 	sfx_endloop
-	sfx_1 55
-	sfx_0 7, 172
-	sfx_6 2
-	sfx_0 7, 193
-	sfx_6 2
-	sfx_0 7, 209
-	sfx_6 2
+	sfx_env 3, 7
+	sfx_freq $7ac
+	sfx_wait 2
+	sfx_freq $7c1
+	sfx_wait 2
+	sfx_freq $7d1
+	sfx_wait 2
 	sfx_end
 
 Sfx_Teleport_Ch2:
-	sfx_8 17
-	sfx_1 95
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_1 111
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_1 127
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_1 191
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_1 215
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 1
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_1 151
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_1 71
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
-	sfx_0 0, 0
+	sfx_pan TRUE, TRUE
+	sfx_env 5, -7
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $1
+	sfx_env 6, -7
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_env 7, -7
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_env 11, -7
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_env 13, 7
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $1
+	sfx_freq $0
+	sfx_freq $0
+	sfx_env 9, 7
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_env 4, 7
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
+	sfx_freq $0
 	sfx_end
diff --git a/src/audio/sfx/sfx_thunder_punch.asm b/src/audio/sfx/sfx_thunder_punch.asm
index 51eb223..cdede10 100644
--- a/src/audio/sfx/sfx_thunder_punch.asm
+++ b/src/audio/sfx/sfx_thunder_punch.asm
@@ -1,128 +1,128 @@
 Sfx_ThunderPunch_Ch1:
-	sfx_1 255
-	sfx_8 17
-	sfx_2 8
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_1 255
-	sfx_2 8
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_1 143
-	sfx_2 8
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 143
-	sfx_1 79
-	sfx_2 8
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 79
-	sfx_1 31
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_1 0
-	sfx_5 0
-	sfx_6 35
-	sfx_5 255
-	sfx_1 31
-	sfx_1 255
-	sfx_2 0
-	sfx_0 7, 57
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_1 255
-	sfx_2 0
-	sfx_0 7, 33
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 255
-	sfx_1 143
-	sfx_2 0
-	sfx_0 7, 5
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 143
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 123
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 79
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 107
+	sfx_env 15, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 2
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_env 15, -7
+	sfx_duty 2
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_env 8, -7
+	sfx_duty 2
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, -7
+	sfx_env 4, -7
+	sfx_duty 2
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, -7
+	sfx_env 1, -7
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 35
+	sfx_pitch_offset -1
+	sfx_env 1, -7
+	sfx_env 15, -7
+	sfx_duty 0
+	sfx_freq $739
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_env 15, -7
+	sfx_duty 0
+	sfx_freq $721
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 15, -7
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $705
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 8, -7
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $77b
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, -7
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $76b
 	sfx_end
 
 Sfx_ThunderPunch_Ch2:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 0
-	sfx_5 0
-	sfx_6 10
-	sfx_5 255
-	sfx_1 1
-	sfx_1 223
-	sfx_0 0, 48
-	sfx_0 0, 55
-	sfx_0 0, 48
-	sfx_0 0, 55
-	sfx_0 0, 48
-	sfx_0 0, 55
-	sfx_0 0, 48
-	sfx_0 0, 55
-	sfx_0 0, 48
-	sfx_0 0, 55
-	sfx_0 0, 48
-	sfx_0 0, 55
-	sfx_0 0, 48
-	sfx_0 0, 55
-	sfx_0 0, 48
-	sfx_1 143
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_1 79
-	sfx_0 0, 66
-	sfx_0 0, 67
-	sfx_0 0, 130
-	sfx_0 0, 131
-	sfx_0 0, 130
-	sfx_0 0, 131
-	sfx_1 31
-	sfx_0 0, 130
-	sfx_0 0, 131
-	sfx_0 0, 130
-	sfx_0 0, 131
-	sfx_0 0, 130
-	sfx_0 0, 131
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 10
+	sfx_pitch_offset -1
+	sfx_env 0, 1
+	sfx_env 13, -7
+	sfx_freq $30
+	sfx_freq $37
+	sfx_freq $30
+	sfx_freq $37
+	sfx_freq $30
+	sfx_freq $37
+	sfx_freq $30
+	sfx_freq $37
+	sfx_freq $30
+	sfx_freq $37
+	sfx_freq $30
+	sfx_freq $37
+	sfx_freq $30
+	sfx_freq $37
+	sfx_freq $30
+	sfx_env 8, -7
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $42
+	sfx_freq $43
+	sfx_env 4, -7
+	sfx_freq $42
+	sfx_freq $43
+	sfx_freq $82
+	sfx_freq $83
+	sfx_freq $82
+	sfx_freq $83
+	sfx_env 1, -7
+	sfx_freq $82
+	sfx_freq $83
+	sfx_freq $82
+	sfx_freq $83
+	sfx_freq $82
+	sfx_freq $83
 	sfx_endloop
 	sfx_end
diff --git a/src/audio/sfx/sfx_thunder_shock.asm b/src/audio/sfx/sfx_thunder_shock.asm
index 09755db..eb29de8 100644
--- a/src/audio/sfx/sfx_thunder_shock.asm
+++ b/src/audio/sfx/sfx_thunder_shock.asm
@@ -1,53 +1,53 @@
 Sfx_ThunderShock_Ch1:
-	sfx_8 17
-	sfx_1 192
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_1 128
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_0 0, 65
-	sfx_0 0, 64
-	sfx_1 64
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 66
-	sfx_0 0, 65
-	sfx_1 32
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_0 0, 50
-	sfx_0 0, 49
-	sfx_0 0, 50
-	sfx_0 0, 49
-	sfx_1 20
-	sfx_0 0, 50
-	sfx_0 0, 50
-	sfx_0 0, 51
-	sfx_0 0, 50
-	sfx_0 0, 51
-	sfx_0 0, 50
+	sfx_pan TRUE, TRUE
+	sfx_env 12, 0
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $51
+	sfx_env 8, 0
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_freq $41
+	sfx_freq $40
+	sfx_env 4, 0
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $42
+	sfx_freq $41
+	sfx_env 2, 0
+	sfx_freq $31
+	sfx_freq $31
+	sfx_freq $32
+	sfx_freq $31
+	sfx_freq $32
+	sfx_freq $31
+	sfx_env 1, 4
+	sfx_freq $32
+	sfx_freq $32
+	sfx_freq $33
+	sfx_freq $32
+	sfx_freq $33
+	sfx_freq $32
 	sfx_end
diff --git a/src/audio/sfx/sfx_thunder_wave.asm b/src/audio/sfx/sfx_thunder_wave.asm
index 4a6113d..67adc34 100644
--- a/src/audio/sfx/sfx_thunder_wave.asm
+++ b/src/audio/sfx/sfx_thunder_wave.asm
@@ -1,95 +1,95 @@
 Sfx_ThunderWave_Ch1:
-	sfx_1 159
-	sfx_8 17
-	sfx_2 0
+	sfx_env 9, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
 	sfx_loop 36
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 159
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 9, -7
 	sfx_endloop
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 111
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 79
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 63
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 223
-	sfx_1 0
-	sfx_5 0
-	sfx_6 1
-	sfx_5 255
-	sfx_1 47
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 223
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 6, -7
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 4, -7
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 3, -7
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7df
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 1
+	sfx_pitch_offset -1
+	sfx_env 2, -7
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7df
 	sfx_end
 
 Sfx_ThunderWave_Ch2:
-	sfx_1 207
-	sfx_8 17
+	sfx_env 12, -7
+	sfx_pan TRUE, TRUE
 	sfx_loop 3
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_0 0, 2
-	sfx_0 0, 1
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $1
+	sfx_freq $2
+	sfx_freq $1
 	sfx_endloop
-	sfx_1 159
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_1 111
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_1 79
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_1 47
-	sfx_0 0, 2
-	sfx_0 0, 1
-	sfx_1 31
-	sfx_0 0, 2
-	sfx_0 0, 1
+	sfx_env 9, -7
+	sfx_freq $2
+	sfx_freq $1
+	sfx_env 6, -7
+	sfx_freq $2
+	sfx_freq $1
+	sfx_env 4, -7
+	sfx_freq $2
+	sfx_freq $1
+	sfx_env 2, -7
+	sfx_freq $2
+	sfx_freq $1
+	sfx_env 1, -7
+	sfx_freq $2
+	sfx_freq $1
 	sfx_end
diff --git a/src/audio/sfx/sfx_toxic.asm b/src/audio/sfx/sfx_toxic.asm
index 4dfd0cf..6946dbb 100644
--- a/src/audio/sfx/sfx_toxic.asm
+++ b/src/audio/sfx/sfx_toxic.asm
@@ -1,59 +1,59 @@
 Sfx_Toxic_Ch1:
 	sfx_loop 4
-	sfx_1 244
-	sfx_8 17
-	sfx_2 0
-	sfx_0 5, 237
-	sfx_0 4, 22
-	sfx_0 5, 172
-	sfx_0 4, 22
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 5, 17
-	sfx_0 4, 22
-	sfx_0 4, 229
-	sfx_0 4, 22
-	sfx_0 4, 131
-	sfx_0 4, 22
-	sfx_1 244
-	sfx_2 4
-	sfx_0 5, 237
-	sfx_0 4, 22
-	sfx_0 5, 172
-	sfx_0 4, 22
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 5, 17
-	sfx_0 4, 22
-	sfx_0 4, 229
-	sfx_0 4, 22
-	sfx_0 4, 131
-	sfx_0 4, 22
-	sfx_1 244
-	sfx_2 8
-	sfx_0 5, 237
-	sfx_0 4, 22
-	sfx_0 5, 172
-	sfx_0 4, 22
-	sfx_0 5, 99
-	sfx_0 4, 22
-	sfx_0 5, 17
-	sfx_0 4, 22
-	sfx_0 4, 229
-	sfx_0 4, 22
-	sfx_0 4, 131
-	sfx_0 4, 22
+	sfx_env 15, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $5ed
+	sfx_freq $416
+	sfx_freq $5ac
+	sfx_freq $416
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $511
+	sfx_freq $416
+	sfx_freq $4e5
+	sfx_freq $416
+	sfx_freq $483
+	sfx_freq $416
+	sfx_env 15, 4
+	sfx_duty 1
+	sfx_freq $5ed
+	sfx_freq $416
+	sfx_freq $5ac
+	sfx_freq $416
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $511
+	sfx_freq $416
+	sfx_freq $4e5
+	sfx_freq $416
+	sfx_freq $483
+	sfx_freq $416
+	sfx_env 15, 4
+	sfx_duty 2
+	sfx_freq $5ed
+	sfx_freq $416
+	sfx_freq $5ac
+	sfx_freq $416
+	sfx_freq $563
+	sfx_freq $416
+	sfx_freq $511
+	sfx_freq $416
+	sfx_freq $4e5
+	sfx_freq $416
+	sfx_freq $483
+	sfx_freq $416
 	sfx_endloop
-	sfx_1 196
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_1 132
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_1 68
-	sfx_2 8
-	sfx_0 4, 22
-	sfx_1 20
-	sfx_2 8
-	sfx_0 4, 22
+	sfx_env 12, 4
+	sfx_duty 2
+	sfx_freq $416
+	sfx_env 8, 4
+	sfx_duty 2
+	sfx_freq $416
+	sfx_env 4, 4
+	sfx_duty 2
+	sfx_freq $416
+	sfx_env 1, 4
+	sfx_duty 2
+	sfx_freq $416
 	sfx_end
diff --git a/src/audio/sfx/sfx_unused.asm b/src/audio/sfx/sfx_unused.asm
index 2221290..0932199 100644
--- a/src/audio/sfx/sfx_unused.asm
+++ b/src/audio/sfx/sfx_unused.asm
@@ -1,15 +1,15 @@
 SfxUnused_Ch1:
-	sfx_1 196
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 20
-	sfx_0 7, 45
-	sfx_0 7, 68
-	sfx_0 7, 98
-	sfx_0 7, 131
-	sfx_0 7, 138
-	sfx_0 7, 151
-	sfx_0 7, 162
-	sfx_0 7, 177
-	sfx_0 7, 193
+	sfx_env 12, 4
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $714
+	sfx_freq $72d
+	sfx_freq $744
+	sfx_freq $762
+	sfx_freq $783
+	sfx_freq $78a
+	sfx_freq $797
+	sfx_freq $7a2
+	sfx_freq $7b1
+	sfx_freq $7c1
 	sfx_end
diff --git a/src/audio/sfx/sfx_vine_pull.asm b/src/audio/sfx/sfx_vine_pull.asm
index 7b482b6..6346526 100644
--- a/src/audio/sfx/sfx_vine_pull.asm
+++ b/src/audio/sfx/sfx_vine_pull.asm
@@ -1,29 +1,32 @@
 Sfx_VinePull_Ch1:
-	sfx_8 17
-	sfx_9 158
-	sfx_1 107
-	sfx_2 4
-	sfx_0 7, 223
-	sfx_5 0
-	sfx_6 17
-	sfx_9 42
+	sfx_pan TRUE, TRUE
+	; bug, sfx_sweep_down duration can only go up to 7,
+	; a 9 here results in sweep with 1 in length
+	; sfx_sweep_down 9, 6
+	db $90, (9 << 4) | 6 | AUD1SWEEP_DOWN
+	sfx_env 6, -3
+	sfx_duty 1
+	sfx_freq $7df
+	sfx_pitch_offset 0
+	sfx_wait 17
+	sfx_sweep_down 2, 2
 	sfx_loop 6
-	sfx_1 249
-	sfx_2 0
-	sfx_0 2, 198
-	sfx_6 2
+	sfx_env 15, -1
+	sfx_duty 0
+	sfx_freq $2c6
+	sfx_wait 2
 	sfx_endloop
-	sfx_9 39
-	sfx_1 197
-	sfx_2 8
-	sfx_0 7, 68
-	sfx_6 5
-	sfx_1 133
-	sfx_2 8
-	sfx_0 7, 107
-	sfx_6 5
-	sfx_1 53
-	sfx_2 8
-	sfx_0 7, 131
-	sfx_6 5
+	sfx_sweep_up 2, 7
+	sfx_env 12, 5
+	sfx_duty 2
+	sfx_freq $744
+	sfx_wait 5
+	sfx_env 8, 5
+	sfx_duty 2
+	sfx_freq $76b
+	sfx_wait 5
+	sfx_env 3, 5
+	sfx_duty 2
+	sfx_freq $783
+	sfx_wait 5
 	sfx_end
diff --git a/src/audio/sfx/sfx_warp.asm b/src/audio/sfx/sfx_warp.asm
index 729b0bb..fd48598 100644
--- a/src/audio/sfx/sfx_warp.asm
+++ b/src/audio/sfx/sfx_warp.asm
@@ -1,29 +1,29 @@
 Sfx_Warp_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 225
-	sfx_0 0, 66
-	sfx_0 0, 66
-	sfx_0 0, 66
-	sfx_0 0, 66
-	sfx_0 0, 66
-	sfx_0 0, 66
-	sfx_0 0, 66
-	sfx_1 0
-	sfx_5 0
-	sfx_6 8
-	sfx_5 255
-	sfx_1 225
+	sfx_env 14, 1
+	sfx_freq $42
+	sfx_freq $42
+	sfx_freq $42
+	sfx_freq $42
+	sfx_freq $42
+	sfx_freq $42
+	sfx_freq $42
+	sfx_env 0, 0
+	sfx_pitch_offset 0
+	sfx_wait 8
+	sfx_pitch_offset -1
+	sfx_env 14, 1
 	sfx_endloop
-	sfx_1 239
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_1 143
-	sfx_0 0, 66
-	sfx_0 0, 66
-	sfx_1 79
-	sfx_0 0, 66
-	sfx_0 0, 66
+	sfx_env 14, -7
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_env 8, -7
+	sfx_freq $42
+	sfx_freq $42
+	sfx_env 4, -7
+	sfx_freq $42
+	sfx_freq $42
 	sfx_end
diff --git a/src/audio/sfx/sfx_water_gun.asm b/src/audio/sfx/sfx_water_gun.asm
index 6b59f25..ac94593 100644
--- a/src/audio/sfx/sfx_water_gun.asm
+++ b/src/audio/sfx/sfx_water_gun.asm
@@ -1,74 +1,74 @@
 Sfx_WaterGun_Ch1:
-	sfx_8 17
-	sfx_1 111
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_1 143
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_1 79
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_1 47
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_1 31
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
+	sfx_pan TRUE, TRUE
+	sfx_env 6, -7
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_env 8, -7
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_env 4, -7
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_env 2, -7
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_env 1, -7
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
 	sfx_end
diff --git a/src/audio/sfx/sfx_water_jets.asm b/src/audio/sfx/sfx_water_jets.asm
index b97a6f9..5549fb2 100644
--- a/src/audio/sfx/sfx_water_jets.asm
+++ b/src/audio/sfx/sfx_water_jets.asm
@@ -1,67 +1,67 @@
 Sfx_WaterJets_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 111
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
+	sfx_env 6, -7
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
 	sfx_endloop
-	sfx_1 129
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 80
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_1 65
-	sfx_0 0, 81
-	sfx_0 0, 80
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_1 33
-	sfx_0 0, 80
-	sfx_0 0, 81
+	sfx_env 8, 1
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $50
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_env 4, 1
+	sfx_freq $51
+	sfx_freq $50
+	sfx_freq $53
+	sfx_freq $52
+	sfx_env 2, 1
+	sfx_freq $50
+	sfx_freq $51
 	sfx_end
diff --git a/src/audio/sfx/sfx_whirlpool.asm b/src/audio/sfx/sfx_whirlpool.asm
index 983e723..d3f3a44 100644
--- a/src/audio/sfx/sfx_whirlpool.asm
+++ b/src/audio/sfx/sfx_whirlpool.asm
@@ -1,64 +1,64 @@
 Sfx_Whirlpool_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 111
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
+	sfx_env 6, -7
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
 	sfx_endloop
-	sfx_1 143
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_1 79
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_1 47
-	sfx_0 0, 81
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_1 31
-	sfx_0 0, 81
-	sfx_0 0, 83
-	sfx_0 0, 82
-	sfx_0 0, 81
-	sfx_0 0, 81
+	sfx_env 8, -7
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_env 4, -7
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
+	sfx_env 2, -7
+	sfx_freq $51
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_env 1, -7
+	sfx_freq $51
+	sfx_freq $53
+	sfx_freq $52
+	sfx_freq $51
+	sfx_freq $51
 	sfx_end
diff --git a/src/audio/sfx/sfx_whirlwind.asm b/src/audio/sfx/sfx_whirlwind.asm
index 3dd388b..29cce4b 100644
--- a/src/audio/sfx/sfx_whirlwind.asm
+++ b/src/audio/sfx/sfx_whirlwind.asm
@@ -1,94 +1,94 @@
 Sfx_Whirlwind_Ch1:
-	sfx_8 17
+	sfx_pan TRUE, TRUE
 	sfx_loop 2
-	sfx_1 31
-	sfx_0 0, 52
-	sfx_0 0, 52
-	sfx_1 47
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_1 79
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_1 111
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_1 143
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_0 0, 36
-	sfx_1 239
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 17
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_0 0, 33
-	sfx_1 143
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_1 111
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_0 0, 49
-	sfx_1 79
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_1 47
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_0 0, 65
-	sfx_1 31
-	sfx_0 0, 66
-	sfx_0 0, 66
-	sfx_0 0, 66
+	sfx_env 1, -7
+	sfx_freq $34
+	sfx_freq $34
+	sfx_env 2, -7
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_env 4, -7
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_env 6, -7
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_env 8, -7
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_freq $24
+	sfx_env 14, -7
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $11
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_freq $21
+	sfx_env 8, -7
+	sfx_freq $31
+	sfx_freq $31
+	sfx_freq $31
+	sfx_freq $31
+	sfx_env 6, -7
+	sfx_freq $31
+	sfx_freq $31
+	sfx_freq $31
+	sfx_freq $31
+	sfx_env 4, -7
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_env 2, -7
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_freq $41
+	sfx_env 1, -7
+	sfx_freq $42
+	sfx_freq $42
+	sfx_freq $42
 	sfx_end
diff --git a/src/audio/sfx/sfx_whirlwind_bench.asm b/src/audio/sfx/sfx_whirlwind_bench.asm
index 8d40c85..2847521 100644
--- a/src/audio/sfx/sfx_whirlwind_bench.asm
+++ b/src/audio/sfx/sfx_whirlwind_bench.asm
@@ -1,273 +1,273 @@
 Sfx_Whirlwind_Bench_Ch1:
-	sfx_1 239
-	sfx_8 17
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 182
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 7, 190
-	sfx_1 239
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 209
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 219
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 239
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 182
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 7, 190
-	sfx_1 223
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 209
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 219
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 223
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 182
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 7, 190
-	sfx_1 207
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 209
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 219
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 175
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 182
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 7, 190
-	sfx_1 175
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 209
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 219
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 143
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 182
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 7, 190
-	sfx_1 143
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 209
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 219
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 182
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 7, 190
-	sfx_1 111
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 209
-	sfx_1 95
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 219
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 95
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 182
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 7, 190
-	sfx_1 95
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 209
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 219
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 131
-	sfx_0 7, 162
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 157
-	sfx_0 7, 182
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 162
-	sfx_0 7, 190
-	sfx_1 79
-	sfx_2 0
-	sfx_0 7, 193
-	sfx_0 7, 209
-	sfx_1 63
-	sfx_2 0
-	sfx_0 7, 206
-	sfx_0 7, 219
-	sfx_1 47
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_1 31
-	sfx_2 0
-	sfx_0 7, 209
-	sfx_0 7, 223
-	sfx_0 7, 209
-	sfx_0 7, 223
+	sfx_env 14, -7
+	sfx_pan TRUE, TRUE
+	sfx_duty 0
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7b6
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $7be
+	sfx_env 14, -7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7d1
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7db
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 14, -7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7b6
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $7be
+	sfx_env 13, -7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7d1
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7db
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 13, -7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7b6
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $7be
+	sfx_env 12, -7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7d1
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7db
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 10, -7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7b6
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $7be
+	sfx_env 10, -7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7d1
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7db
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7b6
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $7be
+	sfx_env 8, -7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7d1
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7db
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7b6
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $7be
+	sfx_env 6, -7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7d1
+	sfx_env 5, -7
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7db
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 5, -7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7b6
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $7be
+	sfx_env 5, -7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7d1
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7db
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $783
+	sfx_freq $7a2
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $79d
+	sfx_freq $7b6
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7a2
+	sfx_freq $7be
+	sfx_env 4, -7
+	sfx_duty 0
+	sfx_freq $7c1
+	sfx_freq $7d1
+	sfx_env 3, -7
+	sfx_duty 0
+	sfx_freq $7ce
+	sfx_freq $7db
+	sfx_env 2, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_env 1, -7
+	sfx_duty 0
+	sfx_freq $7d1
+	sfx_freq $7df
+	sfx_freq $7d1
+	sfx_freq $7df
 	sfx_end
diff --git a/src/audio/sfx/sfx_white_gas.asm b/src/audio/sfx/sfx_white_gas.asm
index d182325..ed0a423 100644
--- a/src/audio/sfx/sfx_white_gas.asm
+++ b/src/audio/sfx/sfx_white_gas.asm
@@ -1,50 +1,50 @@
 Sfx_WhiteGas_Ch1:
-	sfx_8 17
-	sfx_1 47
-	sfx_0 0, 8
-	sfx_0 0, 8
-	sfx_0 0, 8
-	sfx_1 79
-	sfx_0 0, 7
-	sfx_0 0, 7
-	sfx_0 0, 7
-	sfx_1 111
-	sfx_0 0, 6
-	sfx_0 0, 6
-	sfx_0 0, 6
-	sfx_1 143
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
+	sfx_pan TRUE, TRUE
+	sfx_env 2, -7
+	sfx_freq $8
+	sfx_freq $8
+	sfx_freq $8
+	sfx_env 4, -7
+	sfx_freq $7
+	sfx_freq $7
+	sfx_freq $7
+	sfx_env 6, -7
+	sfx_freq $6
+	sfx_freq $6
+	sfx_freq $6
+	sfx_env 8, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
 	sfx_loop 12
-	sfx_1 207
-	sfx_0 0, 4
-	sfx_0 0, 4
-	sfx_0 0, 4
-	sfx_0 0, 4
-	sfx_0 0, 4
-	sfx_0 0, 4
+	sfx_env 12, -7
+	sfx_freq $4
+	sfx_freq $4
+	sfx_freq $4
+	sfx_freq $4
+	sfx_freq $4
+	sfx_freq $4
 	sfx_endloop
-	sfx_1 143
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_1 127
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_1 95
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_1 47
-	sfx_0 0, 5
-	sfx_0 0, 5
-	sfx_0 0, 5
+	sfx_env 8, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_env 7, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_env 5, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
+	sfx_env 2, -7
+	sfx_freq $5
+	sfx_freq $5
+	sfx_freq $5
 	sfx_end
diff --git a/src/audio/sfx1.asm b/src/audio/sfx1.asm
index 735b42f..27955a3 100644
--- a/src/audio/sfx1.asm
+++ b/src/audio/sfx1.asm
@@ -168,16 +168,16 @@ Func_fc094:
 	jp hl
 
 SFX_CommandTable:
-	dw SFX_0
-	dw SFX_1
-	dw SFX_2
+	dw SFX_frequency
+	dw SFX_envelope
+	dw SFX_duty
 	dw SFX_loop
 	dw SFX_endloop
-	dw SFX_5
-	dw SFX_6
-	dw SFX_7
-	dw SFX_8
-	dw SFX_9
+	dw SFX_pitch_offset
+	dw SFX_wait
+	dw SFX_wave
+	dw SFX_pan
+	dw SFX_sweep
 	dw SFX_unused
 	dw SFX_unused
 	dw SFX_unused
@@ -188,7 +188,7 @@ SFX_CommandTable:
 SFX_unused:
 	jp Func_fc094
 
-SFX_0:
+SFX_frequency:
 	ld d, a
 	pop hl
 	ld a, [hli]
@@ -242,7 +242,7 @@ Func_fc105:
 	ld [hl], d
 	ret
 
-SFX_1:
+SFX_envelope:
 	ld hl, wde2b
 	add hl, bc
 	ld a, $80
@@ -262,7 +262,7 @@ SFX_1:
 	pop hl
 	jp Func_fc094
 
-SFX_2:
+SFX_duty:
 	swap a
 	ld e, a
 	ld hl, rAUD1LEN
@@ -312,7 +312,7 @@ SFX_endloop:
 	pop hl
 	jp Func_fc094
 
-SFX_5:
+SFX_pitch_offset:
 	ld hl, wde2f
 	add hl, bc
 	ld e, l
@@ -322,7 +322,7 @@ SFX_5:
 	ld [de], a
 	jp Func_fc094
 
-SFX_6:
+SFX_wait:
 	ld a, c
 	cp $3
 	jr nz, .asm_fc17c
@@ -438,7 +438,7 @@ Func_fc1cd:
 .asm_fc201
 	ret
 
-SFX_7:
+SFX_wave:
 	add a
 	ld d, $0
 	ld e, a
@@ -447,7 +447,7 @@ SFX_7:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, $0
+	ld a, AUD3ENA_OFF
 	ldh [rAUD3ENA], a
 	ld b, d
 	ld de, $ff30
@@ -461,13 +461,13 @@ SFX_7:
 	jr nz, .asm_fc215
 	ld a, $1
 	ld [wMusicWaveChange], a
-	ld a, $80
+	ld a, AUD3ENA_ON
 	ldh [rAUD3ENA], a
 	ld b, $0
 	pop hl
 	jp Func_fc094
 
-SFX_8:
+SFX_pan:
 	pop hl
 	ld a, [hli]
 	push hl
@@ -491,7 +491,7 @@ SFX_8:
 	pop hl
 	jp Func_fc094
 
-SFX_9:
+SFX_sweep:
 	pop hl
 	ld a, [hli]
 	ldh [rAUD1SWEEP], a
diff --git a/src/macros/audio.asm b/src/macros/audio.asm
index c93dd37..5aa448c 100644
--- a/src/macros/audio.asm
+++ b/src/macros/audio.asm
@@ -197,16 +197,22 @@ MACRO music_end
 	db $ff
 ENDM
 
-MACRO sfx_0
-	db \1, \2
+MACRO sfx_freq
+ASSERT \1 < $800
+	db HIGH(\1), LOW(\1)
 ENDM
 
-MACRO sfx_1
-	db $10, \1
+MACRO sfx_env
+	db $10
+	IF \2 < 0
+		dn \1, %1000 | (\2 * -1)
+	ELSE
+		dn \1, \2
+	ENDC
 ENDM
 
-MACRO sfx_2
-	db $20 | \1
+MACRO sfx_duty
+	db $20 | (\1 << 2)
 ENDM
 
 MACRO sfx_loop
@@ -217,20 +223,33 @@ MACRO sfx_endloop
 	db $40
 ENDM
 
-MACRO sfx_5
+MACRO sfx_pitch_offset
 	db $50, \1
 ENDM
 
-MACRO sfx_6
+MACRO sfx_wait
 	db $60, \1
 ENDM
 
-MACRO sfx_8
-	db $80, \1
+MACRO sfx_wave
+	db $70 | \1
 ENDM
 
-MACRO sfx_9
-	db $90, \1
+MACRO sfx_pan
+	db $80
+	dn !!\1, !!\2
+ENDM
+
+MACRO sfx_sweep_up
+ASSERT \1 < 8
+ASSERT \2 < 8
+	db $90, (((\1) << 4) | (\2)) | AUD1SWEEP_UP
+ENDM
+
+MACRO sfx_sweep_down
+ASSERT \1 < 8
+ASSERT \2 < 8
+	db $90, (((\1) << 4) | (\2)) | AUD1SWEEP_DOWN
 ENDM
 
 MACRO sfx_end

From c64ca288ffabfb33ff4fb84bb0501ee4814dfe4c Mon Sep 17 00:00:00 2001
From: Electro <ElectroDeoxys@gmail.com>
Date: Sat, 10 Jan 2026 00:28:44 +0000
Subject: [PATCH 2/3] Label more audio numbers

---
 src/audio/music1.asm        |  4 ++--
 src/audio/music2.asm        |  4 ++--
 src/audio/music3.asm        |  4 ++--
 src/audio/music4.asm        |  4 ++--
 src/audio/music5.asm        |  4 ++--
 src/audio/music6.asm        |  4 ++--
 src/audio/music7.asm        |  4 ++--
 src/audio/sfx2.asm          | 32 ++++++++++++++++----------------
 src/home/audio_callback.asm |  4 ++--
 src/home/unsorted.asm       |  4 ++--
 10 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/audio/music1.asm b/src/audio/music1.asm
index f1dca2d..e617f9b 100644
--- a/src/audio/music1.asm
+++ b/src/audio/music1.asm
@@ -132,9 +132,9 @@ Music1_Init:
 	ldh [rAUDVOL], a
 	ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
 	ldh [rAUDTERM], a
-	ld a, $78
+	ld a, BANK("Audio 2")
 	ld [wCurSongBank], a
-	ld a, $7e
+	ld a, BANK("Audio 8")
 	ld [wCurSfxBank], a
 	ld a, $80
 	ld [wCurSongID], a
diff --git a/src/audio/music2.asm b/src/audio/music2.asm
index b4b3c65..1fad43f 100644
--- a/src/audio/music2.asm
+++ b/src/audio/music2.asm
@@ -132,9 +132,9 @@ Music2_Init:
 	ldh [rAUDVOL], a
 	ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
 	ldh [rAUDTERM], a
-	ld a, $78
+	ld a, BANK("Audio 2")
 	ld [wCurSongBank], a
-	ld a, $7e
+	ld a, BANK("Audio 8")
 	ld [wCurSfxBank], a
 	ld a, $80
 	ld [wCurSongID], a
diff --git a/src/audio/music3.asm b/src/audio/music3.asm
index 72baf61..935377c 100644
--- a/src/audio/music3.asm
+++ b/src/audio/music3.asm
@@ -132,9 +132,9 @@ Music3_Init:
 	ldh [rAUDVOL], a
 	ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
 	ldh [rAUDTERM], a
-	ld a, $78
+	ld a, BANK("Audio 2")
 	ld [wCurSongBank], a
-	ld a, $7e
+	ld a, BANK("Audio 8")
 	ld [wCurSfxBank], a
 	ld a, $80
 	ld [wCurSongID], a
diff --git a/src/audio/music4.asm b/src/audio/music4.asm
index 580ffcb..44988f7 100644
--- a/src/audio/music4.asm
+++ b/src/audio/music4.asm
@@ -132,9 +132,9 @@ Music4_Init:
 	ldh [rAUDVOL], a
 	ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
 	ldh [rAUDTERM], a
-	ld a, $78
+	ld a, BANK("Audio 2")
 	ld [wCurSongBank], a
-	ld a, $7e
+	ld a, BANK("Audio 8")
 	ld [wCurSfxBank], a
 	ld a, $80
 	ld [wCurSongID], a
diff --git a/src/audio/music5.asm b/src/audio/music5.asm
index 545a19f..f898322 100644
--- a/src/audio/music5.asm
+++ b/src/audio/music5.asm
@@ -132,9 +132,9 @@ Music5_Init:
 	ldh [rAUDVOL], a
 	ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
 	ldh [rAUDTERM], a
-	ld a, $78
+	ld a, BANK("Audio 2")
 	ld [wCurSongBank], a
-	ld a, $7e
+	ld a, BANK("Audio 8")
 	ld [wCurSfxBank], a
 	ld a, $80
 	ld [wCurSongID], a
diff --git a/src/audio/music6.asm b/src/audio/music6.asm
index 37be2b3..bdcab1c 100644
--- a/src/audio/music6.asm
+++ b/src/audio/music6.asm
@@ -132,9 +132,9 @@ Music6_Init:
 	ldh [rAUDVOL], a
 	ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
 	ldh [rAUDTERM], a
-	ld a, $78
+	ld a, BANK("Audio 2")
 	ld [wCurSongBank], a
-	ld a, $7e
+	ld a, BANK("Audio 8")
 	ld [wCurSfxBank], a
 	ld a, $80
 	ld [wCurSongID], a
diff --git a/src/audio/music7.asm b/src/audio/music7.asm
index 0820a59..da02e1a 100644
--- a/src/audio/music7.asm
+++ b/src/audio/music7.asm
@@ -132,9 +132,9 @@ Music7_Init:
 	ldh [rAUDVOL], a
 	ld a, AUDTERM_1_RIGHT | AUDTERM_2_RIGHT | AUDTERM_3_RIGHT | AUDTERM_4_RIGHT | AUDTERM_1_LEFT | AUDTERM_2_LEFT | AUDTERM_3_LEFT | AUDTERM_4_LEFT
 	ldh [rAUDTERM], a
-	ld a, $78
+	ld a, BANK("Audio 2")
 	ld [wCurSongBank], a
-	ld a, $7e
+	ld a, BANK("Audio 8")
 	ld [wCurSfxBank], a
 	ld a, $80
 	ld [wCurSongID], a
diff --git a/src/audio/sfx2.asm b/src/audio/sfx2.asm
index 68873ea..3e019ae 100644
--- a/src/audio/sfx2.asm
+++ b/src/audio/sfx2.asm
@@ -168,16 +168,16 @@ Func_fc094_2:
 	jp hl
 
 SFX2_CommandTable:
-	dw SFX2_0
-	dw SFX2_1
-	dw SFX2_2
+	dw SFX2_frequency
+	dw SFX2_envelope
+	dw SFX2_duty
 	dw SFX2_loop
 	dw SFX2_endloop
-	dw SFX2_5
-	dw SFX2_6
-	dw SFX2_7
-	dw SFX2_8
-	dw SFX2_9
+	dw SFX2_pitch_offset
+	dw SFX2_wait
+	dw SFX2_wave
+	dw SFX2_pan
+	dw SFX2_sweep
 	dw SFX2_unused
 	dw SFX2_unused
 	dw SFX2_unused
@@ -188,7 +188,7 @@ SFX2_CommandTable:
 SFX2_unused:
 	jp Func_fc094_2
 
-SFX2_0:
+SFX2_frequency:
 	ld d, a
 	pop hl
 	ld a, [hli]
@@ -242,7 +242,7 @@ Func_fc105_2:
 	ld [hl], d
 	ret
 
-SFX2_1:
+SFX2_envelope:
 	ld hl, wde2b
 	add hl, bc
 	ld a, $80
@@ -262,7 +262,7 @@ SFX2_1:
 	pop hl
 	jp Func_fc094_2
 
-SFX2_2:
+SFX2_duty:
 	swap a
 	ld e, a
 	ld hl, rAUD1LEN
@@ -312,7 +312,7 @@ SFX2_endloop:
 	pop hl
 	jp Func_fc094_2
 
-SFX2_5:
+SFX2_pitch_offset:
 	ld hl, wde2f
 	add hl, bc
 	ld e, l
@@ -322,7 +322,7 @@ SFX2_5:
 	ld [de], a
 	jp Func_fc094_2
 
-SFX2_6:
+SFX2_wait:
 	ld a, c
 	cp $3
 	jr nz, .asm_fc17c
@@ -438,7 +438,7 @@ Func_fc1cd_2:
 .asm_fc201
 	ret
 
-SFX2_7:
+SFX2_wave:
 	add a
 	ld d, $0
 	ld e, a
@@ -467,7 +467,7 @@ SFX2_7:
 	pop hl
 	jp Func_fc094_2
 
-SFX2_8:
+SFX2_pan:
 	pop hl
 	ld a, [hli]
 	push hl
@@ -491,7 +491,7 @@ SFX2_8:
 	pop hl
 	jp Func_fc094_2
 
-SFX2_9:
+SFX2_sweep:
 	pop hl
 	ld a, [hli]
 	ldh [rAUD1SWEEP], a
diff --git a/src/home/audio_callback.asm b/src/home/audio_callback.asm
index e48fd0f..e80c6e8 100644
--- a/src/home/audio_callback.asm
+++ b/src/home/audio_callback.asm
@@ -3,7 +3,7 @@ SECTION "Audio Callback", ROM0
 ; jumps to 7e:hl, then switches to bank 78
 Bankswitch78To7e::
 	push af
-	ld a, $7e
+	ld a, BANK("Audio 8")
 	ldh [hBankROM], a
 	ld [rROMB], a
 	pop af
@@ -11,7 +11,7 @@ Bankswitch78To7e::
 	push bc
 	jp hl
 .bankswitch78
-	ld a, $78
+	ld a, BANK("Audio 2")
 	ldh [hBankROM], a
 	ld [rROMB], a
 	ret
diff --git a/src/home/unsorted.asm b/src/home/unsorted.asm
index 81c3f06..bc09b45 100644
--- a/src/home/unsorted.asm
+++ b/src/home/unsorted.asm
@@ -2777,7 +2777,7 @@ EnableInt_LYCoincidence::
 	push hl
 	ld hl, rSTAT
 	set B_STAT_LYC, [hl]
-	xor a
+	xor a ; useless
 	ld hl, rIE
 	set B_IE_STAT, [hl]
 	pop hl
@@ -2788,7 +2788,7 @@ DisableInt_LYCoincidence::
 	push hl
 	ld hl, rSTAT
 	res B_STAT_LYC, [hl]
-	xor a
+	xor a ; useless
 	ld hl, rIE
 	res B_IE_STAT, [hl]
 	pop hl

From 552f9d09e7d77dec2d9bbb9e047e94346b4cfb58 Mon Sep 17 00:00:00 2001
From: Electro <ElectroDeoxys@gmail.com>
Date: Sat, 10 Jan 2026 00:32:55 +0000
Subject: [PATCH 3/3] Also use waveram related constants

---
 src/audio/music1.asm | 4 ++--
 src/audio/music2.asm | 4 ++--
 src/audio/music3.asm | 4 ++--
 src/audio/music4.asm | 4 ++--
 src/audio/music5.asm | 4 ++--
 src/audio/music6.asm | 4 ++--
 src/audio/music7.asm | 4 ++--
 src/audio/sfx1.asm   | 4 ++--
 src/audio/sfx2.asm   | 8 ++++----
 9 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/audio/music1.asm b/src/audio/music1.asm
index e617f9b..cbc718e 100644
--- a/src/audio/music1.asm
+++ b/src/audio/music1.asm
@@ -1576,14 +1576,14 @@ Music1_LoadWaveInstrument:
 	ld h, [hl]
 	ld l, a
 	ld b, d
-	ld de, $ff30
+	ld de, _AUD3WAVERAM
 .copy_wave_loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	inc b
 	ld a, b
-	cp $10
+	cp AUD3WAVE_SIZE
 	jr nz, .copy_wave_loop
 	xor a
 	ld [wMusicWaveChange], a
diff --git a/src/audio/music2.asm b/src/audio/music2.asm
index 1fad43f..0ea942c 100644
--- a/src/audio/music2.asm
+++ b/src/audio/music2.asm
@@ -1576,14 +1576,14 @@ Music2_LoadWaveInstrument:
 	ld h, [hl]
 	ld l, a
 	ld b, d
-	ld de, $ff30
+	ld de, _AUD3WAVERAM
 .copy_wave_loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	inc b
 	ld a, b
-	cp $10
+	cp AUD3WAVE_SIZE
 	jr nz, .copy_wave_loop
 	xor a
 	ld [wMusicWaveChange], a
diff --git a/src/audio/music3.asm b/src/audio/music3.asm
index 935377c..d77ef47 100644
--- a/src/audio/music3.asm
+++ b/src/audio/music3.asm
@@ -1576,14 +1576,14 @@ Music3_LoadWaveInstrument:
 	ld h, [hl]
 	ld l, a
 	ld b, d
-	ld de, $ff30
+	ld de, _AUD3WAVERAM
 .copy_wave_loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	inc b
 	ld a, b
-	cp $10
+	cp AUD3WAVE_SIZE
 	jr nz, .copy_wave_loop
 	xor a
 	ld [wMusicWaveChange], a
diff --git a/src/audio/music4.asm b/src/audio/music4.asm
index 44988f7..b3645e2 100644
--- a/src/audio/music4.asm
+++ b/src/audio/music4.asm
@@ -1576,14 +1576,14 @@ Music4_LoadWaveInstrument:
 	ld h, [hl]
 	ld l, a
 	ld b, d
-	ld de, $ff30
+	ld de, _AUD3WAVERAM
 .copy_wave_loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	inc b
 	ld a, b
-	cp $10
+	cp AUD3WAVE_SIZE
 	jr nz, .copy_wave_loop
 	xor a
 	ld [wMusicWaveChange], a
diff --git a/src/audio/music5.asm b/src/audio/music5.asm
index f898322..16c2ccd 100644
--- a/src/audio/music5.asm
+++ b/src/audio/music5.asm
@@ -1576,14 +1576,14 @@ Music5_LoadWaveInstrument:
 	ld h, [hl]
 	ld l, a
 	ld b, d
-	ld de, $ff30
+	ld de, _AUD3WAVERAM
 .copy_wave_loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	inc b
 	ld a, b
-	cp $10
+	cp AUD3WAVE_SIZE
 	jr nz, .copy_wave_loop
 	xor a
 	ld [wMusicWaveChange], a
diff --git a/src/audio/music6.asm b/src/audio/music6.asm
index bdcab1c..cbc5f33 100644
--- a/src/audio/music6.asm
+++ b/src/audio/music6.asm
@@ -1576,14 +1576,14 @@ Music6_LoadWaveInstrument:
 	ld h, [hl]
 	ld l, a
 	ld b, d
-	ld de, $ff30
+	ld de, _AUD3WAVERAM
 .copy_wave_loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	inc b
 	ld a, b
-	cp $10
+	cp AUD3WAVE_SIZE
 	jr nz, .copy_wave_loop
 	xor a
 	ld [wMusicWaveChange], a
diff --git a/src/audio/music7.asm b/src/audio/music7.asm
index da02e1a..7c9dd5d 100644
--- a/src/audio/music7.asm
+++ b/src/audio/music7.asm
@@ -1576,14 +1576,14 @@ Music7_LoadWaveInstrument:
 	ld h, [hl]
 	ld l, a
 	ld b, d
-	ld de, $ff30
+	ld de, _AUD3WAVERAM
 .copy_wave_loop
 	ld a, [hli]
 	ld [de], a
 	inc de
 	inc b
 	ld a, b
-	cp $10
+	cp AUD3WAVE_SIZE
 	jr nz, .copy_wave_loop
 	xor a
 	ld [wMusicWaveChange], a
diff --git a/src/audio/sfx1.asm b/src/audio/sfx1.asm
index 27955a3..d557dac 100644
--- a/src/audio/sfx1.asm
+++ b/src/audio/sfx1.asm
@@ -450,14 +450,14 @@ SFX_wave:
 	ld a, AUD3ENA_OFF
 	ldh [rAUD3ENA], a
 	ld b, d
-	ld de, $ff30
+	ld de, _AUD3WAVERAM
 .asm_fc215
 	ld a, [hli]
 	ld [de], a
 	inc de
 	inc b
 	ld a, b
-	cp $10
+	cp AUD3WAVE_SIZE
 	jr nz, .asm_fc215
 	ld a, $1
 	ld [wMusicWaveChange], a
diff --git a/src/audio/sfx2.asm b/src/audio/sfx2.asm
index 3e019ae..52b5d3a 100644
--- a/src/audio/sfx2.asm
+++ b/src/audio/sfx2.asm
@@ -447,21 +447,21 @@ SFX2_wave:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, $0
+	ld a, AUD3ENA_OFF
 	ldh [rAUD3ENA], a
 	ld b, d
-	ld de, $ff30
+	ld de, _AUD3WAVERAM
 .asm_fc215
 	ld a, [hli]
 	ld [de], a
 	inc de
 	inc b
 	ld a, b
-	cp $10
+	cp AUD3WAVE_SIZE
 	jr nz, .asm_fc215
 	ld a, $1
 	ld [wMusicWaveChange], a
-	ld a, $80
+	ld a, AUD3ENA_ON
 	ldh [rAUD3ENA], a
 	ld b, $0
 	pop hl