Merge pull request #1146 from GriffinRichards/rename-songs

Give songs meaningful english names

1178 files changed, 10482 insertions, 10477 deletions

diff --git a/berry_fix/charmap.txt b/berry_fix/charmap.txt
index 94eabe8bc..09427dc8d 100644
--- a/berry_fix/charmap.txt
+++ b/berry_fix/charmap.txt
@@ -454,7 +454,7 @@ DYNAMIC_COLOR6 = 0F @ cerulean
 @ sound and music
 
 MUS_DUMMY = 00 00
-SE_KAIFUKU = 01 00
+SE_USE_ITEM = 01 00
 SE_PC_LOGIN = 02 00
 SE_PC_OFF = 03 00
 SE_PC_ON = 04 00
@@ -462,476 +462,476 @@ SE_SELECT = 05 00
 SE_WIN_OPEN = 06 00
 SE_WALL_HIT = 07 00
 SE_DOOR = 08 00
-SE_KAIDAN = 09 00
-SE_DANSA = 0A 00
-SE_JITENSYA = 0B 00
-SE_KOUKA_L = 0C 00
-SE_KOUKA_M = 0D 00
-SE_KOUKA_H = 0E 00
-SE_BOWA2 = 0F 00
-SE_POKE_DEAD = 10 00
-SE_NIGERU = 11 00
-SE_JIDO_DOA = 12 00
-SE_NAMINORI = 13 00
-SE_BAN = 14 00
+SE_EXIT = 09 00
+SE_LEDGE = 0A 00
+SE_BIKE_BELL = 0B 00
+SE_NOT_EFFECTIVE = 0C 00
+SE_EFFECTIVE = 0D 00
+SE_SUPER_EFFECTIVE = 0E 00
+SE_BALL_OPEN = 0F 00
+SE_FAINT = 10 00
+SE_FLEE = 11 00
+SE_SLIDING_DOOR = 12 00
+SE_SHIP = 13 00
+SE_BANG = 14 00
 SE_PIN = 15 00
 SE_BOO = 16 00
-SE_BOWA = 17 00
-SE_JYUNI = 18 00
+SE_BALL = 17 00
+SE_CONTEST_PLACE = 18 00
 SE_A = 19 00
 SE_I = 1A 00
 SE_U = 1B 00
 SE_E = 1C 00
 SE_O = 1D 00
 SE_N = 1E 00
-SE_SEIKAI = 1F 00
-SE_HAZURE = 20 00
+SE_SUCCESS = 1F 00
+SE_FAILURE = 20 00
 SE_EXP = 21 00
-SE_JITE_PYOKO = 22 00
-SE_MU_PACHI = 23 00
-SE_TK_KASYA = 24 00
+SE_BIKE_HOP = 22 00
+SE_SWITCH = 23 00
+SE_CLICK = 24 00
 SE_FU_ZAKU = 25 00
-SE_FU_ZAKU2 = 26 00
-SE_FU_ZUZUZU = 27 00
-SE_RU_GASHIN = 28 00
-SE_RU_GASYAN = 29 00
-SE_RU_BARI = 2A 00
-SE_RU_HYUU = 2B 00
-SE_KI_GASYAN = 2C 00
-SE_TK_WARPIN = 2D 00
-SE_TK_WARPOUT = 2E 00
-SE_TU_SAA = 2F 00
-SE_HI_TURUN = 30 00
-SE_TRACK_MOVE = 31 00
-SE_TRACK_STOP = 32 00
-SE_TRACK_HAIKI = 33 00
-SE_TRACK_DOOR = 34 00
-SE_MOTER = 35 00
+SE_CONTEST_CONDITION_LOSE = 26 00
+SE_LAVARIDGE_FALL_WARP = 27 00
+SE_ICE_STAIRS = 28 00
+SE_ICE_BREAK = 29 00
+SE_ICE_CRACK = 2A 00
+SE_FALL = 2B 00
+SE_UNLOCK = 2C 00
+SE_WARP_IN = 2D 00
+SE_WARP_OUT = 2E 00
+SE_REPEL = 2F 00
+SE_ROTATING_GATE = 30 00
+SE_TRUCK_MOVE = 31 00
+SE_TRUCK_STOP = 32 00
+SE_TRUCK_UNLOAD = 33 00
+SE_TRUCK_DOOR = 34 00
+SE_BERRY_BLENDER = 35 00
 SE_CARD = 36 00
 SE_SAVE = 37 00
-SE_KON = 38 00
-SE_KON2 = 39 00
-SE_KON3 = 3A 00
-SE_KON4 = 3B 00
-SE_SUIKOMU = 3C 00
-SE_NAGERU = 3D 00
-SE_TOY_C = 3E 00
-SE_TOY_D = 3F 00
-SE_TOY_E = 40 00
-SE_TOY_F = 41 00
-SE_TOY_G = 42 00
-SE_TOY_A = 43 00
-SE_TOY_B = 44 00
-SE_TOY_C1 = 45 00
-SE_MIZU = 46 00
-SE_HASHI = 47 00
-SE_DAUGI = 48 00
-SE_PINPON = 49 00
-SE_FUUSEN1 = 4A 00
-SE_FUUSEN2 = 4B 00
-SE_FUUSEN3 = 4C 00
-SE_TOY_KABE = 4D 00
-SE_TOY_DANGO = 4E 00
-SE_DOKU = 4F 00
-SE_ESUKA = 50 00
-SE_T_AME = 51 00
-SE_T_AME_E = 52 00
-SE_T_OOAME = 53 00
-SE_T_OOAME_E = 54 00
-SE_T_KOAME = 55 00
-SE_T_KOAME_E = 56 00
-SE_T_KAMI = 57 00
-SE_T_KAMI2 = 58 00
-SE_ELEBETA = 59 00
-SE_HINSI = 5A 00
-SE_EXPMAX = 5B 00
-SE_TAMAKORO = 5C 00
-SE_TAMAKORO_E = 5D 00
-SE_BASABASA = 5E 00
-SE_REGI = 5F 00
-SE_C_GAJI = 60 00
-SE_C_MAKU_U = 61 00
-SE_C_MAKU_D = 62 00
-SE_C_PASI = 63 00
-SE_C_SYU = 64 00
-SE_C_PIKON = 65 00
-SE_REAPOKE = 66 00
-SE_OP_BASYU = 67 00
-SE_BT_START = 68 00
-SE_DENDOU = 69 00
-SE_JIHANKI = 6A 00
-SE_TAMA = 6B 00
-SE_Z_SCROLL = 6C 00
-SE_Z_PAGE = 6D 00
-SE_PN_ON = 6E 00
-SE_PN_OFF = 6F 00
-SE_Z_SEARCH = 70 00
-SE_TAMAGO = 71 00
-SE_TB_START = 72 00
-SE_TB_KON = 73 00
-SE_TB_KARA = 74 00
-SE_BIDORO = 75 00
-SE_W085 = 76 00
-SE_W085B = 77 00
-SE_W231 = 78 00
-SE_W171 = 79 00
-SE_W233 = 7A 00
-SE_W233B = 7B 00
-SE_W145 = 7C 00
-SE_W145B = 7D 00
-SE_W145C = 7E 00
-SE_W240 = 7F 00
-SE_W015 = 80 00
-SE_W081 = 81 00
-SE_W081B = 82 00
-SE_W088 = 83 00
-SE_W016 = 84 00
-SE_W016B = 85 00
-SE_W003 = 86 00
-SE_W104 = 87 00
-SE_W013 = 88 00
-SE_W196 = 89 00
-SE_W086 = 8A 00
-SE_W004 = 8B 00
-SE_W025 = 8C 00
-SE_W025B = 8D 00
-SE_W152 = 8E 00
-SE_W026 = 8F 00
-SE_W172 = 90 00
-SE_W172B = 91 00
-SE_W053 = 92 00
-SE_W007 = 93 00
-SE_W092 = 94 00
-SE_W221 = 95 00
-SE_W221B = 96 00
-SE_W052 = 97 00
-SE_W036 = 98 00
-SE_W059 = 99 00
-SE_W059B = 9A 00
-SE_W010 = 9B 00
-SE_W011 = 9C 00
-SE_W017 = 9D 00
-SE_W019 = 9E 00
-SE_W028 = 9F 00
-SE_W013B = A0 00
-SE_W044 = A1 00
-SE_W029 = A2 00
-SE_W057 = A3 00
-SE_W056 = A4 00
-SE_W250 = A5 00
-SE_W030 = A6 00
-SE_W039 = A7 00
-SE_W054 = A8 00
-SE_W077 = A9 00
-SE_W020 = AA 00
-SE_W082 = AB 00
-SE_W047 = AC 00
-SE_W195 = AD 00
-SE_W006 = AE 00
-SE_W091 = AF 00
-SE_W146 = B0 00
-SE_W120 = B1 00
-SE_W153 = B2 00
-SE_W071B = B3 00
-SE_W071 = B4 00
-SE_W103 = B5 00
-SE_W062 = B6 00
-SE_W062B = B7 00
-SE_W048 = B8 00
-SE_W187 = B9 00
-SE_W118 = BA 00
-SE_W155 = BB 00
-SE_W122 = BC 00
-SE_W060 = BD 00
-SE_W185 = BE 00
-SE_W014 = BF 00
-SE_W043 = C0 00
-SE_W207 = C1 00
-SE_W207B = C2 00
-SE_W215 = C3 00
-SE_W109 = C4 00
-SE_W173 = C5 00
-SE_W280 = C6 00
-SE_W202 = C7 00
-SE_W060B = C8 00
-SE_W076 = C9 00
-SE_W080 = CA 00
-SE_W100 = CB 00
-SE_W107 = CC 00
-SE_W166 = CD 00
-SE_W129 = CE 00
-SE_W115 = CF 00
-SE_W112 = D0 00
-SE_W197 = D1 00
-SE_W199 = D2 00
-SE_W236 = D3 00
-SE_W204 = D4 00
-SE_W268 = D5 00
-SE_W070 = D6 00
-SE_W063 = D7 00
-SE_W127 = D8 00
-SE_W179 = D9 00
-SE_W151 = DA 00
-SE_W201 = DB 00
-SE_W161 = DC 00
-SE_W161B = DD 00
-SE_W227 = DE 00
-SE_W227B = DF 00
-SE_W226 = E0 00
-SE_W208 = E1 00
-SE_W213 = E2 00
-SE_W213B = E3 00
-SE_W234 = E4 00
-SE_W260 = E5 00
-SE_W328 = E6 00
-SE_W320 = E7 00
-SE_W255 = E8 00
-SE_W291 = E9 00
-SE_W089 = EA 00
-SE_W239 = EB 00
-SE_W230 = EC 00
-SE_W281 = ED 00
-SE_W327 = EE 00
-SE_W287 = EF 00
-SE_W257 = F0 00
-SE_W253 = F1 00
-SE_W258 = F2 00
-SE_W322 = F3 00
-SE_W298 = F4 00
-SE_W287B = F5 00
-SE_W114 = F6 00
-SE_W063B = F7 00
-SE_RG_W_DOOR = F8 00
-SE_RG_CARD1 = F9 00
-SE_RG_CARD2 = FA 00
-SE_RG_CARD3 = FB 00
-SE_RG_BAG1 = FC 00
-SE_RG_BAG2 = FD 00
-SE_RG_GETTING = FE 00
+SE_BALL_BOUNCE_1 = 38 00
+SE_BALL_BOUNCE_2 = 39 00
+SE_BALL_BOUNCE_3 = 3A 00
+SE_BALL_BOUNCE_4 = 3B 00
+SE_BALL_TRADE = 3C 00
+SE_BALL_THROW = 3D 00
+SE_NOTE_C = 3E 00
+SE_NOTE_D = 3F 00
+SE_NOTE_E = 40 00
+SE_NOTE_F = 41 00
+SE_NOTE_G = 42 00
+SE_NOTE_A = 43 00
+SE_NOTE_B = 44 00
+SE_NOTE_C_HIGH = 45 00
+SE_PUDDLE = 46 00
+SE_BRIDGE_WALK = 47 00
+SE_ITEMFINDER = 48 00
+SE_DING_DONG = 49 00
+SE_BALLOON_RED = 4A 00
+SE_BALLOON_BLUE = 4B 00
+SE_BALLOON_YELLOW = 4C 00
+SE_BREAKABLE_DOOR = 4D 00
+SE_MUD_BALL = 4E 00
+SE_FIELD_POISON = 4F 00
+SE_ESCALATOR = 50 00
+SE_THUNDERSTORM = 51 00
+SE_THUNDERSTORM_STOP = 52 00
+SE_DOWNPOUR = 53 00
+SE_DOWNPOUR_STOP = 54 00
+SE_RAIN = 55 00
+SE_RAIN_STOP = 56 00
+SE_THUNDER = 57 00
+SE_THUNDER2 = 58 00
+SE_ELEVATOR = 59 00
+SE_LOW_HEALTH = 5A 00
+SE_EXP_MAX = 5B 00
+SE_ROULETTE_BALL = 5C 00
+SE_ROULETTE_BALL2 = 5D 00
+SE_TAILLOW_WING_FLAP = 5E 00
+SE_SHOP = 5F 00
+SE_CONTEST_HEART = 60 00
+SE_CONTEST_CURTAIN_RISE = 61 00
+SE_CONTEST_CURTAIN_FALL = 62 00
+SE_CONTEST_ICON_CHANGE = 63 00
+SE_CONTEST_ICON_CLEAR = 64 00
+SE_CONTEST_MONS_TURN = 65 00
+SE_SHINY = 66 00
+SE_INTRO_BLAST = 67 00
+SE_MUGSHOT = 68 00
+SE_APPLAUSE = 69 00
+SE_VEND = 6A 00
+SE_ORB = 6B 00
+SE_DEX_SCROLL = 6C 00
+SE_DEX_PAGE = 6D 00
+SE_POKENAV_ON = 6E 00
+SE_POKENAV_OFF = 6F 00
+SE_DEX_SEARCH = 70 00
+SE_EGG_HATCH = 71 00
+SE_BALL_TRAY_ENTER = 72 00
+SE_BALL_TRAY_BALL = 73 00
+SE_BALL_TRAY_EXIT = 74 00
+SE_GLASS_FLUTE = 75 00
+SE_M_THUNDERBOLT = 76 00
+SE_M_THUNDERBOLT2 = 77 00
+SE_M_HARDEN = 78 00
+SE_M_NIGHTMARE = 79 00
+SE_M_VITAL_THROW = 7A 00
+SE_M_VITAL_THROW2 = 7B 00
+SE_M_BUBBLE = 7C 00
+SE_M_BUBBLE2 = 7D 00
+SE_M_BUBBLE3 = 7E 00
+SE_M_RAIN_DANCE = 7F 00
+SE_M_CUT = 80 00
+SE_M_STRING_SHOT = 81 00
+SE_M_STRING_SHOT2 = 82 00
+SE_M_ROCK_THROW = 83 00
+SE_M_GUST = 84 00
+SE_M_GUST2 = 85 00
+SE_M_DOUBLE_SLAP = 86 00
+SE_M_DOUBLE_TEAM = 87 00
+SE_M_RAZOR_WIND = 88 00
+SE_M_ICY_WIND = 89 00
+SE_M_THUNDER_WAVE = 8A 00
+SE_M_COMET_PUNCH = 8B 00
+SE_M_MEGA_KICK = 8C 00
+SE_M_MEGA_KICK2 = 8D 00
+SE_M_CRABHAMMER = 8E 00
+SE_M_JUMP_KICK = 8F 00
+SE_M_FLAME_WHEEL = 90 00
+SE_M_FLAME_WHEEL2 = 91 00
+SE_M_FLAMETHROWER = 92 00
+SE_M_FIRE_PUNCH = 93 00
+SE_M_TOXIC = 94 00
+SE_M_SACRED_FIRE = 95 00
+SE_M_SACRED_FIRE2 = 96 00
+SE_M_EMBER = 97 00
+SE_M_TAKE_DOWN = 98 00
+SE_M_BLIZZARD = 99 00
+SE_M_BLIZZARD2 = 9A 00
+SE_M_SCRATCH = 9B 00
+SE_M_VICEGRIP = 9C 00
+SE_M_WING_ATTACK = 9D 00
+SE_M_FLY = 9E 00
+SE_M_SAND_ATTACK = 9F 00
+SE_M_RAZOR_WIND2 = A0 00
+SE_M_BITE = A1 00
+SE_M_HEADBUTT = A2 00
+SE_M_SURF = A3 00
+SE_M_HYDRO_PUMP = A4 00
+SE_M_WHIRLPOOL = A5 00
+SE_M_HORN_ATTACK = A6 00
+SE_M_TAIL_WHIP = A7 00
+SE_M_MIST = A8 00
+SE_M_POISON_POWDER = A9 00
+SE_M_BIND = AA 00
+SE_M_DRAGON_RAGE = AB 00
+SE_M_SING = AC 00
+SE_M_PERISH_SONG = AD 00
+SE_M_PAY_DAY = AE 00
+SE_M_DIG = AF 00
+SE_M_DIZZY_PUNCH = B0 00
+SE_M_SELF_DESTRUCT = B1 00
+SE_M_EXPLOSION = B2 00
+SE_M_ABSORB_2 = B3 00
+SE_M_ABSORB = B4 00
+SE_M_SCREECH = B5 00
+SE_M_BUBBLE_BEAM = B6 00
+SE_M_BUBBLE_BEAM2 = B7 00
+SE_M_SUPERSONIC = B8 00
+SE_M_BELLY_DRUM = B9 00
+SE_M_METRONOME = BA 00
+SE_M_BONEMERANG = BB 00
+SE_M_LICK = BC 00
+SE_M_PSYBEAM = BD 00
+SE_M_FAINT_ATTACK = BE 00
+SE_M_SWORDS_DANCE = BF 00
+SE_M_LEER = C0 00
+SE_M_SWAGGER = C1 00
+SE_M_SWAGGER2 = C2 00
+SE_M_HEAL_BELL = C3 00
+SE_M_CONFUSE_RAY = C4 00
+SE_M_SNORE = C5 00
+SE_M_BRICK_BREAK = C6 00
+SE_M_GIGA_DRAIN = C7 00
+SE_M_PSYBEAM2 = C8 00
+SE_M_SOLAR_BEAM = C9 00
+SE_M_PETAL_DANCE = CA 00
+SE_M_TELEPORT = CB 00
+SE_M_MINIMIZE = CC 00
+SE_M_SKETCH = CD 00
+SE_M_SWIFT = CE 00
+SE_M_REFLECT = CF 00
+SE_M_BARRIER = D0 00
+SE_M_DETECT = D1 00
+SE_M_LOCK_ON = D2 00
+SE_M_MOONLIGHT = D3 00
+SE_M_CHARM = D4 00
+SE_M_CHARGE = D5 00
+SE_M_STRENGTH = D6 00
+SE_M_HYPER_BEAM = D7 00
+SE_M_WATERFALL = D8 00
+SE_M_REVERSAL = D9 00
+SE_M_ACID_ARMOR = DA 00
+SE_M_SANDSTORM = DB 00
+SE_M_TRI_ATTACK = DC 00
+SE_M_TRI_ATTACK2 = DD 00
+SE_M_ENCORE = DE 00
+SE_M_ENCORE2 = DF 00
+SE_M_BATON_PASS = E0 00
+SE_M_MILK_DRINK = E1 00
+SE_M_ATTRACT = E2 00
+SE_M_ATTRACT2 = E3 00
+SE_M_MORNING_SUN = E4 00
+SE_M_FLATTER = E5 00
+SE_M_SAND_TOMB = E6 00
+SE_M_GRASSWHISTLE = E7 00
+SE_M_SPIT_UP = E8 00
+SE_M_DIVE = E9 00
+SE_M_EARTHQUAKE = EA 00
+SE_M_TWISTER = EB 00
+SE_M_SWEET_SCENT = EC 00
+SE_M_YAWN = ED 00
+SE_M_SKY_UPPERCUT = EE 00
+SE_M_STAT_INCREASE = EF 00
+SE_M_HEAT_WAVE = F0 00
+SE_M_UPROAR = F1 00
+SE_M_HAIL = F2 00
+SE_M_COSMIC_POWER = F3 00
+SE_M_TEETER_DANCE = F4 00
+SE_M_STAT_DECREASE = F5 00
+SE_M_HAZE = F6 00
+SE_M_HYPER_BEAM2 = F7 00
+SE_RG_DOOR = F8 00
+SE_RG_CARD_FLIP = F9 00
+SE_RG_CARD_FLIPPING = FA 00
+SE_RG_CARD_OPEN = FB 00
+SE_RG_BAG_CURSOR = FC 00
+SE_RG_BAG_POCKET = FD 00
+SE_RG_BALL_CLICK = FE 00
 SE_RG_SHOP = FF 00
-SE_RG_KITEKI = 00 01
-SE_RG_HELP_OP = 01 01
-SE_RG_HELP_CL = 02 01
-SE_RG_HELP_NG = 03 01
-SE_RG_DEOMOV = 04 01
-SE_RG_EXCELLENT = 05 01
-SE_RG_NAWAMISS = 06 01
-SE_TOREEYE = 07 01
-SE_TOREOFF = 08 01
-SE_HANTEI1 = 09 01
-SE_HANTEI2 = 0A 01
-SE_CURTAIN = 0B 01
-SE_CURTAIN1 = 0C 01
-SE_USSOKI = 0D 01
-MUS_TETSUJI = 5E 01
-MUS_FIELD13 = 5F 01
-MUS_KACHI22 = 60 01
-MUS_KACHI2 = 61 01
-MUS_KACHI3 = 62 01
-MUS_KACHI5 = 63 01
-MUS_PCC = 64 01
-MUS_NIBI = 65 01
-MUS_SUIKUN = 66 01
-MUS_DOORO1 = 67 01
-MUS_DOORO_X1 = 68 01
-MUS_DOORO_X3 = 69 01
-MUS_MACHI_S2 = 6A 01
-MUS_MACHI_S4 = 6B 01
-MUS_GIM = 6C 01
-MUS_NAMINORI = 6D 01
-MUS_DAN01 = 6E 01
-MUS_FANFA1 = 6F 01
-MUS_ME_ASA = 70 01
-MUS_ME_BACHI = 71 01
-MUS_FANFA4 = 72 01
-MUS_FANFA5 = 73 01
-MUS_ME_WAZA = 74 01
-MUS_BIJYUTU = 75 01
-MUS_DOORO_X4 = 76 01
-MUS_FUNE_KAN = 77 01
-MUS_ME_SHINKA = 78 01
-MUS_SHINKA = 79 01
-MUS_ME_WASURE = 7A 01
-MUS_SYOUJOEYE = 7B 01
-MUS_BOYEYE = 7C 01
-MUS_DAN02 = 7D 01
-MUS_MACHI_S3 = 7E 01
-MUS_ODAMAKI = 7F 01
-MUS_B_TOWER = 80 01
-MUS_SWIMEYE = 81 01
-MUS_DAN03 = 82 01
-MUS_ME_KINOMI = 83 01
-MUS_ME_TAMA = 84 01
-MUS_ME_B_BIG = 85 01
-MUS_ME_B_SMALL = 86 01
-MUS_ME_ZANNEN = 87 01
-MUS_BD_TIME = 88 01
-MUS_TEST1 = 89 01
-MUS_TEST2 = 8A 01
-MUS_TEST3 = 8B 01
-MUS_TEST4 = 8C 01
-MUS_TEST = 8D 01
-MUS_GOMACHI0 = 8E 01
-MUS_GOTOWN = 8F 01
-MUS_POKECEN = 90 01
-MUS_NEXTROAD = 91 01
-MUS_GRANROAD = 92 01
+SE_RG_SS_ANNE_HORN = 00 01
+SE_RG_HELP_OPEN = 01 01
+SE_RG_HELP_CLOSE = 02 01
+SE_RG_HELP_ERROR = 03 01
+SE_RG_DEOXYS_MOVE = 04 01
+SE_RG_POKE_JUMP_SUCCESS = 05 01
+SE_RG_POKE_JUMP_FAILURE = 06 01
+SE_POKENAV_CALL = 07 01
+SE_POKENAV_HANG_UP = 08 01
+SE_ARENA_TIMEUP1 = 09 01
+SE_ARENA_TIMEUP2 = 0A 01
+SE_PIKE_CURTAIN_CLOSE = 0B 01
+SE_PIKE_CURTAIN_OPEN = 0C 01
+SE_SUDOWOODO_SHAKE = 0D 01
+MUS_LITTLEROOT_TEST = 5E 01
+MUS_GSC_ROUTE38 = 5F 01
+MUS_CAUGHT = 60 01
+MUS_VICTORY_WILD = 61 01
+MUS_VICTORY_GYM_LEADER = 62 01
+MUS_VICTORY_LEAGUE = 63 01
+MUS_C_COMM_CENTER = 64 01
+MUS_GSC_PEWTER = 65 01
+MUS_C_VS_LEGEND_BEAST = 66 01
+MUS_ROUTE101 = 67 01
+MUS_ROUTE110 = 68 01
+MUS_ROUTE120 = 69 01
+MUS_PETALBURG = 6A 01
+MUS_OLDALE = 6B 01
+MUS_GYM = 6C 01
+MUS_SURF = 6D 01
+MUS_PETALBURG_WOODS = 6E 01
+MUS_LEVEL_UP = 6F 01
+MUS_HEAL = 70 01
+MUS_OBTAIN_BADGE = 71 01
+MUS_OBTAIN_ITEM = 72 01
+MUS_EVOLVED = 73 01
+MUS_OBTAIN_TMHM = 74 01
+MUS_LILYCOVE_MUSEUM = 75 01
+MUS_ROUTE122 = 76 01
+MUS_OCEANIC_MUSEUM = 77 01
+MUS_EVOLUTION_INTRO = 78 01
+MUS_EVOLUTION = 79 01
+MUS_MOVE_DELETED = 7A 01
+MUS_ENCOUNTER_GIRL = 7B 01
+MUS_ENCOUNTER_MALE = 7C 01
+MUS_ABANDONED_SHIP = 7D 01
+MUS_FORTREE = 7E 01
+MUS_BIRCH_LAB = 7F 01
+MUS_B_TOWER_RS = 80 01
+MUS_ENCOUNTER_SWIMMER = 81 01
+MUS_CAVE_OF_ORIGIN = 82 01
+MUS_OBTAIN_BERRY = 83 01
+MUS_AWAKEN_LEGEND = 84 01
+MUS_SLOTS_JACKPOT = 85 01
+MUS_SLOTS_WIN = 86 01
+MUS_TOO_BAD = 87 01
+MUS_ROULETTE = 88 01
+MUS_LINK_CONTEST_P1 = 89 01
+MUS_LINK_CONTEST_P2 = 8A 01
+MUS_LINK_CONTEST_P3 = 8B 01
+MUS_LINK_CONTEST_P4 = 8C 01
+MUS_ENCOUNTER_RICH = 8D 01
+MUS_VERDANTURF = 8E 01
+MUS_RUSTBORO = 8F 01
+MUS_POKE_CENTER = 90 01
+MUS_ROUTE104 = 91 01
+MUS_ROUTE119 = 92 01
 MUS_CYCLING = 93 01
-MUS_FRIENDLY = 94 01
-MUS_MISHIRO = 95 01
-MUS_TOZAN = 96 01
-MUS_GIRLEYE = 97 01
-MUS_MINAMO = 98 01
-MUS_ASHROAD = 99 01
-MUS_EVENT0 = 9A 01
-MUS_DEEPDEEP = 9B 01
-MUS_KACHI1 = 9C 01
-MUS_TITLE3 = 9D 01
-MUS_DEMO1 = 9E 01
-MUS_GIRL_SUP = 9F 01
-MUS_HAGESHII = A0 01
-MUS_KAKKOII = A1 01
-MUS_KAZANBAI = A2 01
-MUS_AQA_0 = A3 01
-MUS_TSURETEK = A4 01
-MUS_BOY_SUP = A5 01
-MUS_RAINBOW = A6 01
-MUS_AYASII = A7 01
-MUS_KACHI4 = A8 01
-MUS_ROPEWAY = A9 01
-MUS_CASINO = AA 01
-MUS_HIGHTOWN = AB 01
-MUS_SAFARI = AC 01
-MUS_C_ROAD = AD 01
-MUS_AJITO = AE 01
-MUS_M_BOAT = AF 01
-MUS_M_DUNGON = B0 01
-MUS_FINECITY = B1 01
-MUS_MACHUPI = B2 01
-MUS_P_SCHOOL = B3 01
-MUS_DENDOU = B4 01
-MUS_TONEKUSA = B5 01
-MUS_MABOROSI = B6 01
-MUS_CON_FAN = B7 01
-MUS_CONTEST0 = B8 01
-MUS_MGM0 = B9 01
-MUS_T_BATTLE = BA 01
-MUS_OOAME = BB 01
-MUS_HIDERI = BC 01
-MUS_RUNECITY = BD 01
-MUS_CON_K = BE 01
-MUS_EIKOU_R = BF 01
-MUS_KARAKURI = C0 01
-MUS_HUTAGO = C1 01
-MUS_SITENNOU = C2 01
-MUS_YAMA_EYE = C3 01
-MUS_CONLOBBY = C4 01
-MUS_INTER_V = C5 01
-MUS_DAIGO = C6 01
-MUS_THANKFOR = C7 01
+MUS_POKE_MART = 94 01
+MUS_LITTLEROOT = 95 01
+MUS_MT_CHIMNEY = 96 01
+MUS_ENCOUNTER_FEMALE = 97 01
+MUS_LILYCOVE = 98 01
+MUS_ROUTE111 = 99 01
+MUS_HELP = 9A 01
+MUS_UNDERWATER = 9B 01
+MUS_VICTORY_TRAINER = 9C 01
+MUS_TITLE = 9D 01
+MUS_INTRO = 9E 01
+MUS_ENCOUNTER_MAY = 9F 01
+MUS_ENCOUNTER_INTENSE = A0 01
+MUS_ENCOUNTER_COOL = A1 01
+MUS_ROUTE113 = A2 01
+MUS_ENCOUNTER_AQUA = A3 01
+MUS_FOLLOW_ME = A4 01
+MUS_ENCOUNTER_BRENDAN = A5 01
+MUS_EVER_GRANDE = A6 01
+MUS_ENCOUNTER_SUSPICIOUS = A7 01
+MUS_VICTORY_AQUA_MAGMA = A8 01
+MUS_CABLE_CAR = A9 01
+MUS_GAME_CORNER = AA 01
+MUS_DEWFORD = AB 01
+MUS_SAFARI_ZONE = AC 01
+MUS_VICTORY_ROAD = AD 01
+MUS_AQUA_MAGMA_HIDEOUT = AE 01
+MUS_SAILING = AF 01
+MUS_MT_PYRE = B0 01
+MUS_SLATEPORT = B1 01
+MUS_MT_PYRE_EXTERIOR = B2 01
+MUS_SCHOOL = B3 01
+MUS_HALL_OF_FAME = B4 01
+MUS_FALLARBOR = B5 01
+MUS_SEALED_CHAMBER = B6 01
+MUS_CONTEST_WINNER = B7 01
+MUS_CONTEST = B8 01
+MUS_ENCOUNTER_MAGMA = B9 01
+MUS_INTRO_BATTLE = BA 01
+MUS_ABNORMAL_WEATHER = BB 01
+MUS_WEATHER_GROUDON = BC 01
+MUS_SOOTOPOLIS = BD 01
+MUS_CONTEST_RESULTS = BE 01
+MUS_HALL_OF_FAME_ROOM = BF 01
+MUS_TRICK_HOUSE = C0 01
+MUS_ENCOUNTER_TWINS = C1 01
+MUS_ENCOUNTER_ELITE_FOUR = C2 01
+MUS_ENCOUNTER_HIKER = C3 01
+MUS_CONTEST_LOBBY = C4 01
+MUS_ENCOUNTER_INTERVIEWER = C5 01
+MUS_ENCOUNTER_CHAMPION = C6 01
+MUS_CREDITS = C7 01
 MUS_END = C8 01
 MUS_B_FRONTIER = C9 01
 MUS_B_ARENA = CA 01
-MUS_ME_POINTGET = CB 01
-MUS_ME_TORE_EYE = CC 01
-MUS_PYRAMID = CD 01
-MUS_PYRAMID_TOP = CE 01
+MUS_OBTAIN_B_POINTS = CB 01
+MUS_REGISTER_MATCH_CALL = CC 01
+MUS_B_PYRAMID = CD 01
+MUS_B_PYRAMID_TOP = CE 01
 MUS_B_PALACE = CF 01
-MUS_REKKUU_KOURIN = D0 01
-MUS_SATTOWER = D1 01
-MUS_ME_SYMBOLGET = D2 01
+MUS_RAYQUAZA_APPEARS = D0 01
+MUS_B_TOWER = D1 01
+MUS_OBTAIN_SYMBOL = D2 01
 MUS_B_DOME = D3 01
-MUS_B_TUBE = D4 01
+MUS_B_PIKE = D4 01
 MUS_B_FACTORY = D5 01
-MUS_VS_REKKU = D6 01
-MUS_VS_FRONT = D7 01
+MUS_VS_RAYQUAZA = D6 01
+MUS_VS_FRONTIER_BRAIN = D7 01
 MUS_VS_MEW = D8 01
-MUS_B_DOME1 = D9 01
-MUS_BATTLE27 = DA 01
-MUS_BATTLE31 = DB 01
-MUS_BATTLE20 = DC 01
-MUS_BATTLE32 = DD 01
-MUS_BATTLE33 = DE 01
-MUS_BATTLE36 = DF 01
-MUS_BATTLE34 = E0 01
-MUS_BATTLE35 = E1 01
-MUS_BATTLE38 = E2 01
-MUS_BATTLE30 = E3 01
-MUS_RG_ANNAI = E4 01
-MUS_RG_SLOT = E5 01
-MUS_RG_AJITO = E6 01
+MUS_B_DOME_LOBBY = D9 01
+MUS_VS_WILD = DA 01
+MUS_VS_AQUA_MAGMA = DB 01
+MUS_VS_TRAINER = DC 01
+MUS_VS_GYM_LEADER = DD 01
+MUS_VS_CHAMPION = DE 01
+MUS_VS_REGI = DF 01
+MUS_VS_KYOGRE_GROUDON = E0 01
+MUS_VS_RIVAL = E1 01
+MUS_VS_ELITE_FOUR = E2 01
+MUS_VS_AQUA_MAGMA_LEADER = E3 01
+MUS_RG_FOLLOW_ME = E4 01
+MUS_RG_GAME_CORNER = E5 01
+MUS_RG_ROCKET_HIDEOUT = E6 01
 MUS_RG_GYM = E7 01
-MUS_RG_PURIN = E8 01
-MUS_RG_DEMO = E9 01
+MUS_RG_JIGGLYPUFF = E8 01
+MUS_RG_INTRO_FIGHT = E9 01
 MUS_RG_TITLE = EA 01
-MUS_RG_GUREN = EB 01
-MUS_RG_SHION = EC 01
-MUS_RG_KAIHUKU = ED 01
+MUS_RG_CINNABAR = EB 01
+MUS_RG_LAVENDER = EC 01
+MUS_RG_HEAL = ED 01
 MUS_RG_CYCLING = EE 01
-MUS_RG_ROCKET = EF 01
-MUS_RG_SHOUJO = F0 01
-MUS_RG_SHOUNEN = F1 01
-MUS_RG_DENDOU = F2 01
-MUS_RG_T_MORI = F3 01
-MUS_RG_OTSUKIMI = F4 01
-MUS_RG_POKEYASHI = F5 01
-MUS_RG_ENDING = F6 01
-MUS_RG_LOAD01 = F7 01
-MUS_RG_OPENING = F8 01
-MUS_RG_LOAD02 = F9 01
-MUS_RG_LOAD03 = FA 01
-MUS_RG_CHAMP_R = FB 01
-MUS_RG_VS_GYM = FC 01
-MUS_RG_VS_TORE = FD 01
-MUS_RG_VS_YASEI = FE 01
-MUS_RG_VS_LAST = FF 01
-MUS_RG_MASARA = 00 02
-MUS_RG_KENKYU = 01 02
-MUS_RG_OHKIDO = 02 02
-MUS_RG_POKECEN = 03 02
-MUS_RG_SANTOAN = 04 02
-MUS_RG_NAMINORI = 05 02
-MUS_RG_P_TOWER = 06 02
-MUS_RG_SHIRUHU = 07 02
-MUS_RG_HANADA = 08 02
-MUS_RG_TAMAMUSI = 09 02
-MUS_RG_WIN_TRE = 0A 02
-MUS_RG_WIN_YASEI = 0B 02
-MUS_RG_WIN_GYM = 0C 02
-MUS_RG_KUCHIBA = 0D 02
-MUS_RG_NIBI = 0E 02
-MUS_RG_RIVAL1 = 0F 02
-MUS_RG_RIVAL2 = 10 02
-MUS_RG_FAN2 = 11 02
-MUS_RG_FAN5 = 12 02
-MUS_RG_FAN6 = 13 02
-MUS_ME_RG_PHOTO = 14 02
-MUS_RG_TITLEROG = 15 02
-MUS_RG_GET_YASEI = 16 02
-MUS_RG_SOUSA = 17 02
-MUS_RG_SEKAIKAN = 18 02
-MUS_RG_SEIBETU = 19 02
-MUS_RG_JUMP = 1A 02
-MUS_RG_UNION = 1B 02
-MUS_RG_NETWORK = 1C 02
-MUS_RG_OKURIMONO = 1D 02
-MUS_RG_KINOMIKUI = 1E 02
-MUS_RG_NANADUNGEON = 1F 02
-MUS_RG_OSHIE_TV = 20 02
-MUS_RG_NANASHIMA = 21 02
-MUS_RG_NANAISEKI = 22 02
-MUS_RG_NANA123 = 23 02
-MUS_RG_NANA45 = 24 02
-MUS_RG_NANA67 = 25 02
-MUS_RG_POKEFUE = 26 02
-MUS_RG_VS_DEO = 27 02
-MUS_RG_VS_MYU2 = 28 02
-MUS_RG_VS_DEN = 29 02
-MUS_RG_EXEYE = 2A 02
-MUS_RG_DEOEYE = 2B 02
-MUS_RG_T_TOWER = 2C 02
-MUS_RG_SLOWMASARA = 2D 02
-MUS_RG_TVNOIZE = 2E 02
+MUS_RG_ENCOUNTER_ROCKET = EF 01
+MUS_RG_ENCOUNTER_GIRL = F0 01
+MUS_RG_ENCOUNTER_BOY = F1 01
+MUS_RG_HALL_OF_FAME = F2 01
+MUS_RG_VIRIDIAN_FOREST = F3 01
+MUS_RG_MT_MOON = F4 01
+MUS_RG_POKE_MANSION = F5 01
+MUS_RG_CREDITS = F6 01
+MUS_RG_ROUTE1 = F7 01
+MUS_RG_ROUTE24 = F8 01
+MUS_RG_ROUTE3 = F9 01
+MUS_RG_ROUTE11 = FA 01
+MUS_RG_VICTORY_ROAD = FB 01
+MUS_RG_VS_GYM_LEADER = FC 01
+MUS_RG_VS_TRAINER = FD 01
+MUS_RG_VS_WILD = FE 01
+MUS_RG_VS_CHAMPION = FF 01
+MUS_RG_PALLET = 00 02
+MUS_RG_OAK_LAB = 01 02
+MUS_RG_OAK = 02 02
+MUS_RG_POKE_CENTER = 03 02
+MUS_RG_SS_ANNE = 04 02
+MUS_RG_SURF = 05 02
+MUS_RG_POKE_TOWER = 06 02
+MUS_RG_SILPH = 07 02
+MUS_RG_FUCHSIA = 08 02
+MUS_RG_CELADON = 09 02
+MUS_RG_VICTORY_TRAINER = 0A 02
+MUS_RG_VICTORY_WILD = 0B 02
+MUS_RG_VICTORY_GYM_LEADER = 0C 02
+MUS_RG_VERMILLION = 0D 02
+MUS_RG_PEWTER = 0E 02
+MUS_RG_ENCOUNTER_RIVAL = 0F 02
+MUS_RG_RIVAL_EXIT = 10 02
+MUS_RG_DEX_RATING = 11 02
+MUS_RG_OBTAIN_KEY_ITEM = 12 02
+MUS_RG_CAUGHT_INTRO = 13 02
+MUS_RG_PHOTO = 14 02
+MUS_RG_GAME_FREAK = 15 02
+MUS_RG_CAUGHT = 16 02
+MUS_RG_NEW_GAME_INSTRUCT = 17 02
+MUS_RG_NEW_GAME_INTRO = 18 02
+MUS_RG_NEW_GAME_EXIT = 19 02
+MUS_RG_POKE_JUMP = 1A 02
+MUS_RG_UNION_ROOM = 1B 02
+MUS_RG_NET_CENTER = 1C 02
+MUS_RG_MYSTERY_GIFT = 1D 02
+MUS_RG_BERRY_PICK = 1E 02
+MUS_RG_SEVII_CAVE = 1F 02
+MUS_RG_TEACHY_TV_SHOW = 20 02
+MUS_RG_SEVII_ROUTE = 21 02
+MUS_RG_SEVII_DUNGEON = 22 02
+MUS_RG_SEVII_123 = 23 02
+MUS_RG_SEVII_45 = 24 02
+MUS_RG_SEVII_67 = 25 02
+MUS_RG_POKE_FLUTE = 26 02
+MUS_RG_VS_DEOXYS = 27 02
+MUS_RG_VS_MEWTWO = 28 02
+MUS_RG_VS_LEGEND = 29 02
+MUS_RG_ENCOUNTER_GYM_LEADER = 2A 02
+MUS_RG_ENCOUNTER_DEOXYS = 2B 02
+MUS_RG_TRAINER_TOWER = 2C 02
+MUS_RG_SLOW_PALLET = 2D 02
+MUS_RG_TEACHY_TV_MENU = 2E 02
 PH_TRAP_BLEND = 2F 02
 PH_TRAP_HELD = 30 02
 PH_TRAP_SOLO = 31 02
diff --git a/berry_fix/payload/charmap.txt b/berry_fix/payload/charmap.txt
index 94eabe8bc..09427dc8d 100644
--- a/berry_fix/payload/charmap.txt
+++ b/berry_fix/payload/charmap.txt
@@ -454,7 +454,7 @@ DYNAMIC_COLOR6 = 0F @ cerulean
 @ sound and music
 
 MUS_DUMMY = 00 00
-SE_KAIFUKU = 01 00
+SE_USE_ITEM = 01 00
 SE_PC_LOGIN = 02 00
 SE_PC_OFF = 03 00
 SE_PC_ON = 04 00
@@ -462,476 +462,476 @@ SE_SELECT = 05 00
 SE_WIN_OPEN = 06 00
 SE_WALL_HIT = 07 00
 SE_DOOR = 08 00
-SE_KAIDAN = 09 00
-SE_DANSA = 0A 00
-SE_JITENSYA = 0B 00
-SE_KOUKA_L = 0C 00
-SE_KOUKA_M = 0D 00
-SE_KOUKA_H = 0E 00
-SE_BOWA2 = 0F 00
-SE_POKE_DEAD = 10 00
-SE_NIGERU = 11 00
-SE_JIDO_DOA = 12 00
-SE_NAMINORI = 13 00
-SE_BAN = 14 00
+SE_EXIT = 09 00
+SE_LEDGE = 0A 00
+SE_BIKE_BELL = 0B 00
+SE_NOT_EFFECTIVE = 0C 00
+SE_EFFECTIVE = 0D 00
+SE_SUPER_EFFECTIVE = 0E 00
+SE_BALL_OPEN = 0F 00
+SE_FAINT = 10 00
+SE_FLEE = 11 00
+SE_SLIDING_DOOR = 12 00
+SE_SHIP = 13 00
+SE_BANG = 14 00
 SE_PIN = 15 00
 SE_BOO = 16 00
-SE_BOWA = 17 00
-SE_JYUNI = 18 00
+SE_BALL = 17 00
+SE_CONTEST_PLACE = 18 00
 SE_A = 19 00
 SE_I = 1A 00
 SE_U = 1B 00
 SE_E = 1C 00
 SE_O = 1D 00
 SE_N = 1E 00
-SE_SEIKAI = 1F 00
-SE_HAZURE = 20 00
+SE_SUCCESS = 1F 00
+SE_FAILURE = 20 00
 SE_EXP = 21 00
-SE_JITE_PYOKO = 22 00
-SE_MU_PACHI = 23 00
-SE_TK_KASYA = 24 00
+SE_BIKE_HOP = 22 00
+SE_SWITCH = 23 00
+SE_CLICK = 24 00
 SE_FU_ZAKU = 25 00
-SE_FU_ZAKU2 = 26 00
-SE_FU_ZUZUZU = 27 00
-SE_RU_GASHIN = 28 00
-SE_RU_GASYAN = 29 00
-SE_RU_BARI = 2A 00
-SE_RU_HYUU = 2B 00
-SE_KI_GASYAN = 2C 00
-SE_TK_WARPIN = 2D 00
-SE_TK_WARPOUT = 2E 00
-SE_TU_SAA = 2F 00
-SE_HI_TURUN = 30 00
-SE_TRACK_MOVE = 31 00
-SE_TRACK_STOP = 32 00
-SE_TRACK_HAIKI = 33 00
-SE_TRACK_DOOR = 34 00
-SE_MOTER = 35 00
+SE_CONTEST_CONDITION_LOSE = 26 00
+SE_LAVARIDGE_FALL_WARP = 27 00
+SE_ICE_STAIRS = 28 00
+SE_ICE_BREAK = 29 00
+SE_ICE_CRACK = 2A 00
+SE_FALL = 2B 00
+SE_UNLOCK = 2C 00
+SE_WARP_IN = 2D 00
+SE_WARP_OUT = 2E 00
+SE_REPEL = 2F 00
+SE_ROTATING_GATE = 30 00
+SE_TRUCK_MOVE = 31 00
+SE_TRUCK_STOP = 32 00
+SE_TRUCK_UNLOAD = 33 00
+SE_TRUCK_DOOR = 34 00
+SE_BERRY_BLENDER = 35 00
 SE_CARD = 36 00
 SE_SAVE = 37 00
-SE_KON = 38 00
-SE_KON2 = 39 00
-SE_KON3 = 3A 00
-SE_KON4 = 3B 00
-SE_SUIKOMU = 3C 00
-SE_NAGERU = 3D 00
-SE_TOY_C = 3E 00
-SE_TOY_D = 3F 00
-SE_TOY_E = 40 00
-SE_TOY_F = 41 00
-SE_TOY_G = 42 00
-SE_TOY_A = 43 00
-SE_TOY_B = 44 00
-SE_TOY_C1 = 45 00
-SE_MIZU = 46 00
-SE_HASHI = 47 00
-SE_DAUGI = 48 00
-SE_PINPON = 49 00
-SE_FUUSEN1 = 4A 00
-SE_FUUSEN2 = 4B 00
-SE_FUUSEN3 = 4C 00
-SE_TOY_KABE = 4D 00
-SE_TOY_DANGO = 4E 00
-SE_DOKU = 4F 00
-SE_ESUKA = 50 00
-SE_T_AME = 51 00
-SE_T_AME_E = 52 00
-SE_T_OOAME = 53 00
-SE_T_OOAME_E = 54 00
-SE_T_KOAME = 55 00
-SE_T_KOAME_E = 56 00
-SE_T_KAMI = 57 00
-SE_T_KAMI2 = 58 00
-SE_ELEBETA = 59 00
-SE_HINSI = 5A 00
-SE_EXPMAX = 5B 00
-SE_TAMAKORO = 5C 00
-SE_TAMAKORO_E = 5D 00
-SE_BASABASA = 5E 00
-SE_REGI = 5F 00
-SE_C_GAJI = 60 00
-SE_C_MAKU_U = 61 00
-SE_C_MAKU_D = 62 00
-SE_C_PASI = 63 00
-SE_C_SYU = 64 00
-SE_C_PIKON = 65 00
-SE_REAPOKE = 66 00
-SE_OP_BASYU = 67 00
-SE_BT_START = 68 00
-SE_DENDOU = 69 00
-SE_JIHANKI = 6A 00
-SE_TAMA = 6B 00
-SE_Z_SCROLL = 6C 00
-SE_Z_PAGE = 6D 00
-SE_PN_ON = 6E 00
-SE_PN_OFF = 6F 00
-SE_Z_SEARCH = 70 00
-SE_TAMAGO = 71 00
-SE_TB_START = 72 00
-SE_TB_KON = 73 00
-SE_TB_KARA = 74 00
-SE_BIDORO = 75 00
-SE_W085 = 76 00
-SE_W085B = 77 00
-SE_W231 = 78 00
-SE_W171 = 79 00
-SE_W233 = 7A 00
-SE_W233B = 7B 00
-SE_W145 = 7C 00
-SE_W145B = 7D 00
-SE_W145C = 7E 00
-SE_W240 = 7F 00
-SE_W015 = 80 00
-SE_W081 = 81 00
-SE_W081B = 82 00
-SE_W088 = 83 00
-SE_W016 = 84 00
-SE_W016B = 85 00
-SE_W003 = 86 00
-SE_W104 = 87 00
-SE_W013 = 88 00
-SE_W196 = 89 00
-SE_W086 = 8A 00
-SE_W004 = 8B 00
-SE_W025 = 8C 00
-SE_W025B = 8D 00
-SE_W152 = 8E 00
-SE_W026 = 8F 00
-SE_W172 = 90 00
-SE_W172B = 91 00
-SE_W053 = 92 00
-SE_W007 = 93 00
-SE_W092 = 94 00
-SE_W221 = 95 00
-SE_W221B = 96 00
-SE_W052 = 97 00
-SE_W036 = 98 00
-SE_W059 = 99 00
-SE_W059B = 9A 00
-SE_W010 = 9B 00
-SE_W011 = 9C 00
-SE_W017 = 9D 00
-SE_W019 = 9E 00
-SE_W028 = 9F 00
-SE_W013B = A0 00
-SE_W044 = A1 00
-SE_W029 = A2 00
-SE_W057 = A3 00
-SE_W056 = A4 00
-SE_W250 = A5 00
-SE_W030 = A6 00
-SE_W039 = A7 00
-SE_W054 = A8 00
-SE_W077 = A9 00
-SE_W020 = AA 00
-SE_W082 = AB 00
-SE_W047 = AC 00
-SE_W195 = AD 00
-SE_W006 = AE 00
-SE_W091 = AF 00
-SE_W146 = B0 00
-SE_W120 = B1 00
-SE_W153 = B2 00
-SE_W071B = B3 00
-SE_W071 = B4 00
-SE_W103 = B5 00
-SE_W062 = B6 00
-SE_W062B = B7 00
-SE_W048 = B8 00
-SE_W187 = B9 00
-SE_W118 = BA 00
-SE_W155 = BB 00
-SE_W122 = BC 00
-SE_W060 = BD 00
-SE_W185 = BE 00
-SE_W014 = BF 00
-SE_W043 = C0 00
-SE_W207 = C1 00
-SE_W207B = C2 00
-SE_W215 = C3 00
-SE_W109 = C4 00
-SE_W173 = C5 00
-SE_W280 = C6 00
-SE_W202 = C7 00
-SE_W060B = C8 00
-SE_W076 = C9 00
-SE_W080 = CA 00
-SE_W100 = CB 00
-SE_W107 = CC 00
-SE_W166 = CD 00
-SE_W129 = CE 00
-SE_W115 = CF 00
-SE_W112 = D0 00
-SE_W197 = D1 00
-SE_W199 = D2 00
-SE_W236 = D3 00
-SE_W204 = D4 00
-SE_W268 = D5 00
-SE_W070 = D6 00
-SE_W063 = D7 00
-SE_W127 = D8 00
-SE_W179 = D9 00
-SE_W151 = DA 00
-SE_W201 = DB 00
-SE_W161 = DC 00
-SE_W161B = DD 00
-SE_W227 = DE 00
-SE_W227B = DF 00
-SE_W226 = E0 00
-SE_W208 = E1 00
-SE_W213 = E2 00
-SE_W213B = E3 00
-SE_W234 = E4 00
-SE_W260 = E5 00
-SE_W328 = E6 00
-SE_W320 = E7 00
-SE_W255 = E8 00
-SE_W291 = E9 00
-SE_W089 = EA 00
-SE_W239 = EB 00
-SE_W230 = EC 00
-SE_W281 = ED 00
-SE_W327 = EE 00
-SE_W287 = EF 00
-SE_W257 = F0 00
-SE_W253 = F1 00
-SE_W258 = F2 00
-SE_W322 = F3 00
-SE_W298 = F4 00
-SE_W287B = F5 00
-SE_W114 = F6 00
-SE_W063B = F7 00
-SE_RG_W_DOOR = F8 00
-SE_RG_CARD1 = F9 00
-SE_RG_CARD2 = FA 00
-SE_RG_CARD3 = FB 00
-SE_RG_BAG1 = FC 00
-SE_RG_BAG2 = FD 00
-SE_RG_GETTING = FE 00
+SE_BALL_BOUNCE_1 = 38 00
+SE_BALL_BOUNCE_2 = 39 00
+SE_BALL_BOUNCE_3 = 3A 00
+SE_BALL_BOUNCE_4 = 3B 00
+SE_BALL_TRADE = 3C 00
+SE_BALL_THROW = 3D 00
+SE_NOTE_C = 3E 00
+SE_NOTE_D = 3F 00
+SE_NOTE_E = 40 00
+SE_NOTE_F = 41 00
+SE_NOTE_G = 42 00
+SE_NOTE_A = 43 00
+SE_NOTE_B = 44 00
+SE_NOTE_C_HIGH = 45 00
+SE_PUDDLE = 46 00
+SE_BRIDGE_WALK = 47 00
+SE_ITEMFINDER = 48 00
+SE_DING_DONG = 49 00
+SE_BALLOON_RED = 4A 00
+SE_BALLOON_BLUE = 4B 00
+SE_BALLOON_YELLOW = 4C 00
+SE_BREAKABLE_DOOR = 4D 00
+SE_MUD_BALL = 4E 00
+SE_FIELD_POISON = 4F 00
+SE_ESCALATOR = 50 00
+SE_THUNDERSTORM = 51 00
+SE_THUNDERSTORM_STOP = 52 00
+SE_DOWNPOUR = 53 00
+SE_DOWNPOUR_STOP = 54 00
+SE_RAIN = 55 00
+SE_RAIN_STOP = 56 00
+SE_THUNDER = 57 00
+SE_THUNDER2 = 58 00
+SE_ELEVATOR = 59 00
+SE_LOW_HEALTH = 5A 00
+SE_EXP_MAX = 5B 00
+SE_ROULETTE_BALL = 5C 00
+SE_ROULETTE_BALL2 = 5D 00
+SE_TAILLOW_WING_FLAP = 5E 00
+SE_SHOP = 5F 00
+SE_CONTEST_HEART = 60 00
+SE_CONTEST_CURTAIN_RISE = 61 00
+SE_CONTEST_CURTAIN_FALL = 62 00
+SE_CONTEST_ICON_CHANGE = 63 00
+SE_CONTEST_ICON_CLEAR = 64 00
+SE_CONTEST_MONS_TURN = 65 00
+SE_SHINY = 66 00
+SE_INTRO_BLAST = 67 00
+SE_MUGSHOT = 68 00
+SE_APPLAUSE = 69 00
+SE_VEND = 6A 00
+SE_ORB = 6B 00
+SE_DEX_SCROLL = 6C 00
+SE_DEX_PAGE = 6D 00
+SE_POKENAV_ON = 6E 00
+SE_POKENAV_OFF = 6F 00
+SE_DEX_SEARCH = 70 00
+SE_EGG_HATCH = 71 00
+SE_BALL_TRAY_ENTER = 72 00
+SE_BALL_TRAY_BALL = 73 00
+SE_BALL_TRAY_EXIT = 74 00
+SE_GLASS_FLUTE = 75 00
+SE_M_THUNDERBOLT = 76 00
+SE_M_THUNDERBOLT2 = 77 00
+SE_M_HARDEN = 78 00
+SE_M_NIGHTMARE = 79 00
+SE_M_VITAL_THROW = 7A 00
+SE_M_VITAL_THROW2 = 7B 00
+SE_M_BUBBLE = 7C 00
+SE_M_BUBBLE2 = 7D 00
+SE_M_BUBBLE3 = 7E 00
+SE_M_RAIN_DANCE = 7F 00
+SE_M_CUT = 80 00
+SE_M_STRING_SHOT = 81 00
+SE_M_STRING_SHOT2 = 82 00
+SE_M_ROCK_THROW = 83 00
+SE_M_GUST = 84 00
+SE_M_GUST2 = 85 00
+SE_M_DOUBLE_SLAP = 86 00
+SE_M_DOUBLE_TEAM = 87 00
+SE_M_RAZOR_WIND = 88 00
+SE_M_ICY_WIND = 89 00
+SE_M_THUNDER_WAVE = 8A 00
+SE_M_COMET_PUNCH = 8B 00
+SE_M_MEGA_KICK = 8C 00
+SE_M_MEGA_KICK2 = 8D 00
+SE_M_CRABHAMMER = 8E 00
+SE_M_JUMP_KICK = 8F 00
+SE_M_FLAME_WHEEL = 90 00
+SE_M_FLAME_WHEEL2 = 91 00
+SE_M_FLAMETHROWER = 92 00
+SE_M_FIRE_PUNCH = 93 00
+SE_M_TOXIC = 94 00
+SE_M_SACRED_FIRE = 95 00
+SE_M_SACRED_FIRE2 = 96 00
+SE_M_EMBER = 97 00
+SE_M_TAKE_DOWN = 98 00
+SE_M_BLIZZARD = 99 00
+SE_M_BLIZZARD2 = 9A 00
+SE_M_SCRATCH = 9B 00
+SE_M_VICEGRIP = 9C 00
+SE_M_WING_ATTACK = 9D 00
+SE_M_FLY = 9E 00
+SE_M_SAND_ATTACK = 9F 00
+SE_M_RAZOR_WIND2 = A0 00
+SE_M_BITE = A1 00
+SE_M_HEADBUTT = A2 00
+SE_M_SURF = A3 00
+SE_M_HYDRO_PUMP = A4 00
+SE_M_WHIRLPOOL = A5 00
+SE_M_HORN_ATTACK = A6 00
+SE_M_TAIL_WHIP = A7 00
+SE_M_MIST = A8 00
+SE_M_POISON_POWDER = A9 00
+SE_M_BIND = AA 00
+SE_M_DRAGON_RAGE = AB 00
+SE_M_SING = AC 00
+SE_M_PERISH_SONG = AD 00
+SE_M_PAY_DAY = AE 00
+SE_M_DIG = AF 00
+SE_M_DIZZY_PUNCH = B0 00
+SE_M_SELF_DESTRUCT = B1 00
+SE_M_EXPLOSION = B2 00
+SE_M_ABSORB_2 = B3 00
+SE_M_ABSORB = B4 00
+SE_M_SCREECH = B5 00
+SE_M_BUBBLE_BEAM = B6 00
+SE_M_BUBBLE_BEAM2 = B7 00
+SE_M_SUPERSONIC = B8 00
+SE_M_BELLY_DRUM = B9 00
+SE_M_METRONOME = BA 00
+SE_M_BONEMERANG = BB 00
+SE_M_LICK = BC 00
+SE_M_PSYBEAM = BD 00
+SE_M_FAINT_ATTACK = BE 00
+SE_M_SWORDS_DANCE = BF 00
+SE_M_LEER = C0 00
+SE_M_SWAGGER = C1 00
+SE_M_SWAGGER2 = C2 00
+SE_M_HEAL_BELL = C3 00
+SE_M_CONFUSE_RAY = C4 00
+SE_M_SNORE = C5 00
+SE_M_BRICK_BREAK = C6 00
+SE_M_GIGA_DRAIN = C7 00
+SE_M_PSYBEAM2 = C8 00
+SE_M_SOLAR_BEAM = C9 00
+SE_M_PETAL_DANCE = CA 00
+SE_M_TELEPORT = CB 00
+SE_M_MINIMIZE = CC 00
+SE_M_SKETCH = CD 00
+SE_M_SWIFT = CE 00
+SE_M_REFLECT = CF 00
+SE_M_BARRIER = D0 00
+SE_M_DETECT = D1 00
+SE_M_LOCK_ON = D2 00
+SE_M_MOONLIGHT = D3 00
+SE_M_CHARM = D4 00
+SE_M_CHARGE = D5 00
+SE_M_STRENGTH = D6 00
+SE_M_HYPER_BEAM = D7 00
+SE_M_WATERFALL = D8 00
+SE_M_REVERSAL = D9 00
+SE_M_ACID_ARMOR = DA 00
+SE_M_SANDSTORM = DB 00
+SE_M_TRI_ATTACK = DC 00
+SE_M_TRI_ATTACK2 = DD 00
+SE_M_ENCORE = DE 00
+SE_M_ENCORE2 = DF 00
+SE_M_BATON_PASS = E0 00
+SE_M_MILK_DRINK = E1 00
+SE_M_ATTRACT = E2 00
+SE_M_ATTRACT2 = E3 00
+SE_M_MORNING_SUN = E4 00
+SE_M_FLATTER = E5 00
+SE_M_SAND_TOMB = E6 00
+SE_M_GRASSWHISTLE = E7 00
+SE_M_SPIT_UP = E8 00
+SE_M_DIVE = E9 00
+SE_M_EARTHQUAKE = EA 00
+SE_M_TWISTER = EB 00
+SE_M_SWEET_SCENT = EC 00
+SE_M_YAWN = ED 00
+SE_M_SKY_UPPERCUT = EE 00
+SE_M_STAT_INCREASE = EF 00
+SE_M_HEAT_WAVE = F0 00
+SE_M_UPROAR = F1 00
+SE_M_HAIL = F2 00
+SE_M_COSMIC_POWER = F3 00
+SE_M_TEETER_DANCE = F4 00
+SE_M_STAT_DECREASE = F5 00
+SE_M_HAZE = F6 00
+SE_M_HYPER_BEAM2 = F7 00
+SE_RG_DOOR = F8 00
+SE_RG_CARD_FLIP = F9 00
+SE_RG_CARD_FLIPPING = FA 00
+SE_RG_CARD_OPEN = FB 00
+SE_RG_BAG_CURSOR = FC 00
+SE_RG_BAG_POCKET = FD 00
+SE_RG_BALL_CLICK = FE 00
 SE_RG_SHOP = FF 00
-SE_RG_KITEKI = 00 01
-SE_RG_HELP_OP = 01 01
-SE_RG_HELP_CL = 02 01
-SE_RG_HELP_NG = 03 01
-SE_RG_DEOMOV = 04 01
-SE_RG_EXCELLENT = 05 01
-SE_RG_NAWAMISS = 06 01
-SE_TOREEYE = 07 01
-SE_TOREOFF = 08 01
-SE_HANTEI1 = 09 01
-SE_HANTEI2 = 0A 01
-SE_CURTAIN = 0B 01
-SE_CURTAIN1 = 0C 01
-SE_USSOKI = 0D 01
-MUS_TETSUJI = 5E 01
-MUS_FIELD13 = 5F 01
-MUS_KACHI22 = 60 01
-MUS_KACHI2 = 61 01
-MUS_KACHI3 = 62 01
-MUS_KACHI5 = 63 01
-MUS_PCC = 64 01
-MUS_NIBI = 65 01
-MUS_SUIKUN = 66 01
-MUS_DOORO1 = 67 01
-MUS_DOORO_X1 = 68 01
-MUS_DOORO_X3 = 69 01
-MUS_MACHI_S2 = 6A 01
-MUS_MACHI_S4 = 6B 01
-MUS_GIM = 6C 01
-MUS_NAMINORI = 6D 01
-MUS_DAN01 = 6E 01
-MUS_FANFA1 = 6F 01
-MUS_ME_ASA = 70 01
-MUS_ME_BACHI = 71 01
-MUS_FANFA4 = 72 01
-MUS_FANFA5 = 73 01
-MUS_ME_WAZA = 74 01
-MUS_BIJYUTU = 75 01
-MUS_DOORO_X4 = 76 01
-MUS_FUNE_KAN = 77 01
-MUS_ME_SHINKA = 78 01
-MUS_SHINKA = 79 01
-MUS_ME_WASURE = 7A 01
-MUS_SYOUJOEYE = 7B 01
-MUS_BOYEYE = 7C 01
-MUS_DAN02 = 7D 01
-MUS_MACHI_S3 = 7E 01
-MUS_ODAMAKI = 7F 01
-MUS_B_TOWER = 80 01
-MUS_SWIMEYE = 81 01
-MUS_DAN03 = 82 01
-MUS_ME_KINOMI = 83 01
-MUS_ME_TAMA = 84 01
-MUS_ME_B_BIG = 85 01
-MUS_ME_B_SMALL = 86 01
-MUS_ME_ZANNEN = 87 01
-MUS_BD_TIME = 88 01
-MUS_TEST1 = 89 01
-MUS_TEST2 = 8A 01
-MUS_TEST3 = 8B 01
-MUS_TEST4 = 8C 01
-MUS_TEST = 8D 01
-MUS_GOMACHI0 = 8E 01
-MUS_GOTOWN = 8F 01
-MUS_POKECEN = 90 01
-MUS_NEXTROAD = 91 01
-MUS_GRANROAD = 92 01
+SE_RG_SS_ANNE_HORN = 00 01
+SE_RG_HELP_OPEN = 01 01
+SE_RG_HELP_CLOSE = 02 01
+SE_RG_HELP_ERROR = 03 01
+SE_RG_DEOXYS_MOVE = 04 01
+SE_RG_POKE_JUMP_SUCCESS = 05 01
+SE_RG_POKE_JUMP_FAILURE = 06 01
+SE_POKENAV_CALL = 07 01
+SE_POKENAV_HANG_UP = 08 01
+SE_ARENA_TIMEUP1 = 09 01
+SE_ARENA_TIMEUP2 = 0A 01
+SE_PIKE_CURTAIN_CLOSE = 0B 01
+SE_PIKE_CURTAIN_OPEN = 0C 01
+SE_SUDOWOODO_SHAKE = 0D 01
+MUS_LITTLEROOT_TEST = 5E 01
+MUS_GSC_ROUTE38 = 5F 01
+MUS_CAUGHT = 60 01
+MUS_VICTORY_WILD = 61 01
+MUS_VICTORY_GYM_LEADER = 62 01
+MUS_VICTORY_LEAGUE = 63 01
+MUS_C_COMM_CENTER = 64 01
+MUS_GSC_PEWTER = 65 01
+MUS_C_VS_LEGEND_BEAST = 66 01
+MUS_ROUTE101 = 67 01
+MUS_ROUTE110 = 68 01
+MUS_ROUTE120 = 69 01
+MUS_PETALBURG = 6A 01
+MUS_OLDALE = 6B 01
+MUS_GYM = 6C 01
+MUS_SURF = 6D 01
+MUS_PETALBURG_WOODS = 6E 01
+MUS_LEVEL_UP = 6F 01
+MUS_HEAL = 70 01
+MUS_OBTAIN_BADGE = 71 01
+MUS_OBTAIN_ITEM = 72 01
+MUS_EVOLVED = 73 01
+MUS_OBTAIN_TMHM = 74 01
+MUS_LILYCOVE_MUSEUM = 75 01
+MUS_ROUTE122 = 76 01
+MUS_OCEANIC_MUSEUM = 77 01
+MUS_EVOLUTION_INTRO = 78 01
+MUS_EVOLUTION = 79 01
+MUS_MOVE_DELETED = 7A 01
+MUS_ENCOUNTER_GIRL = 7B 01
+MUS_ENCOUNTER_MALE = 7C 01
+MUS_ABANDONED_SHIP = 7D 01
+MUS_FORTREE = 7E 01
+MUS_BIRCH_LAB = 7F 01
+MUS_B_TOWER_RS = 80 01
+MUS_ENCOUNTER_SWIMMER = 81 01
+MUS_CAVE_OF_ORIGIN = 82 01
+MUS_OBTAIN_BERRY = 83 01
+MUS_AWAKEN_LEGEND = 84 01
+MUS_SLOTS_JACKPOT = 85 01
+MUS_SLOTS_WIN = 86 01
+MUS_TOO_BAD = 87 01
+MUS_ROULETTE = 88 01
+MUS_LINK_CONTEST_P1 = 89 01
+MUS_LINK_CONTEST_P2 = 8A 01
+MUS_LINK_CONTEST_P3 = 8B 01
+MUS_LINK_CONTEST_P4 = 8C 01
+MUS_ENCOUNTER_RICH = 8D 01
+MUS_VERDANTURF = 8E 01
+MUS_RUSTBORO = 8F 01
+MUS_POKE_CENTER = 90 01
+MUS_ROUTE104 = 91 01
+MUS_ROUTE119 = 92 01
 MUS_CYCLING = 93 01
-MUS_FRIENDLY = 94 01
-MUS_MISHIRO = 95 01
-MUS_TOZAN = 96 01
-MUS_GIRLEYE = 97 01
-MUS_MINAMO = 98 01
-MUS_ASHROAD = 99 01
-MUS_EVENT0 = 9A 01
-MUS_DEEPDEEP = 9B 01
-MUS_KACHI1 = 9C 01
-MUS_TITLE3 = 9D 01
-MUS_DEMO1 = 9E 01
-MUS_GIRL_SUP = 9F 01
-MUS_HAGESHII = A0 01
-MUS_KAKKOII = A1 01
-MUS_KAZANBAI = A2 01
-MUS_AQA_0 = A3 01
-MUS_TSURETEK = A4 01
-MUS_BOY_SUP = A5 01
-MUS_RAINBOW = A6 01
-MUS_AYASII = A7 01
-MUS_KACHI4 = A8 01
-MUS_ROPEWAY = A9 01
-MUS_CASINO = AA 01
-MUS_HIGHTOWN = AB 01
-MUS_SAFARI = AC 01
-MUS_C_ROAD = AD 01
-MUS_AJITO = AE 01
-MUS_M_BOAT = AF 01
-MUS_M_DUNGON = B0 01
-MUS_FINECITY = B1 01
-MUS_MACHUPI = B2 01
-MUS_P_SCHOOL = B3 01
-MUS_DENDOU = B4 01
-MUS_TONEKUSA = B5 01
-MUS_MABOROSI = B6 01
-MUS_CON_FAN = B7 01
-MUS_CONTEST0 = B8 01
-MUS_MGM0 = B9 01
-MUS_T_BATTLE = BA 01
-MUS_OOAME = BB 01
-MUS_HIDERI = BC 01
-MUS_RUNECITY = BD 01
-MUS_CON_K = BE 01
-MUS_EIKOU_R = BF 01
-MUS_KARAKURI = C0 01
-MUS_HUTAGO = C1 01
-MUS_SITENNOU = C2 01
-MUS_YAMA_EYE = C3 01
-MUS_CONLOBBY = C4 01
-MUS_INTER_V = C5 01
-MUS_DAIGO = C6 01
-MUS_THANKFOR = C7 01
+MUS_POKE_MART = 94 01
+MUS_LITTLEROOT = 95 01
+MUS_MT_CHIMNEY = 96 01
+MUS_ENCOUNTER_FEMALE = 97 01
+MUS_LILYCOVE = 98 01
+MUS_ROUTE111 = 99 01
+MUS_HELP = 9A 01
+MUS_UNDERWATER = 9B 01
+MUS_VICTORY_TRAINER = 9C 01
+MUS_TITLE = 9D 01
+MUS_INTRO = 9E 01
+MUS_ENCOUNTER_MAY = 9F 01
+MUS_ENCOUNTER_INTENSE = A0 01
+MUS_ENCOUNTER_COOL = A1 01
+MUS_ROUTE113 = A2 01
+MUS_ENCOUNTER_AQUA = A3 01
+MUS_FOLLOW_ME = A4 01
+MUS_ENCOUNTER_BRENDAN = A5 01
+MUS_EVER_GRANDE = A6 01
+MUS_ENCOUNTER_SUSPICIOUS = A7 01
+MUS_VICTORY_AQUA_MAGMA = A8 01
+MUS_CABLE_CAR = A9 01
+MUS_GAME_CORNER = AA 01
+MUS_DEWFORD = AB 01
+MUS_SAFARI_ZONE = AC 01
+MUS_VICTORY_ROAD = AD 01
+MUS_AQUA_MAGMA_HIDEOUT = AE 01
+MUS_SAILING = AF 01
+MUS_MT_PYRE = B0 01
+MUS_SLATEPORT = B1 01
+MUS_MT_PYRE_EXTERIOR = B2 01
+MUS_SCHOOL = B3 01
+MUS_HALL_OF_FAME = B4 01
+MUS_FALLARBOR = B5 01
+MUS_SEALED_CHAMBER = B6 01
+MUS_CONTEST_WINNER = B7 01
+MUS_CONTEST = B8 01
+MUS_ENCOUNTER_MAGMA = B9 01
+MUS_INTRO_BATTLE = BA 01
+MUS_ABNORMAL_WEATHER = BB 01
+MUS_WEATHER_GROUDON = BC 01
+MUS_SOOTOPOLIS = BD 01
+MUS_CONTEST_RESULTS = BE 01
+MUS_HALL_OF_FAME_ROOM = BF 01
+MUS_TRICK_HOUSE = C0 01
+MUS_ENCOUNTER_TWINS = C1 01
+MUS_ENCOUNTER_ELITE_FOUR = C2 01
+MUS_ENCOUNTER_HIKER = C3 01
+MUS_CONTEST_LOBBY = C4 01
+MUS_ENCOUNTER_INTERVIEWER = C5 01
+MUS_ENCOUNTER_CHAMPION = C6 01
+MUS_CREDITS = C7 01
 MUS_END = C8 01
 MUS_B_FRONTIER = C9 01
 MUS_B_ARENA = CA 01
-MUS_ME_POINTGET = CB 01
-MUS_ME_TORE_EYE = CC 01
-MUS_PYRAMID = CD 01
-MUS_PYRAMID_TOP = CE 01
+MUS_OBTAIN_B_POINTS = CB 01
+MUS_REGISTER_MATCH_CALL = CC 01
+MUS_B_PYRAMID = CD 01
+MUS_B_PYRAMID_TOP = CE 01
 MUS_B_PALACE = CF 01
-MUS_REKKUU_KOURIN = D0 01
-MUS_SATTOWER = D1 01
-MUS_ME_SYMBOLGET = D2 01
+MUS_RAYQUAZA_APPEARS = D0 01
+MUS_B_TOWER = D1 01
+MUS_OBTAIN_SYMBOL = D2 01
 MUS_B_DOME = D3 01
-MUS_B_TUBE = D4 01
+MUS_B_PIKE = D4 01
 MUS_B_FACTORY = D5 01
-MUS_VS_REKKU = D6 01
-MUS_VS_FRONT = D7 01
+MUS_VS_RAYQUAZA = D6 01
+MUS_VS_FRONTIER_BRAIN = D7 01
 MUS_VS_MEW = D8 01
-MUS_B_DOME1 = D9 01
-MUS_BATTLE27 = DA 01
-MUS_BATTLE31 = DB 01
-MUS_BATTLE20 = DC 01
-MUS_BATTLE32 = DD 01
-MUS_BATTLE33 = DE 01
-MUS_BATTLE36 = DF 01
-MUS_BATTLE34 = E0 01
-MUS_BATTLE35 = E1 01
-MUS_BATTLE38 = E2 01
-MUS_BATTLE30 = E3 01
-MUS_RG_ANNAI = E4 01
-MUS_RG_SLOT = E5 01
-MUS_RG_AJITO = E6 01
+MUS_B_DOME_LOBBY = D9 01
+MUS_VS_WILD = DA 01
+MUS_VS_AQUA_MAGMA = DB 01
+MUS_VS_TRAINER = DC 01
+MUS_VS_GYM_LEADER = DD 01
+MUS_VS_CHAMPION = DE 01
+MUS_VS_REGI = DF 01
+MUS_VS_KYOGRE_GROUDON = E0 01
+MUS_VS_RIVAL = E1 01
+MUS_VS_ELITE_FOUR = E2 01
+MUS_VS_AQUA_MAGMA_LEADER = E3 01
+MUS_RG_FOLLOW_ME = E4 01
+MUS_RG_GAME_CORNER = E5 01
+MUS_RG_ROCKET_HIDEOUT = E6 01
 MUS_RG_GYM = E7 01
-MUS_RG_PURIN = E8 01
-MUS_RG_DEMO = E9 01
+MUS_RG_JIGGLYPUFF = E8 01
+MUS_RG_INTRO_FIGHT = E9 01
 MUS_RG_TITLE = EA 01
-MUS_RG_GUREN = EB 01
-MUS_RG_SHION = EC 01
-MUS_RG_KAIHUKU = ED 01
+MUS_RG_CINNABAR = EB 01
+MUS_RG_LAVENDER = EC 01
+MUS_RG_HEAL = ED 01
 MUS_RG_CYCLING = EE 01
-MUS_RG_ROCKET = EF 01
-MUS_RG_SHOUJO = F0 01
-MUS_RG_SHOUNEN = F1 01
-MUS_RG_DENDOU = F2 01
-MUS_RG_T_MORI = F3 01
-MUS_RG_OTSUKIMI = F4 01
-MUS_RG_POKEYASHI = F5 01
-MUS_RG_ENDING = F6 01
-MUS_RG_LOAD01 = F7 01
-MUS_RG_OPENING = F8 01
-MUS_RG_LOAD02 = F9 01
-MUS_RG_LOAD03 = FA 01
-MUS_RG_CHAMP_R = FB 01
-MUS_RG_VS_GYM = FC 01
-MUS_RG_VS_TORE = FD 01
-MUS_RG_VS_YASEI = FE 01
-MUS_RG_VS_LAST = FF 01
-MUS_RG_MASARA = 00 02
-MUS_RG_KENKYU = 01 02
-MUS_RG_OHKIDO = 02 02
-MUS_RG_POKECEN = 03 02
-MUS_RG_SANTOAN = 04 02
-MUS_RG_NAMINORI = 05 02
-MUS_RG_P_TOWER = 06 02
-MUS_RG_SHIRUHU = 07 02
-MUS_RG_HANADA = 08 02
-MUS_RG_TAMAMUSI = 09 02
-MUS_RG_WIN_TRE = 0A 02
-MUS_RG_WIN_YASEI = 0B 02
-MUS_RG_WIN_GYM = 0C 02
-MUS_RG_KUCHIBA = 0D 02
-MUS_RG_NIBI = 0E 02
-MUS_RG_RIVAL1 = 0F 02
-MUS_RG_RIVAL2 = 10 02
-MUS_RG_FAN2 = 11 02
-MUS_RG_FAN5 = 12 02
-MUS_RG_FAN6 = 13 02
-MUS_ME_RG_PHOTO = 14 02
-MUS_RG_TITLEROG = 15 02
-MUS_RG_GET_YASEI = 16 02
-MUS_RG_SOUSA = 17 02
-MUS_RG_SEKAIKAN = 18 02
-MUS_RG_SEIBETU = 19 02
-MUS_RG_JUMP = 1A 02
-MUS_RG_UNION = 1B 02
-MUS_RG_NETWORK = 1C 02
-MUS_RG_OKURIMONO = 1D 02
-MUS_RG_KINOMIKUI = 1E 02
-MUS_RG_NANADUNGEON = 1F 02
-MUS_RG_OSHIE_TV = 20 02
-MUS_RG_NANASHIMA = 21 02
-MUS_RG_NANAISEKI = 22 02
-MUS_RG_NANA123 = 23 02
-MUS_RG_NANA45 = 24 02
-MUS_RG_NANA67 = 25 02
-MUS_RG_POKEFUE = 26 02
-MUS_RG_VS_DEO = 27 02
-MUS_RG_VS_MYU2 = 28 02
-MUS_RG_VS_DEN = 29 02
-MUS_RG_EXEYE = 2A 02
-MUS_RG_DEOEYE = 2B 02
-MUS_RG_T_TOWER = 2C 02
-MUS_RG_SLOWMASARA = 2D 02
-MUS_RG_TVNOIZE = 2E 02
+MUS_RG_ENCOUNTER_ROCKET = EF 01
+MUS_RG_ENCOUNTER_GIRL = F0 01
+MUS_RG_ENCOUNTER_BOY = F1 01
+MUS_RG_HALL_OF_FAME = F2 01
+MUS_RG_VIRIDIAN_FOREST = F3 01
+MUS_RG_MT_MOON = F4 01
+MUS_RG_POKE_MANSION = F5 01
+MUS_RG_CREDITS = F6 01
+MUS_RG_ROUTE1 = F7 01
+MUS_RG_ROUTE24 = F8 01
+MUS_RG_ROUTE3 = F9 01
+MUS_RG_ROUTE11 = FA 01
+MUS_RG_VICTORY_ROAD = FB 01
+MUS_RG_VS_GYM_LEADER = FC 01
+MUS_RG_VS_TRAINER = FD 01
+MUS_RG_VS_WILD = FE 01
+MUS_RG_VS_CHAMPION = FF 01
+MUS_RG_PALLET = 00 02
+MUS_RG_OAK_LAB = 01 02
+MUS_RG_OAK = 02 02
+MUS_RG_POKE_CENTER = 03 02
+MUS_RG_SS_ANNE = 04 02
+MUS_RG_SURF = 05 02
+MUS_RG_POKE_TOWER = 06 02
+MUS_RG_SILPH = 07 02
+MUS_RG_FUCHSIA = 08 02
+MUS_RG_CELADON = 09 02
+MUS_RG_VICTORY_TRAINER = 0A 02
+MUS_RG_VICTORY_WILD = 0B 02
+MUS_RG_VICTORY_GYM_LEADER = 0C 02
+MUS_RG_VERMILLION = 0D 02
+MUS_RG_PEWTER = 0E 02
+MUS_RG_ENCOUNTER_RIVAL = 0F 02
+MUS_RG_RIVAL_EXIT = 10 02
+MUS_RG_DEX_RATING = 11 02
+MUS_RG_OBTAIN_KEY_ITEM = 12 02
+MUS_RG_CAUGHT_INTRO = 13 02
+MUS_RG_PHOTO = 14 02
+MUS_RG_GAME_FREAK = 15 02
+MUS_RG_CAUGHT = 16 02
+MUS_RG_NEW_GAME_INSTRUCT = 17 02
+MUS_RG_NEW_GAME_INTRO = 18 02
+MUS_RG_NEW_GAME_EXIT = 19 02
+MUS_RG_POKE_JUMP = 1A 02
+MUS_RG_UNION_ROOM = 1B 02
+MUS_RG_NET_CENTER = 1C 02
+MUS_RG_MYSTERY_GIFT = 1D 02
+MUS_RG_BERRY_PICK = 1E 02
+MUS_RG_SEVII_CAVE = 1F 02
+MUS_RG_TEACHY_TV_SHOW = 20 02
+MUS_RG_SEVII_ROUTE = 21 02
+MUS_RG_SEVII_DUNGEON = 22 02
+MUS_RG_SEVII_123 = 23 02
+MUS_RG_SEVII_45 = 24 02
+MUS_RG_SEVII_67 = 25 02
+MUS_RG_POKE_FLUTE = 26 02
+MUS_RG_VS_DEOXYS = 27 02
+MUS_RG_VS_MEWTWO = 28 02
+MUS_RG_VS_LEGEND = 29 02
+MUS_RG_ENCOUNTER_GYM_LEADER = 2A 02
+MUS_RG_ENCOUNTER_DEOXYS = 2B 02
+MUS_RG_TRAINER_TOWER = 2C 02
+MUS_RG_SLOW_PALLET = 2D 02
+MUS_RG_TEACHY_TV_MENU = 2E 02
 PH_TRAP_BLEND = 2F 02
 PH_TRAP_HELD = 30 02
 PH_TRAP_SOLO = 31 02
diff --git a/charmap.txt b/charmap.txt
index c96202a09..ca4db0fc7 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -458,7 +458,7 @@ DYNAMIC_COLOR6 = 0F @ cerulean
 @ sound and music
 
 MUS_DUMMY = 00 00
-SE_KAIFUKU = 01 00
+SE_USE_ITEM = 01 00
 SE_PC_LOGIN = 02 00
 SE_PC_OFF = 03 00
 SE_PC_ON = 04 00
@@ -466,476 +466,476 @@ SE_SELECT = 05 00
 SE_WIN_OPEN = 06 00
 SE_WALL_HIT = 07 00
 SE_DOOR = 08 00
-SE_KAIDAN = 09 00
-SE_DANSA = 0A 00
-SE_JITENSYA = 0B 00
-SE_KOUKA_L = 0C 00
-SE_KOUKA_M = 0D 00
-SE_KOUKA_H = 0E 00
-SE_BOWA2 = 0F 00
-SE_POKE_DEAD = 10 00
-SE_NIGERU = 11 00
-SE_JIDO_DOA = 12 00
-SE_NAMINORI = 13 00
-SE_BAN = 14 00
+SE_EXIT = 09 00
+SE_LEDGE = 0A 00
+SE_BIKE_BELL = 0B 00
+SE_NOT_EFFECTIVE = 0C 00
+SE_EFFECTIVE = 0D 00
+SE_SUPER_EFFECTIVE = 0E 00
+SE_BALL_OPEN = 0F 00
+SE_FAINT = 10 00
+SE_FLEE = 11 00
+SE_SLIDING_DOOR = 12 00
+SE_SHIP = 13 00
+SE_BANG = 14 00
 SE_PIN = 15 00
 SE_BOO = 16 00
-SE_BOWA = 17 00
-SE_JYUNI = 18 00
+SE_BALL = 17 00
+SE_CONTEST_PLACE = 18 00
 SE_A = 19 00
 SE_I = 1A 00
 SE_U = 1B 00
 SE_E = 1C 00
 SE_O = 1D 00
 SE_N = 1E 00
-SE_SEIKAI = 1F 00
-SE_HAZURE = 20 00
+SE_SUCCESS = 1F 00
+SE_FAILURE = 20 00
 SE_EXP = 21 00
-SE_JITE_PYOKO = 22 00
-SE_MU_PACHI = 23 00
-SE_TK_KASYA = 24 00
+SE_BIKE_HOP = 22 00
+SE_SWITCH = 23 00
+SE_CLICK = 24 00
 SE_FU_ZAKU = 25 00
-SE_FU_ZAKU2 = 26 00
-SE_FU_ZUZUZU = 27 00
-SE_RU_GASHIN = 28 00
-SE_RU_GASYAN = 29 00
-SE_RU_BARI = 2A 00
-SE_RU_HYUU = 2B 00
-SE_KI_GASYAN = 2C 00
-SE_TK_WARPIN = 2D 00
-SE_TK_WARPOUT = 2E 00
-SE_TU_SAA = 2F 00
-SE_HI_TURUN = 30 00
-SE_TRACK_MOVE = 31 00
-SE_TRACK_STOP = 32 00
-SE_TRACK_HAIKI = 33 00
-SE_TRACK_DOOR = 34 00
-SE_MOTER = 35 00
+SE_CONTEST_CONDITION_LOSE = 26 00
+SE_LAVARIDGE_FALL_WARP = 27 00
+SE_ICE_STAIRS = 28 00
+SE_ICE_BREAK = 29 00
+SE_ICE_CRACK = 2A 00
+SE_FALL = 2B 00
+SE_UNLOCK = 2C 00
+SE_WARP_IN = 2D 00
+SE_WARP_OUT = 2E 00
+SE_REPEL = 2F 00
+SE_ROTATING_GATE = 30 00
+SE_TRUCK_MOVE = 31 00
+SE_TRUCK_STOP = 32 00
+SE_TRUCK_UNLOAD = 33 00
+SE_TRUCK_DOOR = 34 00
+SE_BERRY_BLENDER = 35 00
 SE_CARD = 36 00
 SE_SAVE = 37 00
-SE_KON = 38 00
-SE_KON2 = 39 00
-SE_KON3 = 3A 00
-SE_KON4 = 3B 00
-SE_SUIKOMU = 3C 00
-SE_NAGERU = 3D 00
-SE_TOY_C = 3E 00
-SE_TOY_D = 3F 00
-SE_TOY_E = 40 00
-SE_TOY_F = 41 00
-SE_TOY_G = 42 00
-SE_TOY_A = 43 00
-SE_TOY_B = 44 00
-SE_TOY_C1 = 45 00
-SE_MIZU = 46 00
-SE_HASHI = 47 00
-SE_DAUGI = 48 00
-SE_PINPON = 49 00
-SE_FUUSEN1 = 4A 00
-SE_FUUSEN2 = 4B 00
-SE_FUUSEN3 = 4C 00
-SE_TOY_KABE = 4D 00
-SE_TOY_DANGO = 4E 00
-SE_DOKU = 4F 00
-SE_ESUKA = 50 00
-SE_T_AME = 51 00
-SE_T_AME_E = 52 00
-SE_T_OOAME = 53 00
-SE_T_OOAME_E = 54 00
-SE_T_KOAME = 55 00
-SE_T_KOAME_E = 56 00
-SE_T_KAMI = 57 00
-SE_T_KAMI2 = 58 00
-SE_ELEBETA = 59 00
-SE_HINSI = 5A 00
-SE_EXPMAX = 5B 00
-SE_TAMAKORO = 5C 00
-SE_TAMAKORO_E = 5D 00
-SE_BASABASA = 5E 00
-SE_REGI = 5F 00
-SE_C_GAJI = 60 00
-SE_C_MAKU_U = 61 00
-SE_C_MAKU_D = 62 00
-SE_C_PASI = 63 00
-SE_C_SYU = 64 00
-SE_C_PIKON = 65 00
-SE_REAPOKE = 66 00
-SE_OP_BASYU = 67 00
-SE_BT_START = 68 00
-SE_DENDOU = 69 00
-SE_JIHANKI = 6A 00
-SE_TAMA = 6B 00
-SE_Z_SCROLL = 6C 00
-SE_Z_PAGE = 6D 00
-SE_PN_ON = 6E 00
-SE_PN_OFF = 6F 00
-SE_Z_SEARCH = 70 00
-SE_TAMAGO = 71 00
-SE_TB_START = 72 00
-SE_TB_KON = 73 00
-SE_TB_KARA = 74 00
-SE_BIDORO = 75 00
-SE_W085 = 76 00
-SE_W085B = 77 00
-SE_W231 = 78 00
-SE_W171 = 79 00
-SE_W233 = 7A 00
-SE_W233B = 7B 00
-SE_W145 = 7C 00
-SE_W145B = 7D 00
-SE_W145C = 7E 00
-SE_W240 = 7F 00
-SE_W015 = 80 00
-SE_W081 = 81 00
-SE_W081B = 82 00
-SE_W088 = 83 00
-SE_W016 = 84 00
-SE_W016B = 85 00
-SE_W003 = 86 00
-SE_W104 = 87 00
-SE_W013 = 88 00
-SE_W196 = 89 00
-SE_W086 = 8A 00
-SE_W004 = 8B 00
-SE_W025 = 8C 00
-SE_W025B = 8D 00
-SE_W152 = 8E 00
-SE_W026 = 8F 00
-SE_W172 = 90 00
-SE_W172B = 91 00
-SE_W053 = 92 00
-SE_W007 = 93 00
-SE_W092 = 94 00
-SE_W221 = 95 00
-SE_W221B = 96 00
-SE_W052 = 97 00
-SE_W036 = 98 00
-SE_W059 = 99 00
-SE_W059B = 9A 00
-SE_W010 = 9B 00
-SE_W011 = 9C 00
-SE_W017 = 9D 00
-SE_W019 = 9E 00
-SE_W028 = 9F 00
-SE_W013B = A0 00
-SE_W044 = A1 00
-SE_W029 = A2 00
-SE_W057 = A3 00
-SE_W056 = A4 00
-SE_W250 = A5 00
-SE_W030 = A6 00
-SE_W039 = A7 00
-SE_W054 = A8 00
-SE_W077 = A9 00
-SE_W020 = AA 00
-SE_W082 = AB 00
-SE_W047 = AC 00
-SE_W195 = AD 00
-SE_W006 = AE 00
-SE_W091 = AF 00
-SE_W146 = B0 00
-SE_W120 = B1 00
-SE_W153 = B2 00
-SE_W071B = B3 00
-SE_W071 = B4 00
-SE_W103 = B5 00
-SE_W062 = B6 00
-SE_W062B = B7 00
-SE_W048 = B8 00
-SE_W187 = B9 00
-SE_W118 = BA 00
-SE_W155 = BB 00
-SE_W122 = BC 00
-SE_W060 = BD 00
-SE_W185 = BE 00
-SE_W014 = BF 00
-SE_W043 = C0 00
-SE_W207 = C1 00
-SE_W207B = C2 00
-SE_W215 = C3 00
-SE_W109 = C4 00
-SE_W173 = C5 00
-SE_W280 = C6 00
-SE_W202 = C7 00
-SE_W060B = C8 00
-SE_W076 = C9 00
-SE_W080 = CA 00
-SE_W100 = CB 00
-SE_W107 = CC 00
-SE_W166 = CD 00
-SE_W129 = CE 00
-SE_W115 = CF 00
-SE_W112 = D0 00
-SE_W197 = D1 00
-SE_W199 = D2 00
-SE_W236 = D3 00
-SE_W204 = D4 00
-SE_W268 = D5 00
-SE_W070 = D6 00
-SE_W063 = D7 00
-SE_W127 = D8 00
-SE_W179 = D9 00
-SE_W151 = DA 00
-SE_W201 = DB 00
-SE_W161 = DC 00
-SE_W161B = DD 00
-SE_W227 = DE 00
-SE_W227B = DF 00
-SE_W226 = E0 00
-SE_W208 = E1 00
-SE_W213 = E2 00
-SE_W213B = E3 00
-SE_W234 = E4 00
-SE_W260 = E5 00
-SE_W328 = E6 00
-SE_W320 = E7 00
-SE_W255 = E8 00
-SE_W291 = E9 00
-SE_W089 = EA 00
-SE_W239 = EB 00
-SE_W230 = EC 00
-SE_W281 = ED 00
-SE_W327 = EE 00
-SE_W287 = EF 00
-SE_W257 = F0 00
-SE_W253 = F1 00
-SE_W258 = F2 00
-SE_W322 = F3 00
-SE_W298 = F4 00
-SE_W287B = F5 00
-SE_W114 = F6 00
-SE_W063B = F7 00
-SE_RG_W_DOOR = F8 00
-SE_RG_CARD1 = F9 00
-SE_RG_CARD2 = FA 00
-SE_RG_CARD3 = FB 00
-SE_RG_BAG1 = FC 00
-SE_RG_BAG2 = FD 00
-SE_RG_GETTING = FE 00
+SE_BALL_BOUNCE_1 = 38 00
+SE_BALL_BOUNCE_2 = 39 00
+SE_BALL_BOUNCE_3 = 3A 00
+SE_BALL_BOUNCE_4 = 3B 00
+SE_BALL_TRADE = 3C 00
+SE_BALL_THROW = 3D 00
+SE_NOTE_C = 3E 00
+SE_NOTE_D = 3F 00
+SE_NOTE_E = 40 00
+SE_NOTE_F = 41 00
+SE_NOTE_G = 42 00
+SE_NOTE_A = 43 00
+SE_NOTE_B = 44 00
+SE_NOTE_C_HIGH = 45 00
+SE_PUDDLE = 46 00
+SE_BRIDGE_WALK = 47 00
+SE_ITEMFINDER = 48 00
+SE_DING_DONG = 49 00
+SE_BALLOON_RED = 4A 00
+SE_BALLOON_BLUE = 4B 00
+SE_BALLOON_YELLOW = 4C 00
+SE_BREAKABLE_DOOR = 4D 00
+SE_MUD_BALL = 4E 00
+SE_FIELD_POISON = 4F 00
+SE_ESCALATOR = 50 00
+SE_THUNDERSTORM = 51 00
+SE_THUNDERSTORM_STOP = 52 00
+SE_DOWNPOUR = 53 00
+SE_DOWNPOUR_STOP = 54 00
+SE_RAIN = 55 00
+SE_RAIN_STOP = 56 00
+SE_THUNDER = 57 00
+SE_THUNDER2 = 58 00
+SE_ELEVATOR = 59 00
+SE_LOW_HEALTH = 5A 00
+SE_EXP_MAX = 5B 00
+SE_ROULETTE_BALL = 5C 00
+SE_ROULETTE_BALL2 = 5D 00
+SE_TAILLOW_WING_FLAP = 5E 00
+SE_SHOP = 5F 00
+SE_CONTEST_HEART = 60 00
+SE_CONTEST_CURTAIN_RISE = 61 00
+SE_CONTEST_CURTAIN_FALL = 62 00
+SE_CONTEST_ICON_CHANGE = 63 00
+SE_CONTEST_ICON_CLEAR = 64 00
+SE_CONTEST_MONS_TURN = 65 00
+SE_SHINY = 66 00
+SE_INTRO_BLAST = 67 00
+SE_MUGSHOT = 68 00
+SE_APPLAUSE = 69 00
+SE_VEND = 6A 00
+SE_ORB = 6B 00
+SE_DEX_SCROLL = 6C 00
+SE_DEX_PAGE = 6D 00
+SE_POKENAV_ON = 6E 00
+SE_POKENAV_OFF = 6F 00
+SE_DEX_SEARCH = 70 00
+SE_EGG_HATCH = 71 00
+SE_BALL_TRAY_ENTER = 72 00
+SE_BALL_TRAY_BALL = 73 00
+SE_BALL_TRAY_EXIT = 74 00
+SE_GLASS_FLUTE = 75 00
+SE_M_THUNDERBOLT = 76 00
+SE_M_THUNDERBOLT2 = 77 00
+SE_M_HARDEN = 78 00
+SE_M_NIGHTMARE = 79 00
+SE_M_VITAL_THROW = 7A 00
+SE_M_VITAL_THROW2 = 7B 00
+SE_M_BUBBLE = 7C 00
+SE_M_BUBBLE2 = 7D 00
+SE_M_BUBBLE3 = 7E 00
+SE_M_RAIN_DANCE = 7F 00
+SE_M_CUT = 80 00
+SE_M_STRING_SHOT = 81 00
+SE_M_STRING_SHOT2 = 82 00
+SE_M_ROCK_THROW = 83 00
+SE_M_GUST = 84 00
+SE_M_GUST2 = 85 00
+SE_M_DOUBLE_SLAP = 86 00
+SE_M_DOUBLE_TEAM = 87 00
+SE_M_RAZOR_WIND = 88 00
+SE_M_ICY_WIND = 89 00
+SE_M_THUNDER_WAVE = 8A 00
+SE_M_COMET_PUNCH = 8B 00
+SE_M_MEGA_KICK = 8C 00
+SE_M_MEGA_KICK2 = 8D 00
+SE_M_CRABHAMMER = 8E 00
+SE_M_JUMP_KICK = 8F 00
+SE_M_FLAME_WHEEL = 90 00
+SE_M_FLAME_WHEEL2 = 91 00
+SE_M_FLAMETHROWER = 92 00
+SE_M_FIRE_PUNCH = 93 00
+SE_M_TOXIC = 94 00
+SE_M_SACRED_FIRE = 95 00
+SE_M_SACRED_FIRE2 = 96 00
+SE_M_EMBER = 97 00
+SE_M_TAKE_DOWN = 98 00
+SE_M_BLIZZARD = 99 00
+SE_M_BLIZZARD2 = 9A 00
+SE_M_SCRATCH = 9B 00
+SE_M_VICEGRIP = 9C 00
+SE_M_WING_ATTACK = 9D 00
+SE_M_FLY = 9E 00
+SE_M_SAND_ATTACK = 9F 00
+SE_M_RAZOR_WIND2 = A0 00
+SE_M_BITE = A1 00
+SE_M_HEADBUTT = A2 00
+SE_M_SURF = A3 00
+SE_M_HYDRO_PUMP = A4 00
+SE_M_WHIRLPOOL = A5 00
+SE_M_HORN_ATTACK = A6 00
+SE_M_TAIL_WHIP = A7 00
+SE_M_MIST = A8 00
+SE_M_POISON_POWDER = A9 00
+SE_M_BIND = AA 00
+SE_M_DRAGON_RAGE = AB 00
+SE_M_SING = AC 00
+SE_M_PERISH_SONG = AD 00
+SE_M_PAY_DAY = AE 00
+SE_M_DIG = AF 00
+SE_M_DIZZY_PUNCH = B0 00
+SE_M_SELF_DESTRUCT = B1 00
+SE_M_EXPLOSION = B2 00
+SE_M_ABSORB_2 = B3 00
+SE_M_ABSORB = B4 00
+SE_M_SCREECH = B5 00
+SE_M_BUBBLE_BEAM = B6 00
+SE_M_BUBBLE_BEAM2 = B7 00
+SE_M_SUPERSONIC = B8 00
+SE_M_BELLY_DRUM = B9 00
+SE_M_METRONOME = BA 00
+SE_M_BONEMERANG = BB 00
+SE_M_LICK = BC 00
+SE_M_PSYBEAM = BD 00
+SE_M_FAINT_ATTACK = BE 00
+SE_M_SWORDS_DANCE = BF 00
+SE_M_LEER = C0 00
+SE_M_SWAGGER = C1 00
+SE_M_SWAGGER2 = C2 00
+SE_M_HEAL_BELL = C3 00
+SE_M_CONFUSE_RAY = C4 00
+SE_M_SNORE = C5 00
+SE_M_BRICK_BREAK = C6 00
+SE_M_GIGA_DRAIN = C7 00
+SE_M_PSYBEAM2 = C8 00
+SE_M_SOLAR_BEAM = C9 00
+SE_M_PETAL_DANCE = CA 00
+SE_M_TELEPORT = CB 00
+SE_M_MINIMIZE = CC 00
+SE_M_SKETCH = CD 00
+SE_M_SWIFT = CE 00
+SE_M_REFLECT = CF 00
+SE_M_BARRIER = D0 00
+SE_M_DETECT = D1 00
+SE_M_LOCK_ON = D2 00
+SE_M_MOONLIGHT = D3 00
+SE_M_CHARM = D4 00
+SE_M_CHARGE = D5 00
+SE_M_STRENGTH = D6 00
+SE_M_HYPER_BEAM = D7 00
+SE_M_WATERFALL = D8 00
+SE_M_REVERSAL = D9 00
+SE_M_ACID_ARMOR = DA 00
+SE_M_SANDSTORM = DB 00
+SE_M_TRI_ATTACK = DC 00
+SE_M_TRI_ATTACK2 = DD 00
+SE_M_ENCORE = DE 00
+SE_M_ENCORE2 = DF 00
+SE_M_BATON_PASS = E0 00
+SE_M_MILK_DRINK = E1 00
+SE_M_ATTRACT = E2 00
+SE_M_ATTRACT2 = E3 00
+SE_M_MORNING_SUN = E4 00
+SE_M_FLATTER = E5 00
+SE_M_SAND_TOMB = E6 00
+SE_M_GRASSWHISTLE = E7 00
+SE_M_SPIT_UP = E8 00
+SE_M_DIVE = E9 00
+SE_M_EARTHQUAKE = EA 00
+SE_M_TWISTER = EB 00
+SE_M_SWEET_SCENT = EC 00
+SE_M_YAWN = ED 00
+SE_M_SKY_UPPERCUT = EE 00
+SE_M_STAT_INCREASE = EF 00
+SE_M_HEAT_WAVE = F0 00
+SE_M_UPROAR = F1 00
+SE_M_HAIL = F2 00
+SE_M_COSMIC_POWER = F3 00
+SE_M_TEETER_DANCE = F4 00
+SE_M_STAT_DECREASE = F5 00
+SE_M_HAZE = F6 00
+SE_M_HYPER_BEAM2 = F7 00
+SE_RG_DOOR = F8 00
+SE_RG_CARD_FLIP = F9 00
+SE_RG_CARD_FLIPPING = FA 00
+SE_RG_CARD_OPEN = FB 00
+SE_RG_BAG_CURSOR = FC 00
+SE_RG_BAG_POCKET = FD 00
+SE_RG_BALL_CLICK = FE 00
 SE_RG_SHOP = FF 00
-SE_RG_KITEKI = 00 01
-SE_RG_HELP_OP = 01 01
-SE_RG_HELP_CL = 02 01
-SE_RG_HELP_NG = 03 01
-SE_RG_DEOMOV = 04 01
-SE_RG_EXCELLENT = 05 01
-SE_RG_NAWAMISS = 06 01
-SE_TOREEYE = 07 01
-SE_TOREOFF = 08 01
-SE_HANTEI1 = 09 01
-SE_HANTEI2 = 0A 01
-SE_CURTAIN = 0B 01
-SE_CURTAIN1 = 0C 01
-SE_USSOKI = 0D 01
-MUS_TETSUJI = 5E 01
-MUS_FIELD13 = 5F 01
-MUS_KACHI22 = 60 01
-MUS_KACHI2 = 61 01
-MUS_KACHI3 = 62 01
-MUS_KACHI5 = 63 01
-MUS_PCC = 64 01
-MUS_NIBI = 65 01
-MUS_SUIKUN = 66 01
-MUS_DOORO1 = 67 01
-MUS_DOORO_X1 = 68 01
-MUS_DOORO_X3 = 69 01
-MUS_MACHI_S2 = 6A 01
-MUS_MACHI_S4 = 6B 01
-MUS_GIM = 6C 01
-MUS_NAMINORI = 6D 01
-MUS_DAN01 = 6E 01
-MUS_FANFA1 = 6F 01
-MUS_ME_ASA = 70 01
-MUS_ME_BACHI = 71 01
-MUS_FANFA4 = 72 01
-MUS_FANFA5 = 73 01
-MUS_ME_WAZA = 74 01
-MUS_BIJYUTU = 75 01
-MUS_DOORO_X4 = 76 01
-MUS_FUNE_KAN = 77 01
-MUS_ME_SHINKA = 78 01
-MUS_SHINKA = 79 01
-MUS_ME_WASURE = 7A 01
-MUS_SYOUJOEYE = 7B 01
-MUS_BOYEYE = 7C 01
-MUS_DAN02 = 7D 01
-MUS_MACHI_S3 = 7E 01
-MUS_ODAMAKI = 7F 01
-MUS_B_TOWER = 80 01
-MUS_SWIMEYE = 81 01
-MUS_DAN03 = 82 01
-MUS_ME_KINOMI = 83 01
-MUS_ME_TAMA = 84 01
-MUS_ME_B_BIG = 85 01
-MUS_ME_B_SMALL = 86 01
-MUS_ME_ZANNEN = 87 01
-MUS_BD_TIME = 88 01
-MUS_TEST1 = 89 01
-MUS_TEST2 = 8A 01
-MUS_TEST3 = 8B 01
-MUS_TEST4 = 8C 01
-MUS_TEST = 8D 01
-MUS_GOMACHI0 = 8E 01
-MUS_GOTOWN = 8F 01
-MUS_POKECEN = 90 01
-MUS_NEXTROAD = 91 01
-MUS_GRANROAD = 92 01
+SE_RG_SS_ANNE_HORN = 00 01
+SE_RG_HELP_OPEN = 01 01
+SE_RG_HELP_CLOSE = 02 01
+SE_RG_HELP_ERROR = 03 01
+SE_RG_DEOXYS_MOVE = 04 01
+SE_RG_POKE_JUMP_SUCCESS = 05 01
+SE_RG_POKE_JUMP_FAILURE = 06 01
+SE_POKENAV_CALL = 07 01
+SE_POKENAV_HANG_UP = 08 01
+SE_ARENA_TIMEUP1 = 09 01
+SE_ARENA_TIMEUP2 = 0A 01
+SE_PIKE_CURTAIN_CLOSE = 0B 01
+SE_PIKE_CURTAIN_OPEN = 0C 01
+SE_SUDOWOODO_SHAKE = 0D 01
+MUS_LITTLEROOT_TEST = 5E 01
+MUS_GSC_ROUTE38 = 5F 01
+MUS_CAUGHT = 60 01
+MUS_VICTORY_WILD = 61 01
+MUS_VICTORY_GYM_LEADER = 62 01
+MUS_VICTORY_LEAGUE = 63 01
+MUS_C_COMM_CENTER = 64 01
+MUS_GSC_PEWTER = 65 01
+MUS_C_VS_LEGEND_BEAST = 66 01
+MUS_ROUTE101 = 67 01
+MUS_ROUTE110 = 68 01
+MUS_ROUTE120 = 69 01
+MUS_PETALBURG = 6A 01
+MUS_OLDALE = 6B 01
+MUS_GYM = 6C 01
+MUS_SURF = 6D 01
+MUS_PETALBURG_WOODS = 6E 01
+MUS_LEVEL_UP = 6F 01
+MUS_HEAL = 70 01
+MUS_OBTAIN_BADGE = 71 01
+MUS_OBTAIN_ITEM = 72 01
+MUS_EVOLVED = 73 01
+MUS_OBTAIN_TMHM = 74 01
+MUS_LILYCOVE_MUSEUM = 75 01
+MUS_ROUTE122 = 76 01
+MUS_OCEANIC_MUSEUM = 77 01
+MUS_EVOLUTION_INTRO = 78 01
+MUS_EVOLUTION = 79 01
+MUS_MOVE_DELETED = 7A 01
+MUS_ENCOUNTER_GIRL = 7B 01
+MUS_ENCOUNTER_MALE = 7C 01
+MUS_ABANDONED_SHIP = 7D 01
+MUS_FORTREE = 7E 01
+MUS_BIRCH_LAB = 7F 01
+MUS_B_TOWER_RS = 80 01
+MUS_ENCOUNTER_SWIMMER = 81 01
+MUS_CAVE_OF_ORIGIN = 82 01
+MUS_OBTAIN_BERRY = 83 01
+MUS_AWAKEN_LEGEND = 84 01
+MUS_SLOTS_JACKPOT = 85 01
+MUS_SLOTS_WIN = 86 01
+MUS_TOO_BAD = 87 01
+MUS_ROULETTE = 88 01
+MUS_LINK_CONTEST_P1 = 89 01
+MUS_LINK_CONTEST_P2 = 8A 01
+MUS_LINK_CONTEST_P3 = 8B 01
+MUS_LINK_CONTEST_P4 = 8C 01
+MUS_ENCOUNTER_RICH = 8D 01
+MUS_VERDANTURF = 8E 01
+MUS_RUSTBORO = 8F 01
+MUS_POKE_CENTER = 90 01
+MUS_ROUTE104 = 91 01
+MUS_ROUTE119 = 92 01
 MUS_CYCLING = 93 01
-MUS_FRIENDLY = 94 01
-MUS_MISHIRO = 95 01
-MUS_TOZAN = 96 01
-MUS_GIRLEYE = 97 01
-MUS_MINAMO = 98 01
-MUS_ASHROAD = 99 01
-MUS_EVENT0 = 9A 01
-MUS_DEEPDEEP = 9B 01
-MUS_KACHI1 = 9C 01
-MUS_TITLE3 = 9D 01
-MUS_DEMO1 = 9E 01
-MUS_GIRL_SUP = 9F 01
-MUS_HAGESHII = A0 01
-MUS_KAKKOII = A1 01
-MUS_KAZANBAI = A2 01
-MUS_AQA_0 = A3 01
-MUS_TSURETEK = A4 01
-MUS_BOY_SUP = A5 01
-MUS_RAINBOW = A6 01
-MUS_AYASII = A7 01
-MUS_KACHI4 = A8 01
-MUS_ROPEWAY = A9 01
-MUS_CASINO = AA 01
-MUS_HIGHTOWN = AB 01
-MUS_SAFARI = AC 01
-MUS_C_ROAD = AD 01
-MUS_AJITO = AE 01
-MUS_M_BOAT = AF 01
-MUS_M_DUNGON = B0 01
-MUS_FINECITY = B1 01
-MUS_MACHUPI = B2 01
-MUS_P_SCHOOL = B3 01
-MUS_DENDOU = B4 01
-MUS_TONEKUSA = B5 01
-MUS_MABOROSI = B6 01
-MUS_CON_FAN = B7 01
-MUS_CONTEST0 = B8 01
-MUS_MGM0 = B9 01
-MUS_T_BATTLE = BA 01
-MUS_OOAME = BB 01
-MUS_HIDERI = BC 01
-MUS_RUNECITY = BD 01
-MUS_CON_K = BE 01
-MUS_EIKOU_R = BF 01
-MUS_KARAKURI = C0 01
-MUS_HUTAGO = C1 01
-MUS_SITENNOU = C2 01
-MUS_YAMA_EYE = C3 01
-MUS_CONLOBBY = C4 01
-MUS_INTER_V = C5 01
-MUS_DAIGO = C6 01
-MUS_THANKFOR = C7 01
+MUS_POKE_MART = 94 01
+MUS_LITTLEROOT = 95 01
+MUS_MT_CHIMNEY = 96 01
+MUS_ENCOUNTER_FEMALE = 97 01
+MUS_LILYCOVE = 98 01
+MUS_ROUTE111 = 99 01
+MUS_HELP = 9A 01
+MUS_UNDERWATER = 9B 01
+MUS_VICTORY_TRAINER = 9C 01
+MUS_TITLE = 9D 01
+MUS_INTRO = 9E 01
+MUS_ENCOUNTER_MAY = 9F 01
+MUS_ENCOUNTER_INTENSE = A0 01
+MUS_ENCOUNTER_COOL = A1 01
+MUS_ROUTE113 = A2 01
+MUS_ENCOUNTER_AQUA = A3 01
+MUS_FOLLOW_ME = A4 01
+MUS_ENCOUNTER_BRENDAN = A5 01
+MUS_EVER_GRANDE = A6 01
+MUS_ENCOUNTER_SUSPICIOUS = A7 01
+MUS_VICTORY_AQUA_MAGMA = A8 01
+MUS_CABLE_CAR = A9 01
+MUS_GAME_CORNER = AA 01
+MUS_DEWFORD = AB 01
+MUS_SAFARI_ZONE = AC 01
+MUS_VICTORY_ROAD = AD 01
+MUS_AQUA_MAGMA_HIDEOUT = AE 01
+MUS_SAILING = AF 01
+MUS_MT_PYRE = B0 01
+MUS_SLATEPORT = B1 01
+MUS_MT_PYRE_EXTERIOR = B2 01
+MUS_SCHOOL = B3 01
+MUS_HALL_OF_FAME = B4 01
+MUS_FALLARBOR = B5 01
+MUS_SEALED_CHAMBER = B6 01
+MUS_CONTEST_WINNER = B7 01
+MUS_CONTEST = B8 01
+MUS_ENCOUNTER_MAGMA = B9 01
+MUS_INTRO_BATTLE = BA 01
+MUS_ABNORMAL_WEATHER = BB 01
+MUS_WEATHER_GROUDON = BC 01
+MUS_SOOTOPOLIS = BD 01
+MUS_CONTEST_RESULTS = BE 01
+MUS_HALL_OF_FAME_ROOM = BF 01
+MUS_TRICK_HOUSE = C0 01
+MUS_ENCOUNTER_TWINS = C1 01
+MUS_ENCOUNTER_ELITE_FOUR = C2 01
+MUS_ENCOUNTER_HIKER = C3 01
+MUS_CONTEST_LOBBY = C4 01
+MUS_ENCOUNTER_INTERVIEWER = C5 01
+MUS_ENCOUNTER_CHAMPION = C6 01
+MUS_CREDITS = C7 01
 MUS_END = C8 01
 MUS_B_FRONTIER = C9 01
 MUS_B_ARENA = CA 01
-MUS_ME_POINTGET = CB 01
-MUS_ME_TORE_EYE = CC 01
-MUS_PYRAMID = CD 01
-MUS_PYRAMID_TOP = CE 01
+MUS_OBTAIN_B_POINTS = CB 01
+MUS_REGISTER_MATCH_CALL = CC 01
+MUS_B_PYRAMID = CD 01
+MUS_B_PYRAMID_TOP = CE 01
 MUS_B_PALACE = CF 01
-MUS_REKKUU_KOURIN = D0 01
-MUS_SATTOWER = D1 01
-MUS_ME_SYMBOLGET = D2 01
+MUS_RAYQUAZA_APPEARS = D0 01
+MUS_B_TOWER = D1 01
+MUS_OBTAIN_SYMBOL = D2 01
 MUS_B_DOME = D3 01
-MUS_B_TUBE = D4 01
+MUS_B_PIKE = D4 01
 MUS_B_FACTORY = D5 01
-MUS_VS_REKKU = D6 01
-MUS_VS_FRONT = D7 01
+MUS_VS_RAYQUAZA = D6 01
+MUS_VS_FRONTIER_BRAIN = D7 01
 MUS_VS_MEW = D8 01
-MUS_B_DOME1 = D9 01
-MUS_BATTLE27 = DA 01
-MUS_BATTLE31 = DB 01
-MUS_BATTLE20 = DC 01
-MUS_BATTLE32 = DD 01
-MUS_BATTLE33 = DE 01
-MUS_BATTLE36 = DF 01
-MUS_BATTLE34 = E0 01
-MUS_BATTLE35 = E1 01
-MUS_BATTLE38 = E2 01
-MUS_BATTLE30 = E3 01
-MUS_RG_ANNAI = E4 01
-MUS_RG_SLOT = E5 01
-MUS_RG_AJITO = E6 01
+MUS_B_DOME_LOBBY = D9 01
+MUS_VS_WILD = DA 01
+MUS_VS_AQUA_MAGMA = DB 01
+MUS_VS_TRAINER = DC 01
+MUS_VS_GYM_LEADER = DD 01
+MUS_VS_CHAMPION = DE 01
+MUS_VS_REGI = DF 01
+MUS_VS_KYOGRE_GROUDON = E0 01
+MUS_VS_RIVAL = E1 01
+MUS_VS_ELITE_FOUR = E2 01
+MUS_VS_AQUA_MAGMA_LEADER = E3 01
+MUS_RG_FOLLOW_ME = E4 01
+MUS_RG_GAME_CORNER = E5 01
+MUS_RG_ROCKET_HIDEOUT = E6 01
 MUS_RG_GYM = E7 01
-MUS_RG_PURIN = E8 01
-MUS_RG_DEMO = E9 01
+MUS_RG_JIGGLYPUFF = E8 01
+MUS_RG_INTRO_FIGHT = E9 01
 MUS_RG_TITLE = EA 01
-MUS_RG_GUREN = EB 01
-MUS_RG_SHION = EC 01
-MUS_RG_KAIHUKU = ED 01
+MUS_RG_CINNABAR = EB 01
+MUS_RG_LAVENDER = EC 01
+MUS_RG_HEAL = ED 01
 MUS_RG_CYCLING = EE 01
-MUS_RG_ROCKET = EF 01
-MUS_RG_SHOUJO = F0 01
-MUS_RG_SHOUNEN = F1 01
-MUS_RG_DENDOU = F2 01
-MUS_RG_T_MORI = F3 01
-MUS_RG_OTSUKIMI = F4 01
-MUS_RG_POKEYASHI = F5 01
-MUS_RG_ENDING = F6 01
-MUS_RG_LOAD01 = F7 01
-MUS_RG_OPENING = F8 01
-MUS_RG_LOAD02 = F9 01
-MUS_RG_LOAD03 = FA 01
-MUS_RG_CHAMP_R = FB 01
-MUS_RG_VS_GYM = FC 01
-MUS_RG_VS_TORE = FD 01
-MUS_RG_VS_YASEI = FE 01
-MUS_RG_VS_LAST = FF 01
-MUS_RG_MASARA = 00 02
-MUS_RG_KENKYU = 01 02
-MUS_RG_OHKIDO = 02 02
-MUS_RG_POKECEN = 03 02
-MUS_RG_SANTOAN = 04 02
-MUS_RG_NAMINORI = 05 02
-MUS_RG_P_TOWER = 06 02
-MUS_RG_SHIRUHU = 07 02
-MUS_RG_HANADA = 08 02
-MUS_RG_TAMAMUSI = 09 02
-MUS_RG_WIN_TRE = 0A 02
-MUS_RG_WIN_YASEI = 0B 02
-MUS_RG_WIN_GYM = 0C 02
-MUS_RG_KUCHIBA = 0D 02
-MUS_RG_NIBI = 0E 02
-MUS_RG_RIVAL1 = 0F 02
-MUS_RG_RIVAL2 = 10 02
-MUS_RG_FAN2 = 11 02
-MUS_RG_FAN5 = 12 02
-MUS_RG_FAN6 = 13 02
-MUS_ME_RG_PHOTO = 14 02
-MUS_RG_TITLEROG = 15 02
-MUS_RG_GET_YASEI = 16 02
-MUS_RG_SOUSA = 17 02
-MUS_RG_SEKAIKAN = 18 02
-MUS_RG_SEIBETU = 19 02
-MUS_RG_JUMP = 1A 02
-MUS_RG_UNION = 1B 02
-MUS_RG_NETWORK = 1C 02
-MUS_RG_OKURIMONO = 1D 02
-MUS_RG_KINOMIKUI = 1E 02
-MUS_RG_NANADUNGEON = 1F 02
-MUS_RG_OSHIE_TV = 20 02
-MUS_RG_NANASHIMA = 21 02
-MUS_RG_NANAISEKI = 22 02
-MUS_RG_NANA123 = 23 02
-MUS_RG_NANA45 = 24 02
-MUS_RG_NANA67 = 25 02
-MUS_RG_POKEFUE = 26 02
-MUS_RG_VS_DEO = 27 02
-MUS_RG_VS_MYU2 = 28 02
-MUS_RG_VS_DEN = 29 02
-MUS_RG_EXEYE = 2A 02
-MUS_RG_DEOEYE = 2B 02
-MUS_RG_T_TOWER = 2C 02
-MUS_RG_SLOWMASARA = 2D 02
-MUS_RG_TVNOIZE = 2E 02
+MUS_RG_ENCOUNTER_ROCKET = EF 01
+MUS_RG_ENCOUNTER_GIRL = F0 01
+MUS_RG_ENCOUNTER_BOY = F1 01
+MUS_RG_HALL_OF_FAME = F2 01
+MUS_RG_VIRIDIAN_FOREST = F3 01
+MUS_RG_MT_MOON = F4 01
+MUS_RG_POKE_MANSION = F5 01
+MUS_RG_CREDITS = F6 01
+MUS_RG_ROUTE1 = F7 01
+MUS_RG_ROUTE24 = F8 01
+MUS_RG_ROUTE3 = F9 01
+MUS_RG_ROUTE11 = FA 01
+MUS_RG_VICTORY_ROAD = FB 01
+MUS_RG_VS_GYM_LEADER = FC 01
+MUS_RG_VS_TRAINER = FD 01
+MUS_RG_VS_WILD = FE 01
+MUS_RG_VS_CHAMPION = FF 01
+MUS_RG_PALLET = 00 02
+MUS_RG_OAK_LAB = 01 02
+MUS_RG_OAK = 02 02
+MUS_RG_POKE_CENTER = 03 02
+MUS_RG_SS_ANNE = 04 02
+MUS_RG_SURF = 05 02
+MUS_RG_POKE_TOWER = 06 02
+MUS_RG_SILPH = 07 02
+MUS_RG_FUCHSIA = 08 02
+MUS_RG_CELADON = 09 02
+MUS_RG_VICTORY_TRAINER = 0A 02
+MUS_RG_VICTORY_WILD = 0B 02
+MUS_RG_VICTORY_GYM_LEADER = 0C 02
+MUS_RG_VERMILLION = 0D 02
+MUS_RG_PEWTER = 0E 02
+MUS_RG_ENCOUNTER_RIVAL = 0F 02
+MUS_RG_RIVAL_EXIT = 10 02
+MUS_RG_DEX_RATING = 11 02
+MUS_RG_OBTAIN_KEY_ITEM = 12 02
+MUS_RG_CAUGHT_INTRO = 13 02
+MUS_RG_PHOTO = 14 02
+MUS_RG_GAME_FREAK = 15 02
+MUS_RG_CAUGHT = 16 02
+MUS_RG_NEW_GAME_INSTRUCT = 17 02
+MUS_RG_NEW_GAME_INTRO = 18 02
+MUS_RG_NEW_GAME_EXIT = 19 02
+MUS_RG_POKE_JUMP = 1A 02
+MUS_RG_UNION_ROOM = 1B 02
+MUS_RG_NET_CENTER = 1C 02
+MUS_RG_MYSTERY_GIFT = 1D 02
+MUS_RG_BERRY_PICK = 1E 02
+MUS_RG_SEVII_CAVE = 1F 02
+MUS_RG_TEACHY_TV_SHOW = 20 02
+MUS_RG_SEVII_ROUTE = 21 02
+MUS_RG_SEVII_DUNGEON = 22 02
+MUS_RG_SEVII_123 = 23 02
+MUS_RG_SEVII_45 = 24 02
+MUS_RG_SEVII_67 = 25 02
+MUS_RG_POKE_FLUTE = 26 02
+MUS_RG_VS_DEOXYS = 27 02
+MUS_RG_VS_MEWTWO = 28 02
+MUS_RG_VS_LEGEND = 29 02
+MUS_RG_ENCOUNTER_GYM_LEADER = 2A 02
+MUS_RG_ENCOUNTER_DEOXYS = 2B 02
+MUS_RG_TRAINER_TOWER = 2C 02
+MUS_RG_SLOW_PALLET = 2D 02
+MUS_RG_TEACHY_TV_MENU = 2E 02
 PH_TRAP_BLEND = 2F 02
 PH_TRAP_HELD = 30 02
 PH_TRAP_SOLO = 31 02
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index cacb1c443..89da7b9a5 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -426,7 +426,7 @@ Move_POUND:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
@@ -441,7 +441,7 @@ Move_DOUBLE_SLAP:
 	choosetwoturnanim DoubleSlapLeft, DoubleSlapRight
 DoubleSlapContinue:
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -456,7 +456,7 @@ DoubleSlapRight:
 Move_POISON_POWDER:
 	loadspritegfx ANIM_TAG_POISON_POWDER
 	loadspritegfx ANIM_TAG_POISON_BUBBLE
-	loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6
+	loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6
 	createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1
 	createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1
 	createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3
@@ -480,7 +480,7 @@ Move_POISON_POWDER:
 
 Move_STUN_SPORE:
 	loadspritegfx ANIM_TAG_STUN_SPORE
-	loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6
+	loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6
 	createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1
 	createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1
 	createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3
@@ -504,7 +504,7 @@ Move_STUN_SPORE:
 
 Move_SLEEP_POWDER:
 	loadspritegfx ANIM_TAG_SLEEP_POWDER
-	loopsewithpan SE_W077, SOUND_PAN_TARGET, 10, 6
+	loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 10, 6
 	createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1
 	createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1
 	createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3
@@ -531,21 +531,21 @@ Move_SWIFT:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W129, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
 	createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1
 	delay 5
-	playsewithpan SE_W129, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
 	createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 5, 22, -18, 1
 	delay 5
-	playsewithpan SE_W129, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
 	createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, -10, 22, 15, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 18, 1
 	delay 5
-	playsewithpan SE_W129, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
 	createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1
 	delay 5
-	playsewithpan SE_W129, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
 	createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 12, 1
 	delay 5
 	waitforvisualfinish
@@ -557,20 +557,20 @@ Move_STRENGTH:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeAndSinkMon, 5, ANIM_ATTACKER, 2, 0, 96, 30
 	waitforvisualfinish
 	delay 10
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 4
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 18, 6, 2, 4
 	delay 4
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 16, 12, ANIM_TARGET, 1
 	delay 4
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, -12, ANIM_TARGET, 1
 	delay 4
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 3, 4, ANIM_TARGET, 1
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
@@ -587,7 +587,7 @@ Move_TACKLE:
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -597,14 +597,14 @@ Move_BODY_SLAM:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER
 	waitforvisualfinish
 	delay 11
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, ANIM_TARGET, 0
-	loopsewithpan SE_W025B, SOUND_PAN_TARGET, 10, 2
+	loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 10, 2
 	delay 1
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3
 	waitforvisualfinish
@@ -636,7 +636,7 @@ Move_SUPERSONIC:
 	blendoff
 	end
 SupersonicRing:
-	playsewithpan SE_W048, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
 	createsprite gSupersonicRingSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0
 	delay 2
 	return
@@ -651,7 +651,7 @@ Move_SCREECH:
 	waitforvisualfinish
 	end
 ScreechRing:
-	playsewithpan SE_W103, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SCREECH, SOUND_PAN_ATTACKER
 	createsprite gScreechRingSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0
 	delay 2
 	return
@@ -661,31 +661,31 @@ Move_FLAME_WHEEL:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
 	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
-	playsewithpan SE_W172, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
 	delay 2
 	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
-	playsewithpan SE_W172, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
 	delay 2
 	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
-	playsewithpan SE_W172, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
 	delay 2
 	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
-	playsewithpan SE_W172, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
 	delay 2
 	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
-	playsewithpan SE_W172, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
 	delay 2
 	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
-	playsewithpan SE_W172, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
 	delay 2
 	createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
-	playsewithpan SE_W172, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 6
 	delay 4
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 8, 1
 	createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1
-	playsewithpan SE_W172B, SOUND_PAN_TARGET
+	playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET
 	call FireSpreadEffect
 	delay 7
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9
@@ -704,22 +704,22 @@ Move_PIN_MISSILE:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W026, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
 	createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -8, -8, 20, -32
 	delay 15
 	createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 8, 8, 20, -40
 	delay 4
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	delay 9
 	createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32
 	delay 4
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	delay 14
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	waitforvisualfinish
@@ -733,22 +733,22 @@ Move_ICICLE_SPEAR:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W196, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER
 	createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -8, -8, 20, -32
 	delay 15
 	createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 8, 8, 20, -40
 	delay 4
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	delay 9
 	createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32
 	delay 4
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	delay 14
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 2, 1
 	waitforvisualfinish
@@ -764,7 +764,7 @@ Move_TAKE_DOWN:
 	delay 35
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, ANIM_TARGET, 0
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	delay 1
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 0, 0, 4
 	waitforvisualfinish
@@ -781,19 +781,19 @@ Move_TAKE_DOWN:
 
 Move_DOUBLE_EDGE:
 	loadspritegfx ANIM_TAG_IMPACT
-	playsewithpan SE_W129, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0
 	waitforvisualfinish
 	delay 10
-	playsewithpan SE_W207, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W207, SOUND_PAN_ATTACKER, 8
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 16, 16, RGB_WHITE
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4
 	delay 3
 	waitforvisualfinish
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3
 	waitforvisualfinish
@@ -819,12 +819,12 @@ Move_POISON_STING:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
 	createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 0, -8, 0, 20
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	waitforvisualfinish
 	call PoisonBubblesEffect
 	waitforvisualfinish
@@ -838,13 +838,13 @@ Move_TWINEEDLE:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 6, 2
+	loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 6, 2
 	createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 10, -4, 0, -4, 20
 	createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 12, 10, 12, 20
 	delay 20
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 5, 1
 	createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 1, 3
-	loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 2
+	loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 5, 2
 	delay 1
 	createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 10, 12, 1, 3
 	waitforvisualfinish
@@ -854,7 +854,7 @@ Move_TWINEEDLE:
 
 Move_FIRE_BLAST:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
-	createsoundtask sub_8158B30, SE_W172, SE_W172B
+	createsoundtask sub_8158B30, SE_M_FLAME_WHEEL, SE_M_FLAME_WHEEL2
 	call FireBlastRing
 	call FireBlastRing
 	call FireBlastRing
@@ -902,29 +902,29 @@ FireBlastCross:
 
 Move_LEECH_SEED:
 	loadspritegfx ANIM_TAG_SEED
-	playsewithpan SE_W077, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER
 	createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32
 	delay 8
-	playsewithpan SE_W077, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER
 	createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, -16, 24, 35, -40
 	delay 8
-	playsewithpan SE_W077, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER
 	createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 16, 24, 35, -37
 	delay 12
-	loopsewithpan SE_W039, SOUND_PAN_TARGET, 10, 8
+	loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 10, 8
 	waitforvisualfinish
 	end
 
 Move_EMBER:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
-	loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 5, 2
+	loopsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 5, 2
 	createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1
 	delay 4
 	createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 20, 1
 	delay 4
 	createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 16, 24, 20, 1
 	delay 16
-	playsewithpan SE_W172, SOUND_PAN_TARGET
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET
 	call EmberFireHit
 	call EmberFireHit
 	call EmberFireHit
@@ -942,7 +942,7 @@ Move_MEGA_PUNCH:
 	delay 2
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK
 	setalpha 12, 8
-	playsewithpan SE_W025, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET
 	createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 50
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 7, RGB_WHITE
 	delay 50
@@ -951,7 +951,7 @@ Move_MEGA_PUNCH:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 0, RGB_WHITE
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -985,11 +985,11 @@ Move_MEGA_KICK:
 	delay 2
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, RGB_BLACK
 	setalpha 12, 8
-	playsewithpan SE_W025, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET
 	createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 50
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 7, RGB_WHITE
 	delay 50
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	call SetImpactBackground
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1
@@ -1011,7 +1011,7 @@ Move_COMET_PUNCH:
 	choosetwoturnanim CometPunchLeft, CometPunchRight
 CometPunchContinue:
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -1041,7 +1041,7 @@ Move_SONIC_BOOM:
 	blendoff
 	end
 SonicBoomProjectile:
-	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
 	createsprite gSonicBoomSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 15
 	delay 4
 	return
@@ -1057,7 +1057,7 @@ Move_THUNDER_SHOCK:
 	waitforvisualfinish
 	delay 10
 	createvisualtask AnimTask_ElectricBolt, 5, 0, -44, 0
-	playsewithpan SE_W085, SOUND_PAN_TARGET
+	playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET
 	delay 9
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 0, 13, RGB_BLACK
 	waitforvisualfinish
@@ -1079,13 +1079,13 @@ Move_THUNDERBOLT:
 	waitforvisualfinish
 	delay 10
 	createvisualtask AnimTask_ElectricBolt, 5, 24, -52, 0
-	playsewithpan SE_W085, SOUND_PAN_TARGET
+	playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET
 	delay 7
 	createvisualtask AnimTask_ElectricBolt, 5, -24, -52, 0
-	playsewithpan SE_W085, SOUND_PAN_TARGET
+	playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET
 	delay 7
 	createvisualtask AnimTask_ElectricBolt, 5, 0, -60, 1
-	playsewithpan SE_W085, SOUND_PAN_TARGET
+	playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET
 	delay 9
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 0, 13, RGB_BLACK
 	waitforvisualfinish
@@ -1101,7 +1101,7 @@ Move_THUNDERBOLT:
 	createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765
 	createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765
 	createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765
-	playsewithpan SE_W063, SOUND_PAN_TARGET
+	playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET
 	delay 0
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 2, 2, RGB_BLACK
 	delay 6
@@ -1112,7 +1112,7 @@ Move_THUNDERBOLT:
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 6, 6, RGB_BLACK
 	waitforvisualfinish
 	delay 20
-	waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19
+	waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19
 	call ElectricityEffect
 	waitforvisualfinish
 	delay 20
@@ -1128,9 +1128,9 @@ Move_THUNDER_WAVE:
 	waitforvisualfinish
 	delay 10
 	createvisualtask AnimTask_ElectricBolt, 5, 0, -48, 0
-	playsewithpan SE_W086, SOUND_PAN_TARGET
+	playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
 	delay 20
-	loopsewithpan SE_W085B, SOUND_PAN_TARGET, 10, 4
+	loopsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 10, 4
 	createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, -16
 	delay 4
 	createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 0
@@ -1156,23 +1156,23 @@ BeatUpLeft:
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -20, -20, ANIM_TARGET, 2
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -20, -12, 8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 8, 0, ANIM_TARGET, 2
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 8, 8, 8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	goto BeatUpContinue
 BeatUpRight:
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -20, ANIM_TARGET, 2
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 12, -12, 8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 0, ANIM_TARGET, 2
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -12, 8, 8, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	goto BeatUpContinue
 
 Move_STOMP:
@@ -1180,19 +1180,19 @@ Move_STOMP:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W104, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
 	createsprite gStompFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -32, 15
 	delay 19
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -8, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_TAIL_WHIP:
-	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 3
+	loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 24, 3
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 3
 	waitforvisualfinish
 	end
@@ -1201,7 +1201,7 @@ Move_CUT:
 	loadspritegfx ANIM_TAG_CUT
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W015, SOUND_PAN_TARGET
+	playsewithpan SE_M_CUT, SOUND_PAN_TARGET
 	createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0
 	delay 5
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
@@ -1213,14 +1213,14 @@ Move_CUT:
 
 Move_HIDDEN_POWER:
 	loadspritegfx ANIM_TAG_RED_ORB
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
 	waitforvisualfinish
 	delay 30
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 31, 19), 12, 5, 1
 	delay 4
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
-	playsewithpan SE_W179, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
 	createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0
 	createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42
 	createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84
@@ -1229,7 +1229,7 @@ Move_HIDDEN_POWER:
 	createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210
 	delay 52
 	setarg 7, 0xFFFF
-	playsewithpan SE_W115, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, ANIM_ATTACKER, 0
 	createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 0
 	createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 32
@@ -1245,13 +1245,13 @@ Move_REVERSAL:
 	loadspritegfx ANIM_TAG_BLUE_ORB
 	loadspritegfx ANIM_TAG_HANDS_AND_FEET
 	loadspritegfx ANIM_TAG_IMPACT
-	playsewithpan SE_W197, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0
 	waitforvisualfinish
 	delay 30
 	createvisualtask AnimTask_BlendColorCycle, 2, 31, 3, 2, 0, 10, RGB_WHITE
 	delay 10
-	playsewithpan SE_W179, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
 	createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0
 	createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42
 	createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84
@@ -1262,7 +1262,7 @@ Move_REVERSAL:
 	delay 20
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
 	delay 8
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 10, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
@@ -1286,12 +1286,12 @@ PursuitContinue:
 	waitbgfadein
 	end
 PursuitNormal:
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 6, 1, 0
 	goto PursuitContinue
 PursuitOnSwitchout:
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 6, 1, 0
 	goto PursuitContinue
@@ -1304,7 +1304,7 @@ Move_SPIKE_CANNON:
 	setalpha 12, 8
 	createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -4, 0, 4, 6, 8, 4
 	waitforvisualfinish
-	loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 5, 3
+	loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 5, 3
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
 	createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 10, -8, -8, -8, 20
 	createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 0, 0, 20
@@ -1314,7 +1314,7 @@ Move_SPIKE_CANNON:
 	createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2
 	createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 7, 1
-	loopsewithpan SE_W030, SOUND_PAN_TARGET, 5, 3
+	loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 5, 3
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -1324,7 +1324,7 @@ Move_SWORDS_DANCE:
 	loadspritegfx ANIM_TAG_SWORD
 	monbg ANIM_ATTACKER
 	setalpha 12, 8
-	playsewithpan SE_W014, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWORDS_DANCE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4
 	createsprite gSwordsDanceBladeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0
 	delay 22
@@ -1340,12 +1340,12 @@ Move_PSYCH_UP:
 	monbg ANIM_ATK_PARTNER
 	createvisualtask AnimTask_BlendColorCycleExclude, 2, 1, 2, 6, 1, 11, RGB_BLACK
 	setalpha 12, 8
-	loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 5, 10
+	loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 5, 10
 	createsprite gPsychUpSpiralSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0
 	createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, ANIM_ATTACKER
 	delay 127
 	delay 4
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1
 	createvisualtask AnimTask_BlendBattleAnimPal, 9, 2, 2, 10, 0, RGB_YELLOW
 	delay 30
@@ -1363,7 +1363,7 @@ Move_DIZZY_PUNCH:
 	call DizzyPunchLunge
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, 16, 8, 20, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 16, 0, ANIM_TARGET, 1
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, 160, -32
 	createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, -256, -40
 	createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, 128, -16
@@ -1374,7 +1374,7 @@ Move_DIZZY_PUNCH:
 	call DizzyPunchLunge
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, -16, -8, 20, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -16, -16, ANIM_TARGET, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, 160, -32
 	createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, -256, -40
 	createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, 128, -16
@@ -1393,7 +1393,7 @@ DizzyPunchLunge:
 
 Move_FIRE_SPIN:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
-	playsewithpan SE_W221B, SOUND_PAN_TARGET
+	playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 47, 1
 	call FireSpinEffect
 	call FireSpinEffect
@@ -1420,7 +1420,7 @@ Move_FURY_CUTTER:
 	loadspritegfx ANIM_TAG_CUT
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createvisualtask AnimTask_IsFuryCutterHitRight, 2
 	jumpretfalse FuryCutterLeft
 	goto FuryCutterRight
@@ -1468,19 +1468,19 @@ Move_SELF_DESTRUCT:
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 9, 0, RGB_RED
 	end
 SelfDestructExplode:
-	playsewithpan SE_W120, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_ATTACKER
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1
 	delay 6
 	return
@@ -1490,12 +1490,12 @@ Move_SLAM:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W004, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_ATTACKER
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 3, 0, 4
 	delay 1
 	createsprite gSlamHitSpriteTemplate, ANIM_ATTACKER, 2, 0, 0
 	delay 3
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
@@ -1511,10 +1511,10 @@ Move_SLAM:
 
 Move_VINE_WHIP:
 	loadspritegfx ANIM_TAG_WHIP_HIT
-	playsewithpan SE_W026, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
 	delay 6
-	playsewithpan SE_W010, SOUND_PAN_TARGET
+	playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET
 	createsprite gVineWhipSpriteTemplate, ANIM_TARGET, 2, 0, 0
 	delay 6
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 1
@@ -1524,12 +1524,12 @@ Move_DRILL_PECK:
 	loadspritegfx ANIM_TAG_IMPACT
 	loadspritegfx ANIM_TAG_WHIRLWIND_LINES
 	createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0
-	playsewithpan SE_W029, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 2
 	createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1
 	delay 2
-	loopsewithpan SE_W030, SOUND_PAN_TARGET, 4, 8
+	loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 4, 8
 	createvisualtask AnimTask_DrillPeckHitSplats, 5
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1
 	waitforvisualfinish
@@ -1547,28 +1547,28 @@ Move_WATERFALL:
 	setalpha 12, 8
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 23, 1
 	delay 5
-	playsewithpan SE_W152, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
 	createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 25, ANIM_ATTACKER
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
 	createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 25, ANIM_ATTACKER
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
 	createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 20, 10, 25, ANIM_ATTACKER
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
 	createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 25, ANIM_ATTACKER
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
 	createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -10, 15, 25, ANIM_ATTACKER
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
 	createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 25, 20, 25, ANIM_ATTACKER
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
 	createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -20, 20, 25, ANIM_ATTACKER
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
 	createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 12, 0, 25, ANIM_ATTACKER
 	waitforvisualfinish
 	delay 10
@@ -1581,7 +1581,7 @@ Move_WATERFALL:
 	end
 
 RisingWaterHitEffect:
-	playsewithpan SE_W127, SOUND_PAN_TARGET
+	playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 17, 1
 	createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, ANIM_TARGET, 1
 	createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0, 20
@@ -1636,26 +1636,26 @@ Move_EXPLOSION:
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 16, 0, RGB_WHITE
 	end
 Explosion1:
-	playsewithpan SE_W153, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1
 	delay 6
-	playsewithpan SE_W153, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1
 	delay 6
-	playsewithpan SE_W153, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1
 	delay 6
-	playsewithpan SE_W153, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1
 	delay 6
-	playsewithpan SE_W153, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1
 	delay 6
 	return
 
 Move_DEFENSE_CURL:
 	loadspritegfx ANIM_TAG_ECLIPSING_ORB
-	loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3
+	loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3
 	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
 	createvisualtask AnimTask_DefenseCurlDeformMon, 5
 	waitforvisualfinish
@@ -1669,7 +1669,7 @@ Move_PROTECT:
 	loadspritegfx ANIM_TAG_PROTECT
 	monbg ANIM_ATK_PARTNER
 	monbgprio_28 ANIM_ATTACKER
-	waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 16
+	waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 16
 	createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -1681,7 +1681,7 @@ Move_DETECT:
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 0, 9, RGB_WHITE
 	delay 18
-	playsewithpan SE_W197, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
 	createsprite gSpinningSparkleSpriteTemplate, ANIM_ATTACKER, 13, 20, -20
 	waitforvisualfinish
 	delay 10
@@ -1706,15 +1706,15 @@ Frustration_Continue:
 	blendoff
 	end
 Frustration_Strongest:
-	playsewithpan SE_W082, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, 31
 	waitforvisualfinish
 	delay 20
-	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER
 	createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28
 	waitforvisualfinish
-	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER
 	createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28
 	waitforvisualfinish
 	delay 10
@@ -1722,65 +1722,65 @@ Frustration_Strongest:
 	delay 5
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 30, 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 0
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 24, 8, ANIM_TARGET, 0
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -24, -16, ANIM_TARGET, 0
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 4, ANIM_TARGET, 0
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, 19, ANIM_TARGET, 0
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, -18, ANIM_TARGET, 0
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, 31
 	goto Frustration_Continue
 Frustration_Strong:
-	playsewithpan SE_W082, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER, 1, 0, 15, 1
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 0, 9, 31
 	waitforvisualfinish
 	delay 20
-	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER
 	createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28
 	waitforvisualfinish
 	delay 5
 	createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5
 	delay 7
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1
 	delay 14
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 12, -6, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1
 	delay 14
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, -6, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 6, 1
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 3, 9, 0, 31
 	goto Frustration_Continue
 Frustration_Medium:
-	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER
 	createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28
 	waitforvisualfinish
 	delay 5
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4
 	delay 6
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 4, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4
 	delay 6
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -4, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
 	goto Frustration_Continue
@@ -1790,7 +1790,7 @@ Frustration_Weak:
 	delay 10
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2
 	delay 12
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1
 	goto Frustration_Continue
@@ -1799,14 +1799,14 @@ Move_SAFEGUARD:
 	loadspritegfx ANIM_TAG_GUARD_RING
 	monbg ANIM_ATK_PARTNER
 	setalpha 8, 8
-	playsewithpan SE_W208, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER
 	createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2
 	delay 4
 	createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2
 	delay 4
 	createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2
 	waitforvisualfinish
-	playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER
+	playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_BlendColorCycle, 2, 10, 0, 2, 0, 10, RGB_WHITE
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -1818,21 +1818,21 @@ Move_PAIN_SPLIT:
 	createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, ANIM_ATTACKER
 	createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, ANIM_TARGET
 	delay 10
-	playsewithpan SE_W207B, 0
+	playsewithpan SE_M_SWAGGER2, 0
 	createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 0
 	createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 0
 	waitforvisualfinish
 	createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -24, -42, ANIM_ATTACKER
 	createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -24, -42, ANIM_TARGET
 	delay 10
-	playsewithpan SE_W207B, 0
+	playsewithpan SE_M_SWAGGER2, 0
 	createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 1
 	createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 1
 	waitforvisualfinish
 	createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, 8, -42, ANIM_ATTACKER
 	createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, 8, -42, ANIM_TARGET
 	delay 10
-	playsewithpan SE_W207B, 0
+	playsewithpan SE_M_SWAGGER2, 0
 	createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 2
 	createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 2
 	end
@@ -1842,7 +1842,7 @@ Move_VICE_GRIP:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W011, SOUND_PAN_TARGET
+	playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET
 	createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 0
 	createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 1
 	delay 9
@@ -1860,7 +1860,7 @@ Move_GUILLOTINE:
 	setalpha 12, 8
 	fadetobgfromset BG_GUILLOTINE_OPPONENT, BG_GUILLOTINE_PLAYER, BG_GUILLOTINE_CONTESTS
 	waitbgfadein
-	playsewithpan SE_W011, SOUND_PAN_TARGET
+	playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET
 	createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 0
 	createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 1
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 16, RGB_BLACK
@@ -1870,7 +1870,7 @@ Move_GUILLOTINE:
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 8, 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 0
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 8, 0, 0
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -1884,10 +1884,10 @@ Move_PAY_DAY:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
 	createsprite gCoinThrowSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 1152
 	waitforvisualfinish
-	playsewithpan SE_W006, SOUND_PAN_TARGET
+	playsewithpan SE_M_PAY_DAY, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, ANIM_TARGET, 2
 	createsprite gFallingCoinSpriteTemplate, ANIM_ATTACKER, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 6, 1
@@ -1898,7 +1898,7 @@ Move_PAY_DAY:
 
 Move_OUTRAGE:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
-	loopsewithpan SE_W082, SOUND_PAN_ATTACKER, 8, 3
+	loopsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER, 8, 3
 	createvisualtask AnimTask_BlendColorCycle, 2, 7, 2, 5, 3, 8, RGB(14, 13, 0)
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 5, 4
 	delay 0
@@ -1946,7 +1946,7 @@ Move_SPARK:
 	loadspritegfx ANIM_TAG_SPARK_2
 	delay 0
 	createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22)
-	playsewithpan SE_W085B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
 	createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 24, 190, 12, ANIM_ATTACKER, 1, 0
 	delay 0
 	createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 24, 22, 12, ANIM_ATTACKER, 1, 0
@@ -1955,7 +1955,7 @@ Move_SPARK:
 	createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22)
 	delay 10
 	createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 5, 5, RGB(31, 31, 22)
-	playsewithpan SE_W085B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
 	createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 24, 60, 10, ANIM_ATTACKER, 1, 0
 	createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 24, 42, 11, ANIM_ATTACKER, 1, 1
 	delay 0
@@ -1964,7 +1964,7 @@ Move_SPARK:
 	createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22)
 	delay 20
 	createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 7, 7, RGB(31, 31, 22)
-	playsewithpan SE_W085B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
 	createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0
 	createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0
 	createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0
@@ -1978,7 +1978,7 @@ Move_SPARK:
 	createvisualtask AnimTask_BlendColorCycle, 2, 3, -31, 1, 0, 0, RGB(31, 31, 22)
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4
 	delay 4
-	playsewithpan SE_W063, SOUND_PAN_TARGET
+	playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
@@ -1989,12 +1989,12 @@ Move_SPARK:
 
 Move_ATTRACT:
 	loadspritegfx ANIM_TAG_RED_HEART
-	loopsewithpan SE_W204, SOUND_PAN_ATTACKER, 12, 3
+	loopsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER, 12, 3
 	createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER
 	delay 15
 	createsprite gRedHeartProjectileSpriteTemplate, ANIM_TARGET, 3, 20, -8
 	waitforvisualfinish
-	playsewithpan SE_W213, SOUND_PAN_TARGET
+	playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET
 	createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -32
 	createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -40
 	createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -16
@@ -2002,7 +2002,7 @@ Move_ATTRACT:
 	createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -128, -22
 	createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31
 	waitforvisualfinish
-	waitplaysewithpan SE_W213B, 0, 15
+	waitplaysewithpan SE_M_ATTRACT2, 0, 15
 	createvisualtask AnimTask_HeartsBackground, 5
 	createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 16, 256, 0
 	createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 224, 240, 15
@@ -2024,7 +2024,7 @@ Move_GROWTH:
 	end
 GrowthEffect:
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 8, RGB_WHITE
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, ANIM_ATTACKER, 0
 	return
 
@@ -2037,12 +2037,12 @@ Move_WHIRLWIND:
 	createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, ANIM_TARGET, 60, 4
 	createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, ANIM_TARGET, 60, 0
 	delay 5
-	loopsewithpan SE_W104, SOUND_PAN_TARGET, 10, 4
+	loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET, 10, 4
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 15, 1
 	delay 29
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_TARGET, 12, 6, 1, 5
 	delay 7
-	playsewithpan SE_W081, SOUND_PAN_TARGET
+	playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET
 	createvisualtask AnimTask_SlideOffScreen, 5, ANIM_TARGET, 8
 	waitforvisualfinish
 	end
@@ -2057,7 +2057,7 @@ Move_CONFUSE_RAY:
 	createsprite gConfuseRayBallBounceSpriteTemplate, ANIM_TARGET, 2, 28, 0, 288
 	waitforvisualfinish
 	setalpha 8, 8
-	playsewithpan SE_W081B, SOUND_PAN_TARGET
+	playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET
 	createsprite gConfuseRayBallSpiralSpriteTemplate, ANIM_TARGET, 2, 0, -16
 	waitforvisualfinish
 	delay 0
@@ -2082,10 +2082,10 @@ Move_LOCK_ON:
 Move_MEAN_LOOK:
 	loadspritegfx ANIM_TAG_EYE
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK
-	loopsewithpan SE_W109, SOUND_PAN_TARGET, 15, 4
-	waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 85
+	loopsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET, 15, 4
+	waitplaysewithpan SE_M_LEER, SOUND_PAN_TARGET, 85
 	createsprite gMeanLookEyeSpriteTemplate, ANIM_ATTACKER, 2
 	delay 120
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK
@@ -2098,20 +2098,20 @@ Move_ROCK_THROW:
 	loadspritegfx ANIM_TAG_ROCKS
 	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_TARGET, 2, 6, 1, 15, 1
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 0, 1, 0, 0
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 6
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 19, 1, 10, 0
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 6
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -23, 2, -10, 0
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 20, 1
 	delay 6
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -15, 1, -10, 0
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 6
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 23, 2, 10, 0
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 
@@ -2120,16 +2120,16 @@ Move_ROCK_SLIDE:
 	monbg ANIM_DEF_PARTNER
 	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 7, 1, 11, 1
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -5, 1, -5, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 5, 0, 6, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 19, 1, 10, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -23, 2, -10, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 50, 1
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 5, 50, 1
 	delay 2
@@ -2141,28 +2141,28 @@ Move_ROCK_SLIDE:
 
 RockSlideRocks:
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 28, 1, 10, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -10, 1, -5, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 10, 0, 6, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 24, 1, 10, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -32, 2, -10, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 30, 2, 10, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 2
 	return
 
@@ -2175,7 +2175,7 @@ Move_THIEF:
 	setalpha 12, 8
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
 	delay 6
-	playsewithpan SE_W233, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 8, 1
 	waitforvisualfinish
@@ -2205,22 +2205,22 @@ Move_BUBBLE_BEAM:
 	end
 BulbblebeamCreateBubbles:
 	createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 35, 70, 0, 256, 50
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
 	delay 3
 	createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 20, 40, -10, 256, 50
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
 	delay 3
 	createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 10, -60, 0, 256, 50
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
 	delay 3
 	createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 256, 50
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
 	delay 3
 	createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 30, 10, -10, 256, 50
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
 	delay 3
 	createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 256, 50
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
 	delay 3
 	return
 
@@ -2231,14 +2231,14 @@ Move_ICY_WIND:
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 11, 4, 0, 4, RGB_BLACK
 	fadetobg BG_ICE
 	waitbgfadeout
-	playsewithpan SE_W196, 0
+	playsewithpan SE_M_ICY_WIND, 0
 	waitbgfadein
 	waitforvisualfinish
-	panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	call IcyWindSwirlingSnowballs
 	delay 5
 	call IcyWindSwirlingSnowballs
-	playsewithpan SE_W016B, SOUND_PAN_TARGET
+	playsewithpan SE_M_GUST2, SOUND_PAN_TARGET
 	delay 55
 	call IceSpikesEffectLong
 	waitforvisualfinish
@@ -2263,12 +2263,12 @@ IcyWindSwirlingSnowballs:
 Move_SMOKESCREEN:
 	loadspritegfx ANIM_TAG_BLACK_SMOKE
 	loadspritegfx ANIM_TAG_BLACK_BALL
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	createsprite gBlackBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25
 	waitforvisualfinish
 	createvisualtask AnimTask_SmokescreenImpact, 2
 	delay 2
-	playsewithpan SE_W028, SOUND_PAN_TARGET
+	playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET
 	createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 104, 0, 75
 	createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 72, 1, 75
 	createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -6, 56, 1, 75
@@ -2290,7 +2290,7 @@ Move_CONVERSION:
 	monbgprio_28 ANIM_ATTACKER
 	setalpha 16, 0
 	delay 0
-	playsewithpan SE_W129, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
 	createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -24
 	delay 3
 	createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -24
@@ -2299,7 +2299,7 @@ Move_CONVERSION:
 	delay 3
 	createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -24
 	delay 3
-	playsewithpan SE_W129, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
 	createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -8
 	delay 3
 	createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -8
@@ -2308,7 +2308,7 @@ Move_CONVERSION:
 	delay 3
 	createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -8
 	delay 3
-	playsewithpan SE_W129, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
 	createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 8
 	delay 3
 	createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 8
@@ -2317,7 +2317,7 @@ Move_CONVERSION:
 	delay 3
 	createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 8
 	delay 3
-	playsewithpan SE_W129, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
 	createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 24
 	delay 3
 	createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 24
@@ -2326,7 +2326,7 @@ Move_CONVERSION:
 	delay 3
 	createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 24
 	delay 20
-	playsewithpan SE_W112, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_CONVERSION, 1, 1, RGB(31, 31, 13), 12, 0, 0
 	delay 6
 	createvisualtask AnimTask_ConversionAlphaBlend, 5
@@ -2342,7 +2342,7 @@ Move_CONVERSION_2:
 	monbgprio_2A ANIM_TARGET
 	setalpha 0, 16
 	delay 0
-	playsewithpan SE_W112, SOUND_PAN_TARGET
+	playsewithpan SE_M_BARRIER, SOUND_PAN_TARGET
 	createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, -24, 60
 	createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, -24, 65
 	createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, -24, 70
@@ -2361,21 +2361,21 @@ Move_CONVERSION_2:
 	createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135
 	createvisualtask AnimTask_Conversion2AlphaBlend, 5
 	delay 60
-	playsewithpan SE_W129, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
 	delay 10
-	playsewithpan SE_W129, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -2387,14 +2387,14 @@ Move_ROLLING_KICK:
 	monbg ANIM_TARGET
 	setalpha 12, 8
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 6
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4
 	createsprite gSlidingKickSpriteTemplate, ANIM_ATTACKER, 2, -24, 0, 48, 10, 160, 0
 	delay 5
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	waitforvisualfinish
@@ -2406,7 +2406,7 @@ Move_ROLLING_KICK:
 Move_HEADBUTT:
 	loadspritegfx ANIM_TAG_IMPACT
 	createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0
-	playsewithpan SE_W029, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 2
 	createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1
@@ -2415,7 +2415,7 @@ Move_HEADBUTT:
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 
@@ -2423,7 +2423,7 @@ Move_HORN_ATTACK:
 	loadspritegfx ANIM_TAG_IMPACT
 	loadspritegfx ANIM_TAG_HORN_HIT
 	createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0
-	playsewithpan SE_W029, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 2
 	createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1
@@ -2433,7 +2433,7 @@ Move_HORN_ATTACK:
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 
@@ -2451,14 +2451,14 @@ FuryAttackRight:
 	createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 8, 8, 10
 	waitforvisualfinish
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	goto FuryAttackContinue
 
 FuryAttackLeft:
 	createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, -8, -8, 10
 	waitforvisualfinish
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	goto FuryAttackContinue
 
 Move_HORN_DRILL:
@@ -2472,47 +2472,47 @@ HornDrillContinue:
 	waitbgfadein
 	setalpha 12, 8
 	createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0
-	playsewithpan SE_W029, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 2
 	createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1
 	createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 0, 0, 12
 	waitforvisualfinish
-	playse SE_BAN
+	playse SE_BANG
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 3
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	delay 4
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 2, ANIM_TARGET, 3
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	delay 4
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -4, 3, ANIM_TARGET, 3
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	delay 4
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -8, -5, ANIM_TARGET, 3
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	delay 4
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 4, -12, ANIM_TARGET, 3
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	delay 4
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 16, 0, ANIM_TARGET, 3
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	delay 4
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 5, 18, ANIM_TARGET, 3
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	delay 4
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -17, 12, ANIM_TARGET, 2
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	delay 4
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -21, -15, ANIM_TARGET, 2
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	delay 4
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -27, ANIM_TARGET, 2
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	delay 4
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 0, ANIM_TARGET, 2
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	delay 4
 	createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2
 	waitforvisualfinish
@@ -2535,15 +2535,15 @@ Move_THRASH:
 	createvisualtask AnimTask_ThrashMoveMonVertical, 2
 	createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	delay 28
 	createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 1
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	delay 28
 	createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 3
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 8, 0, 16, 1
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	end
 
 Move_SING:
@@ -2551,7 +2551,7 @@ Move_SING:
 	monbg ANIM_DEF_PARTNER
 	createvisualtask AnimTask_MusicNotesRainbowBlend, 2
 	waitforvisualfinish
-	panse_1B SE_W047, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_SING, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 0, 12
 	delay 5
 	createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 12
@@ -2590,7 +2590,7 @@ Move_LOW_KICK:
 	delay 4
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 8, ANIM_TARGET, 2
 	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, 1, 2
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4
 	end
@@ -2598,7 +2598,7 @@ Move_LOW_KICK:
 Move_EARTHQUAKE:
 	createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 10, 50
 	createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 10, 50
-	playsewithpan SE_W089, 0
+	playsewithpan SE_M_EARTHQUAKE, 0
 	delay 10
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14
 	delay 16
@@ -2609,7 +2609,7 @@ Move_FISSURE:
 	loadspritegfx ANIM_TAG_MUD_SAND
 	createvisualtask AnimTask_HorizontalShake, 3, (MAX_BATTLERS_COUNT + 1), 10, 50
 	createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 50
-	playsewithpan SE_W089, SOUND_PAN_TARGET
+	playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET
 	delay 8
 	call FissureDirtPlumeFar
 	delay 15
@@ -2637,7 +2637,7 @@ FissureDirtPlumeFar:
 	createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 16, -16, -10, 24
 	createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 14, -52, -18, 24
 	createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 12, -32, -16, 24
-	playsewithpan SE_W091, SOUND_PAN_TARGET
+	playsewithpan SE_M_DIG, SOUND_PAN_TARGET
 	return
 
 FissureDirtPlumeClose:
@@ -2645,7 +2645,7 @@ FissureDirtPlumeClose:
 	createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 16, -38, -10, 24
 	createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 14, -20, -18, 24
 	createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 12, -36, -16, 24
-	playsewithpan SE_W091, SOUND_PAN_TARGET
+	playsewithpan SE_M_DIG, SOUND_PAN_TARGET
 	return
 
 Move_DIG:
@@ -2684,7 +2684,7 @@ DigUnleash:
 	delay 16
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
-	playsewithpan SE_W025B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_ATTACKER
 	clearmonbg ANIM_ATTACKER
 	goto DigEnd
 DigThrowDirt:
@@ -2692,16 +2692,16 @@ DigThrowDirt:
 	createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 16, 4, -10, 18
 	createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 14, 4, -18, 18
 	createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 12, 4, -16, 18
-	playsewithpan SE_W091, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
 	delay 32
 	return
 
 Move_MEDITATE:
 	call SetPsychicBackground
 	createvisualtask AnimTask_MeditateStretchAttacker, 2
-	playsewithpan SE_W029, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
 	delay 16
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	call UnsetPsychicBackground
 	end
@@ -2711,15 +2711,15 @@ Move_AGILITY:
 	setalpha 12, 8
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 4, 4
 	createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 7, 10
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 12
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 12
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 12
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 12
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 12
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -2733,11 +2733,11 @@ Move_QUICK_ATTACK:
 	setalpha 12, 8
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5
 	createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 7, 3
-	playsewithpan SE_W026, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
 	delay 4
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
@@ -2751,16 +2751,16 @@ Move_RAGE:
 	setalpha 12, 8
 	createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_ATTACKER, RGB_RED, 10, 0, 2
 	createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, -28
-	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER
 	delay 20
 	createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28
-	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
 	delay 4
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, TRUE, 1, 10, 1, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	end
@@ -2768,7 +2768,7 @@ Move_RAGE:
 Move_TELEPORT:
 	call SetPsychicBackground
 	createvisualtask AnimTask_Teleport, 2
-	playsewithpan SE_W100, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
 	delay 15
 	call UnsetPsychicBackground
 	waitforvisualfinish
@@ -2778,23 +2778,23 @@ Move_DOUBLE_TEAM:
 	createvisualtask AnimTask_DoubleTeam, 2
 	setalpha 12, 8
 	monbg ANIM_ATK_PARTNER
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 32
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 24
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 16
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 8
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 8
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 8
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 8
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	delay 8
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
@@ -2804,7 +2804,7 @@ Move_DOUBLE_TEAM:
 Move_MINIMIZE:
 	setalpha 10, 8
 	createvisualtask AnimTask_Minimize, 2
-	loopsewithpan SE_W107, SOUND_PAN_ATTACKER, 34, 3
+	loopsewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 34, 3
 	waitforvisualfinish
 	blendoff
 	end
@@ -2813,11 +2813,11 @@ Move_METRONOME:
 	loadspritegfx ANIM_TAG_FINGER
 	loadspritegfx ANIM_TAG_THOUGHT_BUBBLE
 	createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100
-	playsewithpan SE_W118, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gMetronomeFingerSpriteTemplate, ANIM_ATTACKER, 12, 0
 	delay 24
-	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3
+	loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3
 	waitforvisualfinish
 	end
 
@@ -2832,7 +2832,7 @@ SkullBashSetUp:
 	goto SkullBashEnd
 SkullBashSetUpHeadDown:
 	createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -24, 0, 0, 10, 0
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, 0, 2
 	waitforvisualfinish
@@ -2842,14 +2842,14 @@ SkullBashSetUpHeadDown:
 SkullBashAttack:
 	loadspritegfx ANIM_TAG_IMPACT
 	createvisualtask AnimTask_SkullBashPosition, 2, 0
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	waitforvisualfinish
-	playse SE_BAN
+	playse SE_BANG
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 0
-	loopsewithpan SE_W025B, SOUND_PAN_TARGET, 8, 3
+	loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 8, 3
 	waitforvisualfinish
 	createvisualtask AnimTask_SkullBashPosition, 2, 1
 	goto SkullBashEnd
@@ -2859,9 +2859,9 @@ Move_AMNESIA:
 	call SetPsychicBackground
 	delay 8
 	createsprite gQuestionMarkSpriteTemplate, ANIM_ATTACKER, 20
-	playsewithpan SE_W118, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER
 	delay 54
-	loopsewithpan SE_W118, SOUND_PAN_ATTACKER, 16, 3
+	loopsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER, 16, 3
 	waitforvisualfinish
 	call UnsetPsychicBackground
 	end
@@ -2869,18 +2869,18 @@ Move_AMNESIA:
 Move_KINESIS:
 	loadspritegfx ANIM_TAG_ALERT
 	loadspritegfx ANIM_TAG_BENT_SPOON
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	call SetPsychicBackground
 	createsprite gBentSpoonSpriteTemplate, ANIM_ATTACKER, 20
 	createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, -8, 0
 	createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, 16, 1
-	loopsewithpan SE_W109, SOUND_PAN_ATTACKER, 21, 2
+	loopsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER, 21, 2
 	delay 60
-	playsewithpan SE_W146, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_ATTACKER
 	delay 30
-	loopsewithpan SE_W146, SOUND_PAN_ATTACKER, 20, 2
+	loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_ATTACKER, 20, 2
 	delay 70
-	playsewithpan SE_W207B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	call UnsetPsychicBackground
 	end
@@ -2889,14 +2889,14 @@ Move_GLARE:
 	loadspritegfx ANIM_TAG_SMALL_RED_EYE
 	loadspritegfx ANIM_TAG_EYE_SPARKLE
 	createvisualtask AnimTask_GlareEyeDots, 5, 0
-	playsewithpan SE_W060B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendBattleAnimPal, 5, 1, 0, 0, 16, RGB_BLACK
 	waitforvisualfinish
 	createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8
 	createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8
 	createvisualtask AnimTask_ScaryFace, 5
-	playsewithpan SE_W043, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
 	delay 2
 	createvisualtask AnimTask_ShakeTargetInPattern, 3, 20, 1, FALSE
 	waitforvisualfinish
@@ -2906,12 +2906,12 @@ Move_GLARE:
 Move_BARRAGE:
 	loadspritegfx ANIM_TAG_RED_BALL
 	createvisualtask AnimTask_BarrageBall, 3
-	playsewithpan SE_W207, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
 	delay 24
 	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, 40, 1
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 4, 20, 1
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_DEF_PARTNER, 0, 4, 20, 1
-	loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 2
+	loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 2
 	end
 
 Move_SKY_ATTACK:
@@ -2930,7 +2930,7 @@ SkyAttackSetUpAgainstOpponent:
 	delay 12
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 8, 0, RGB_BLACK
 	createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATTACKER, 2, 16
-	loopsewithpan SE_W287, SOUND_PAN_ATTACKER, 4, 8
+	loopsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER, 4, 8
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 0, 15, RGB_WHITE
 	delay 20
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 15, 0, RGB_WHITE
@@ -2946,7 +2946,7 @@ SkyAttackSetUpAgainstPartner:
 	delay 12
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 8, 0, RGB_BLACK
 	createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATTACKER, 2, 16
-	playsewithpan SE_W287, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER
 	delay 8
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 1, 0, 15, RGB_WHITE
 	delay 20
@@ -2966,11 +2966,11 @@ SkyAttackUnleash:
 	delay 4
 	createvisualtask AnimTask_AttackerFadeToInvisible, 5, 0
 	waitforvisualfinish
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W327, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_SKY_UPPERCUT, SOUND_PAN_ATTACKER
 	createsprite gSkyAttackBirdSpriteTemplate, ANIM_TARGET, 2
 	delay 14
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	delay 20
 	createvisualtask AnimTask_AttackerFadeFromInvisible, 5, 1
 	delay 2
@@ -2981,7 +2981,7 @@ SkyAttackUnleash:
 	goto SkyAttackEnd
 
 Move_FLASH:
-	playsewithpan SE_W043, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_Flash, 2
 	waitforvisualfinish
 	end
@@ -2989,7 +2989,7 @@ Move_FLASH:
 Move_SPLASH:
 	createvisualtask AnimTask_Splash, 2, 0, 3
 	delay 8
-	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 3
+	loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 3
 	waitforvisualfinish
 	end
 
@@ -2997,7 +2997,7 @@ Move_ACID_ARMOR:
 	monbg ANIM_ATTACKER
 	setalpha 15, 0
 	createvisualtask AnimTask_AcidArmor, 2, ANIM_ATTACKER
-	playsewithpan SE_W151, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_ACID_ARMOR, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_ATTACKER
@@ -3013,7 +3013,7 @@ Move_SHARPEN:
 Move_SUPER_FANG:
 	loadspritegfx ANIM_TAG_FANG_ATTACK
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1
-	playsewithpan SE_W082, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 48, 1
 	createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB(31, 6, 1), 12, 4, 1
@@ -3022,7 +3022,7 @@ Move_SUPER_FANG:
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4
 	delay 4
 	createsprite gSuperFangSpriteTemplate, ANIM_TARGET, 2
-	playsewithpan SE_W044, SOUND_PAN_TARGET
+	playsewithpan SE_M_BITE, SOUND_PAN_TARGET
 	delay 8
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB(31, 2, 2), 14, 0x7FFF, 14
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 7, 12, 1
@@ -3033,11 +3033,11 @@ Move_SUPER_FANG:
 Move_SLASH:
 	loadspritegfx ANIM_TAG_SLASH
 	createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, 8, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 
@@ -3049,11 +3049,11 @@ Move_STRUGGLE:
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
 	createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2
 	createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 2
-	loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 12, 4
+	loopsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER, 12, 4
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -3067,7 +3067,7 @@ Move_SKETCH:
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	createvisualtask AnimTask_Splash, 2, 0, 2
-	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 38, 2
+	loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 38, 2
 	end
 
 Move_NIGHTMARE:
@@ -3077,7 +3077,7 @@ Move_NIGHTMARE:
 	monbg ANIM_DEF_PARTNER
 	createvisualtask AnimTask_NightmareClone, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 40, 1
-	playsewithpan SE_W171, SOUND_PAN_TARGET
+	playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	restorebg
@@ -3086,7 +3086,7 @@ Move_NIGHTMARE:
 NightmareInContest:
 	createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB_WHITE, 10, 2, 1
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 32, 1
-	playsewithpan SE_W171, SOUND_PAN_TARGET
+	playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
@@ -3097,11 +3097,11 @@ Move_FLAIL:
 	monbg ANIM_TARGET
 	setalpha 12, 8
 	createvisualtask AnimTask_FlailMovement, 2, ANIM_ATTACKER
-	loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2
+	loopsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER, 8, 2
 	waitforvisualfinish
 	createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
 	createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 30, 1, 0
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -3109,12 +3109,12 @@ Move_FLAIL:
 
 Move_SPITE:
 	fadetobg BG_GHOST
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	waitbgfadein
 	monbg ANIM_DEF_PARTNER
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 6, 0, 8, RGB_WHITE
 	createvisualtask AnimTask_SpiteTargetShadow, 2
-	loopsewithpan SE_W060, SOUND_PAN_TARGET, 20, 3
+	loopsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET, 20, 3
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
@@ -3135,11 +3135,11 @@ MachPunchContinue:
 	delay 0
 	setalpha 9, 8
 	createvisualtask AnimTask_AttackerPunchWithTrace, 2, RGB(8, 9, 28), 10
-	playsewithpan SE_W026, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -3160,13 +3160,13 @@ Move_FORESIGHT:
 	setalpha 16, 0
 	createsprite gForesightMagnifyingGlassSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET
 	delay 17
-	loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4
+	loopsewithpan SE_M_SKETCH, SOUND_PAN_TARGET, 16, 4
 	delay 48
 	delay 24
-	playsewithpan SE_W166, SOUND_PAN_TARGET
+	playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET
 	delay 10
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 2, 1
-	playsewithpan SE_W197, SOUND_PAN_TARGET
+	playsewithpan SE_M_DETECT, SOUND_PAN_TARGET
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_DEF_PARTNER
@@ -3175,16 +3175,16 @@ Move_FORESIGHT:
 Move_DESTINY_BOND:
 	loadspritegfx ANIM_TAG_WHITE_SHADOW
 	fadetobg BG_GHOST
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	waitbgfadein
 	createvisualtask AnimTask_DestinyBondWhiteShadow, 5, 0, 48
-	playsewithpan SE_W109, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER
 	delay 48
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 0, 12, RGB(29, 29, 29)
 	delay 24
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 12, 0, RGB(29, 29, 29)
-	playsewithpan SE_W171, SOUND_PAN_TARGET
+	playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
@@ -3194,7 +3194,7 @@ Move_DESTINY_BOND:
 
 Move_ENDURE:
 	loadspritegfx ANIM_TAG_FOCUS_ENERGY
-	playsewithpan SE_W082, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
 	call EndureEffect
 	delay 8
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 11, RGB_RED
@@ -3221,13 +3221,13 @@ Move_CHARM:
 	loadspritegfx ANIM_TAG_MAGENTA_HEART
 	createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
 	createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
-	playsewithpan SE_W204, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
 	delay 15
 	createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
-	playsewithpan SE_W204, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
 	delay 15
 	createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
-	playsewithpan SE_W204, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	end
 
@@ -3242,7 +3242,7 @@ Move_ROLLOUT:
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 30, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 2
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -3252,44 +3252,44 @@ Move_FALSE_SWIPE:
 	loadspritegfx ANIM_TAG_SLASH_2
 	loadspritegfx ANIM_TAG_IMPACT
 	createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2
-	playsewithpan SE_W233, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET
 	delay 16
 	createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 0
-	playsewithpan SE_W104, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 16
 	delay 2
 	createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 32
-	playsewithpan SE_W104, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 48
 	delay 2
 	createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 64
-	playsewithpan SE_W104, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
 	delay 2
 	createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 80
 	delay 2
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 3
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	end
 
 Move_SWAGGER:
 	loadspritegfx ANIM_TAG_BREATH
 	loadspritegfx ANIM_TAG_ANGER
 	createvisualtask AnimTask_GrowAndShrink, 2
-	playsewithpan SE_W207, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2
-	loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2
+	loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 4, 2
 	waitforvisualfinish
 	delay 24
 	createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28
-	playsewithpan SE_W207B, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET
 	delay 12
 	createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28
-	playsewithpan SE_W207B, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 
@@ -3300,14 +3300,14 @@ Move_MILK_DRINK:
 	monbg ANIM_TARGET
 	createsprite gMilkBottleSpriteTemplate, ANIM_ATTACKER, 2
 	delay 40
-	playsewithpan SE_W152, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
 	delay 12
-	playsewithpan SE_W152, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
 	delay 20
-	playsewithpan SE_W152, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0
-	playsewithpan SE_W208, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	call HealingEffect2
@@ -3324,12 +3324,12 @@ MagnitudeEnd:
 MagnitudeRegular:
 	createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 0, 50
 	createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 0, 50
-	loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10
+	loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10
 	goto MagnitudeEnd
 MagnitudeIntense:
 	createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 0, 50
 	createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 0, 50
-	loopsewithpan SE_W070, SOUND_PAN_TARGET, 8, 10
+	loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 8, 10
 	delay 10
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_BLACK, 14, 0x7FFF, 14
 	delay 16
@@ -3342,15 +3342,15 @@ Move_RAPID_SPIN:
 	monbg ANIM_ATTACKER
 	createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2
 	createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 0
-	loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4
+	loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 4
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 10, 1, 0
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	waitforvisualfinish
 	delay 8
 	createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 1
-	loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4
+	loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 4
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	end
@@ -3364,7 +3364,7 @@ Move_MOONLIGHT:
 	waitforvisualfinish
 	createsprite gMoonSpriteTemplate, ANIM_ATTACKER, 2, 120, 56
 	createvisualtask AnimTask_AlphaFadeIn, 3, 0, 16, 16, 0, 1
-	playsewithpan SE_W236, 0
+	playsewithpan SE_M_MOONLIGHT, 0
 	delay 30
 	createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, -12, 0
 	delay 30
@@ -3393,7 +3393,7 @@ ExtremeSpeedContinue:
 	createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1
 	waitbgfadein
 	createvisualtask AnimTask_AttackerStretchAndDisappear, 2
-	loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 3
+	loopsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, 8, 3
 	waitforvisualfinish
 	delay 1
 	createvisualtask AnimTask_SetAttackerInvisibleWaitForSignal, 2
@@ -3402,19 +3402,19 @@ ExtremeSpeedContinue:
 	delay 18
 	createvisualtask AnimTask_ExtremeSpeedImpact, 2
 	delay 2
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, -12, 3
 	delay 10
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 12, 3
 	delay 10
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 0, 3
 	waitforvisualfinish
 	createvisualtask AnimTask_SpeedDust, 2
 	delay 10
 	createvisualtask AnimTask_ExtremeSpeedMonReappear, 2
-	loopsewithpan SE_W104, SOUND_PAN_ATTACKER, 8, 4
+	loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 8, 4
 	waitforvisualfinish
 	restorebg
 	waitbgfadeout
@@ -3436,19 +3436,19 @@ Move_UPROAR:
 	monbg ANIM_DEF_PARTNER
 	createvisualtask AnimTask_UproarDistortion, 2, 0
 	createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
-	playsewithpan SE_W253, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
 	createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0
 	createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1
 	delay 16
 	createvisualtask AnimTask_UproarDistortion, 2, 0
 	createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
-	playsewithpan SE_W253, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
 	createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1
 	createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0
 	delay 16
 	createvisualtask AnimTask_UproarDistortion, 2, 0
 	createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
-	playsewithpan SE_W253, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
 	createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1
 	createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, -24, 0
 	waitforvisualfinish
@@ -3460,7 +3460,7 @@ Move_HEAT_WAVE:
 	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FLYING_DIRT, 0, 6, 6, RGB_RED
 	createvisualtask AnimTask_LoadSandstormBackground, 5, TRUE
 	createvisualtask AnimTask_BlendBackground, 6, 6, RGB_RED
-	panse_1B SE_W257, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_HEAT_WAVE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	delay 4
 	createvisualtask AnimTask_MoveHeatWaveTargets, 5
 	delay 12
@@ -3486,7 +3486,7 @@ Move_HAIL:
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 0, 6, RGB_BLACK
 	waitforvisualfinish
 	createvisualtask AnimTask_Hail, 5
-	loopsewithpan SE_W258, 0, 8, 10
+	loopsewithpan SE_M_HAIL, 0, 8, 10
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 3, 6, 0, RGB_BLACK
 	end
@@ -3498,10 +3498,10 @@ Move_TORMENT:
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1
 	createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28
-	playsewithpan SE_W207B, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET
 	delay 20
 	createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28
-	playsewithpan SE_W207B, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET
 	end
 
 Move_MEMENTO:
@@ -3510,9 +3510,9 @@ Move_MEMENTO:
 	createvisualtask AnimTask_InitMementoShadow, 2
 	delay 1
 	createvisualtask AnimTask_MoveAttackerMementoShadow, 5
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	delay 48
-	playsewithpan SE_W060B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask sub_8114470, 2
 	delay 12
@@ -3520,7 +3520,7 @@ Move_MEMENTO:
 	delay 1
 	monbg_22 ANIM_TARGET
 	createvisualtask AnimTask_MoveTargetMementoShadow, 5
-	playsewithpan SE_W060, SOUND_PAN_TARGET
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg_23 ANIM_TARGET
 	delay 1
@@ -3532,7 +3532,7 @@ Move_FACADE:
 	loadspritegfx ANIM_TAG_SWEAT_DROP
 	createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 3
 	createvisualtask AnimTask_FacadeColorBlend, 2, ANIM_ATTACKER, 72
-	loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3
+	loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 24, 3
 	end
 
 Move_SMELLING_SALT:
@@ -3542,22 +3542,22 @@ Move_SMELLING_SALT:
 	createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 2
 	delay 32
 	createvisualtask AnimTask_SmellingSaltsSquish, 3, ANIM_TARGET, 2
-	loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2
+	loopsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET, 12, 2
 	waitforvisualfinish
 	delay 4
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2
 	createsprite gSmellingSaltExclamationSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 8, 3
-	loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3
+	loopsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET, 16, 3
 	end
 
 Move_FOLLOW_ME:
 	loadspritegfx ANIM_TAG_FINGER
 	createsprite gFollowMeFingerSpriteTemplate, ANIM_ATTACKER, 2, 0
-	playsewithpan SE_W039, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	delay 18
-	playsewithpan SE_W213, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
 	delay 71
-	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 22, 3
+	loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 22, 3
 	end
 
 Move_CHARGE:
@@ -3569,26 +3569,26 @@ Move_CHARGE:
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
 	createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 60, 2, 12
-	playsewithpan SE_W268, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
 	delay 30
-	playsewithpan SE_W268, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
 	delay 30
-	playsewithpan SE_W268, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
 	createsprite gGrowingChargeOrbSpriteTemplate, ANIM_ATTACKER, 2, 0
 	delay 25
-	playsewithpan SE_W268, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
 	delay 20
-	playsewithpan SE_W268, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
 	delay 15
-	playsewithpan SE_W268, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
 	delay 10
 	delay 6
-	loopsewithpan SE_W268, SOUND_PAN_ATTACKER, 6, 5
+	loopsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER, 6, 5
 	waitforvisualfinish
 	createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 16
 	delay 2
 	createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -16
-	playsewithpan SE_W085B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK
 	clearmonbg ANIM_ATTACKER
@@ -3600,19 +3600,19 @@ Move_TAUNT:
 	loadspritegfx ANIM_TAG_THOUGHT_BUBBLE
 	loadspritegfx ANIM_TAG_ANGER
 	createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 45
-	playsewithpan SE_W118, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gTauntFingerSpriteTemplate, ANIM_ATTACKER, 12, 0
 	delay 4
-	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 16, 2
+	loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 16, 2
 	waitforvisualfinish
 	delay 8
 	createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28
-	playsewithpan SE_W207B, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	delay 12
 	createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28
-	playsewithpan SE_W207B, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER2, SOUND_PAN_TARGET
 	end
 
 Move_HELPING_HAND:
@@ -3621,13 +3621,13 @@ Move_HELPING_HAND:
 	createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0
 	createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1
 	delay 19
-	playsewithpan SE_W227, 0
+	playsewithpan SE_M_ENCORE, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1
 	delay 14
-	playsewithpan SE_W227, 0
+	playsewithpan SE_M_ENCORE, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1
 	delay 20
-	playsewithpan SE_W227, 0
+	playsewithpan SE_M_ENCORE, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 3, 0, 10, 1
 	createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATK_PARTNER, RGB_YELLOW, 12, 1, 1
 	end
@@ -3637,16 +3637,16 @@ Move_ASSIST:
 	createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36
 	delay 2
 	createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36
-	playsewithpan SE_W010, 0
+	playsewithpan SE_M_SCRATCH, 0
 	delay 2
 	createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36
-	playsewithpan SE_W010, 0
+	playsewithpan SE_M_SCRATCH, 0
 	delay 2
 	createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36
-	playsewithpan SE_W010, 0
+	playsewithpan SE_M_SCRATCH, 0
 	delay 2
 	createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36
-	playsewithpan SE_W010, 0
+	playsewithpan SE_M_SCRATCH, 0
 	end
 
 Move_SUPERPOWER:
@@ -3657,10 +3657,10 @@ Move_SUPERPOWER:
 	monbgprio_28 ANIM_ATTACKER
 	setalpha 12, 8
 	createsprite gSuperpowerOrbSpriteTemplate, ANIM_TARGET, 2, ANIM_ATTACKER
-	playsewithpan SE_W025, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
 	delay 20
 	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 180, 1
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W089, 0
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_EARTHQUAKE, 0
 	delay 40
 	createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 200, 96, 1, 120
 	delay 8
@@ -3673,10 +3673,10 @@ Move_SUPERPOWER:
 	createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 60, 288, 3, 88
 	delay 74
 	createsprite gSuperpowerFireballSpriteTemplate, ANIM_TARGET, 3, ANIM_ATTACKER
-	playsewithpan SE_W207, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
 	delay 16
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
@@ -3689,10 +3689,10 @@ Move_RECYCLE:
 	setalpha 0, 16
 	delay 1
 	createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2
-	loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3
+	loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 24, 3
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_ATTACKER
@@ -3712,19 +3712,19 @@ BrickBreakNormal:
 	delay 4
 	delay 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, ANIM_TARGET, 1
-	playsewithpan SE_W233, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET
 	delay 20
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, ANIM_TARGET, 1
-	playsewithpan SE_W233, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET
 	delay 20
 	createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK
 	delay 37
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
 	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 10, 1, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK
 	waitforvisualfinish
@@ -3738,25 +3738,25 @@ BrickBreakShatteredWall:
 	createsprite gBrickBreakWallSpriteTemplate, ANIM_ATTACKER, 3, ANIM_TARGET, 0, 0, 90, 10
 	delay 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, ANIM_TARGET, 1
-	playsewithpan SE_W233, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET
 	delay 20
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, ANIM_TARGET, 1
-	playsewithpan SE_W233, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET
 	delay 20
 	createvisualtask AnimTask_WindUpLunge, 2, ANIM_ATTACKER, -24, 0, 24, 10, 24, 3
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, RGB_BLACK
 	delay 37
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
 	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 10, 1, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, -8, -12
 	createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 8, -12
 	createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 2, -8, 12
 	createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 3, 8, 12
-	playsewithpan SE_W280, SOUND_PAN_TARGET
+	playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, RGB_BLACK
 	waitforvisualfinish
@@ -3766,33 +3766,33 @@ BrickBreakShatteredWall:
 Move_YAWN:
 	loadspritegfx ANIM_TAG_PINK_CLOUD
 	createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER
-	playsewithpan SE_W281, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_YAWN, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 2
-	playsewithpan SE_W255, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER
 	delay 4
 	createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 1
 	delay 4
 	createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 0
 	waitforvisualfinish
 	createvisualtask AnimTask_DeepInhale, 2, ANIM_TARGET
-	playsewithpan SE_W281, SOUND_PAN_TARGET
+	playsewithpan SE_M_YAWN, SOUND_PAN_TARGET
 	end
 
 Move_ENDEAVOR:
 	loadspritegfx ANIM_TAG_SWEAT_DROP
 	loadspritegfx ANIM_TAG_IMPACT
 	createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 2
-	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2
+	loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 24, 2
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2
 	delay 6
 	createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -12, ANIM_TARGET, 2
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	delay 24
 	createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, FALSE, 1, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 12, ANIM_TARGET, 2
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	end
 
 Move_ERUPTION:
@@ -3800,10 +3800,10 @@ Move_ERUPTION:
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 2, 0, 4, RGB_RED
 	waitforvisualfinish
 	createvisualtask AnimTask_EruptionLaunchRocks, 2
-	waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60
+	waitplaysewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER, 60
 	waitforvisualfinish
 	createvisualtask AnimTask_EruptionLaunchRocks, 2
-	waitplaysewithpan SE_W153, SOUND_PAN_ATTACKER, 60
+	waitplaysewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER, 60
 	waitforvisualfinish
 	delay 30
 	createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 200, -32, 0, 100, 0
@@ -3815,7 +3815,7 @@ Move_ERUPTION:
 	delay 22
 	createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 8, 60
 	createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 8, 60
-	loopsewithpan SE_W088, SOUND_PAN_TARGET, 16, 12
+	loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 16, 12
 	delay 80
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, 31, 4, 4, 0, RGB_RED
 	end
@@ -3825,7 +3825,7 @@ Move_SKILL_SWAP:
 	call SetPsychicBackground
 	createvisualtask AnimTask_SkillSwap, 3, ANIM_TARGET
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1
-	loopsewithpan SE_W179, SOUND_PAN_ATTACKER, 24, 3
+	loopsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER, 24, 3
 	delay 16
 	createvisualtask AnimTask_SkillSwap, 3, ANIM_ATTACKER
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 3, 1
@@ -3840,12 +3840,12 @@ Move_IMPRISON:
 	monbg ANIM_DEF_PARTNER
 	createvisualtask AnimTask_ImprisonOrbs, 5
 	delay 8
-	loopsewithpan SE_W030, SOUND_PAN_ATTACKER, 8, 5
+	loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_ATTACKER, 8, 5
 	waitforvisualfinish
 	delay 4
 	createsprite gRedXSpriteTemplate, ANIM_ATTACKER, 5, ANIM_ATTACKER, 40
 	createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 1, 10
-	playsewithpan SE_W063, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER
 	clearmonbg ANIM_DEF_PARTNER
 	call UnsetPsychicBackground
 	end
@@ -3855,13 +3855,13 @@ Move_GRUDGE:
 	monbg ANIM_ATTACKER
 	monbgprio_29
 	fadetobg BG_GHOST
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	waitbgfadein
 	createvisualtask AnimTask_GrudgeFlames, 3
-	loopsewithpan SE_W052, SOUND_PAN_ATTACKER, 16, 4
+	loopsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 16, 4
 	delay 10
 	delay 80
-	playsewithpan SE_W171, SOUND_PAN_TARGET
+	playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
@@ -3875,7 +3875,7 @@ Move_CAMOUFLAGE:
 	createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 3, 0, 14
 	delay 16
 	createvisualtask AnimTask_AttackerFadeToInvisible, 2, 4
-	playsewithpan SE_W185, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 8
 	createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 0, 0, 0
@@ -3894,7 +3894,7 @@ Move_TAIL_GLOW:
 	waitforvisualfinish
 	createsprite gTailGlowOrbSpriteTemplate, ANIM_ATTACKER, 66, ANIM_ATTACKER
 	delay 18
-	loopsewithpan SE_W234, SOUND_PAN_ATTACKER, 16, 6
+	loopsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER, 16, 6
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, RGB_BLACK
 	clearmonbg ANIM_ATTACKER
@@ -3911,7 +3911,7 @@ Move_LUSTER_PURGE:
 	waitbgfadein
 	monbg ANIM_ATTACKER
 	setalpha 12, 8
-	playsewithpan SE_W076, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER
 	createsprite gLusterPurgeCircleSpriteTemplate, ANIM_ATTACKER, 41, 0, 0, 0, 0
 	delay 20
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
@@ -3920,22 +3920,22 @@ Move_LUSTER_PURGE:
 	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23)
 	waitforvisualfinish
 	createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
 	delay 3
 	createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
 	delay 3
 	createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
 	delay 3
 	createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
 	delay 3
 	createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
 	delay 3
 	createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W063, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
 	createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
@@ -3949,14 +3949,14 @@ Move_MIST_BALL:
 	loadspritegfx ANIM_TAG_SMALL_BUBBLES
 	loadspritegfx ANIM_TAG_WHITE_FEATHER
 	delay 0
-	playsewithpan SE_W081, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER
 	createsprite gMistBallSpriteTemplate, ANIM_TARGET, 0, 0, 0, 0, 0, 30, 0
 	waitforvisualfinish
-	playsewithpan SE_W028, SOUND_PAN_TARGET
+	playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 10, 0
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, RGB(23, 16, 31), 16, 0x7FFF, 16
 	delay 0
-	playsewithpan SE_W114, 0
+	playsewithpan SE_M_HAZE, 0
 	createvisualtask AnimTask_LoadMistTiles, 5
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 3, 0, 16, RGB_WHITE
 	delay 8
@@ -3969,7 +3969,7 @@ Move_FEATHER_DANCE:
 	loadspritegfx ANIM_TAG_WHITE_FEATHER
 	monbg ANIM_DEF_PARTNER
 	monbgprio_29
-	playsewithpan SE_W080, SOUND_PAN_TARGET
+	playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_TARGET
 	delay 0
 	createsprite gFallingFeatherSpriteTemplate, ANIM_TARGET, 0, 0, -16, 64, 2, 104, 11304, 32, 1
 	delay 6
@@ -3992,19 +3992,19 @@ Move_TEETER_DANCE:
 	loadspritegfx ANIM_TAG_DUCK
 	createvisualtask AnimTask_TeeterDanceMovement, 5
 	createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, -2
-	playsewithpan SE_W298, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER
 	delay 24
 	createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -2
-	playsewithpan SE_W298, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER
 	delay 24
 	createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -2
-	playsewithpan SE_W298, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER
 	delay 24
 	createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, -8, -2
-	playsewithpan SE_W298, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER
 	delay 24
 	createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 2, 8, -2
-	playsewithpan SE_W298, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER
 	end
 
 Move_MUD_SPORT:
@@ -4013,52 +4013,52 @@ Move_MUD_SPORT:
 	delay 24
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -4, -16
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 4, -12
-	playsewithpan SE_W091, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
 	delay 32
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -3, -12
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 5, -14
-	playsewithpan SE_W091, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
 	delay 32
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -5, -18
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 3, -14
-	playsewithpan SE_W091, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
 	delay 16
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 220, 60
-	waitplaysewithpan SE_W145B, 0, 15
+	waitplaysewithpan SE_M_BUBBLE2, 0, 15
 	delay 2
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 60, 100
-	waitplaysewithpan SE_W145B, 0, 25
+	waitplaysewithpan SE_M_BUBBLE2, 0, 25
 	delay 2
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 140, 55
-	waitplaysewithpan SE_W145B, 0, 14
+	waitplaysewithpan SE_M_BUBBLE2, 0, 14
 	delay 2
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 180, 50
-	waitplaysewithpan SE_W145B, 0, 10
+	waitplaysewithpan SE_M_BUBBLE2, 0, 10
 	delay 2
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 20, 90
-	waitplaysewithpan SE_W145B, 0, 22
+	waitplaysewithpan SE_M_BUBBLE2, 0, 22
 	delay 2
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 90, 90
-	waitplaysewithpan SE_W145B, 0, 22
+	waitplaysewithpan SE_M_BUBBLE2, 0, 22
 	delay 2
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 160, 60
-	waitplaysewithpan SE_W145B, 0, 15
+	waitplaysewithpan SE_M_BUBBLE2, 0, 15
 	delay 2
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 30, 90
-	waitplaysewithpan SE_W145B, 0, 22
+	waitplaysewithpan SE_M_BUBBLE2, 0, 22
 	delay 2
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 120, 60
-	waitplaysewithpan SE_W145B, 0, 15
+	waitplaysewithpan SE_M_BUBBLE2, 0, 15
 	delay 2
 	createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 200, 40
-	waitplaysewithpan SE_W145B, 0, 10
+	waitplaysewithpan SE_M_BUBBLE2, 0, 10
 	end
 
 Move_NEEDLE_ARM:
 	loadspritegfx ANIM_TAG_GREEN_SPIKE
 	loadspritegfx ANIM_TAG_IMPACT
 	loadspritegfx ANIM_TAG_HANDS_AND_FEET
-	loopsewithpan SE_W030, SOUND_PAN_TARGET, 2, 16
+	loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 2, 16
 	createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, -32, 16
 	delay 2
 	createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 22, -22, 16
@@ -4086,7 +4086,7 @@ Move_NEEDLE_ARM:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0, -24, 10
 	createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 17, -17, 10
 	createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 24, 0, 10
@@ -4100,7 +4100,7 @@ Move_NEEDLE_ARM:
 Move_SLACK_OFF:
 	loadspritegfx ANIM_TAG_BLUE_STAR
 	createvisualtask AnimTask_SlackOffSquish, 2, ANIM_ATTACKER
-	playsewithpan SE_W281, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_YAWN, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	call HealingEffect
 	waitforvisualfinish
@@ -4117,18 +4117,18 @@ Move_CRUSH_CLAW:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	delay 12
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_TARGET
 	end
 
 Move_AROMATHERAPY:
-	playsewithpan SE_W080, 0
+	playsewithpan SE_M_PETAL_DANCE, 0
 	loadspritegfx ANIM_TAG_FLOWER
 	loadspritegfx ANIM_TAG_THIN_RING
 	loadspritegfx ANIM_TAG_SPARKLE_2
@@ -4152,15 +4152,15 @@ Move_AROMATHERAPY:
 	delay 1
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 0, 7, 0, RGB(13, 31, 12)
 	delay 1
-	playsewithpan SE_W287, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_StatusClearedEffect, 2, 1
 	waitforvisualfinish
-	playsewithpan SE_W234, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
 	createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1
 	delay 8
 	createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1
 	waitforvisualfinish
-	playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER
+	playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 43, 3, 10, 0, RGB(13, 31, 12)
 	createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1
 	waitforvisualfinish
@@ -4173,7 +4173,7 @@ Move_FAKE_TEARS:
 	createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31)
 	waitforvisualfinish
 	createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 1
-	loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4
+	loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 12, 4
 	delay 8
 	createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0, 0
 	createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0, 1
@@ -4199,7 +4199,7 @@ Move_AIR_CUTTER:
 	delay 0
 	createvisualtask AnimTask_AirCutterProjectile, 2, 32, -24, 6 * 256, 2, 128  @ 6 * 256 == Q_8_8(6)
 	waitforvisualfinish
-	playsewithpan SE_W015, SOUND_PAN_TARGET
+	playsewithpan SE_M_CUT, SOUND_PAN_TARGET
 	createsprite gAirCutterSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0, 2
 	delay 5
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
@@ -4215,15 +4215,15 @@ Move_ODOR_SLEUTH:
 	createvisualtask AnimTask_OdorSleuthMovement, 5
 	delay 24
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4
-	playsewithpan SE_W207, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4
-	playsewithpan SE_W207, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	delay 1
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, RGB_WHITEALPHA, 16, -1, 0
-	playsewithpan SE_W043, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
 	end
 
 Move_GRASS_WHISTLE:
@@ -4232,7 +4232,7 @@ Move_GRASS_WHISTLE:
 	waitforvisualfinish
 	createvisualtask AnimTask_MusicNotesRainbowBlend, 2
 	waitforvisualfinish
-	panse_1B SE_W320, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_GRASSWHISTLE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 1, 0
 	delay 5
 	createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 0
@@ -4269,7 +4269,7 @@ Move_TICKLE:
 	waitforvisualfinish
 	createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8
 	createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8
-	playsewithpan SE_W197, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 16, 0, RGB_BLACK
 	waitforvisualfinish
@@ -4277,7 +4277,7 @@ Move_TICKLE:
 	createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER
 	delay 12
 	createvisualtask AnimTask_RockMonBackAndForth, 3, ANIM_TARGET, 6, 2
-	loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8
+	loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 8, 8
 	waitforvisualfinish
 	end
 
@@ -4287,13 +4287,13 @@ Move_WATER_SPOUT:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	createvisualtask AnimTask_WaterSpoutLaunch, 5
-	playsewithpan SE_W029, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
 	delay 44
-	playsewithpan SE_W291, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 16
 	createvisualtask AnimTask_WaterSpoutRain, 5
-	playsewithpan SE_W057, SOUND_PAN_TARGET
+	playsewithpan SE_M_SURF, SOUND_PAN_TARGET
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
 	end
@@ -4306,11 +4306,11 @@ Move_SHADOW_PUNCH:
 	monbg ANIM_ATK_PARTNER
 	setalpha 9, 8
 	createvisualtask AnimTask_AttackerPunchWithTrace, 2, RGB_BLACK, 13
-	playsewithpan SE_W026, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -4325,15 +4325,15 @@ Move_EXTRASENSORY:
 	setalpha 12, 8
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1
 	createvisualtask AnimTask_ExtrasensoryDistortion, 5, 0
-	playsewithpan SE_W020, SOUND_PAN_TARGET
+	playsewithpan SE_M_BIND, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1
 	createvisualtask AnimTask_ExtrasensoryDistortion, 5, 1
-	playsewithpan SE_W020, SOUND_PAN_TARGET
+	playsewithpan SE_M_BIND, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_TransparentCloneGrowAndShrink, 5, ANIM_ATTACKER
 	createvisualtask AnimTask_ExtrasensoryDistortion, 5, 2
-	playsewithpan SE_W043, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	blendoff
 	clearmonbg ANIM_DEF_PARTNER
@@ -4347,18 +4347,18 @@ Move_AERIAL_ACE:
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5
 	createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 7, 3
 	createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0
-	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
 	delay 5
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
 	end
 
 Move_IRON_DEFENSE:
-	loopsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER, 28, 2
+	loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2
 	createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, RGB_WHITEALPHA, 14, -1, 0
 	waitforvisualfinish
@@ -4367,7 +4367,7 @@ Move_IRON_DEFENSE:
 Move_BLOCK:
 	loadspritegfx ANIM_TAG_X_SIGN
 	createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	end
 
 Move_HOWL:
@@ -4383,10 +4383,10 @@ Move_HOWL:
 Move_BULK_UP:
 	loadspritegfx ANIM_TAG_BREATH
 	createvisualtask AnimTask_GrowAndShrink, 2
-	playsewithpan SE_W207, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2
-	loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 4, 2
+	loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 4, 2
 	waitforvisualfinish
 	end
 
@@ -4395,16 +4395,16 @@ Move_COVET:
 	loadspritegfx ANIM_TAG_ITEM_BAG
 	createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
 	createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
-	playsewithpan SE_W204, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
 	delay 15
 	createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
-	playsewithpan SE_W204, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
 	delay 15
 	createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
-	playsewithpan SE_W204, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
-	loopsewithpan SE_W146, SOUND_PAN_TARGET, 4, 3
+	loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_TARGET, 4, 3
 	end
 
 Move_VOLT_TACKLE:
@@ -4416,28 +4416,28 @@ Move_VOLT_TACKLE:
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 0, 8, RGB_BLACK
 	waitforvisualfinish
 	createsprite gVoltTackleOrbSlideSpriteTemplate, ANIM_ATTACKER, 1
-	playsewithpan SE_W268, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	blendoff
 	delay 8
 	createvisualtask AnimTask_VoltTackleBolt, 5, 0
-	playsewithpan SE_W085, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask AnimTask_VoltTackleBolt, 5, 1
-	playsewithpan SE_W085, SOUND_PAN_TARGET
+	playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_VoltTackleBolt, 5, 2
-	playsewithpan SE_W085, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask AnimTask_VoltTackleBolt, 5, 3
-	playsewithpan SE_W085, SOUND_PAN_TARGET
+	playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_VoltTackleBolt, 5, 4
-	playsewithpan SE_W085, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER
 	delay 8
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, 16, 16
 	delay 2
 	createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, -16
@@ -4445,7 +4445,7 @@ Move_VOLT_TACKLE:
 	createvisualtask AnimTask_VoltTackleAttackerReappear, 5
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1
-	playsewithpan SE_W085B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
 	createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 16
 	delay 2
 	createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -16
@@ -4458,13 +4458,13 @@ Move_WATER_SPORT:
 	loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB
 	createvisualtask AnimTask_WaterSport, 5
 	delay 8
-	playsewithpan SE_W057, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER
 	delay 44
-	playsewithpan SE_W057, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER
 	delay 44
-	playsewithpan SE_W057, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER
 	delay 44
-	panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	end
 
 Move_CALM_MIND:
@@ -4475,13 +4475,13 @@ Move_CALM_MIND:
 	createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, TRUE
 	waitforvisualfinish
 	createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0
-	playsewithpan SE_W048, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
 	delay 14
 	createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0
-	playsewithpan SE_W048, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
 	delay 14
 	createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0
-	playsewithpan SE_W048, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, FALSE
 	waitforvisualfinish
@@ -4496,20 +4496,20 @@ Move_LEAF_BLADE:
 	createvisualtask AnimTask_LeafBlade, 5
 	delay 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
-	playsewithpan SE_W015, SOUND_PAN_TARGET
+	playsewithpan SE_M_CUT, SOUND_PAN_TARGET
 	delay 50
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
-	playsewithpan SE_W015, SOUND_PAN_TARGET
+	playsewithpan SE_M_CUT, SOUND_PAN_TARGET
 	delay 50
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
-	playsewithpan SE_W015, SOUND_PAN_TARGET
+	playsewithpan SE_M_CUT, SOUND_PAN_TARGET
 	waitforvisualfinish
 	monbg ANIM_TARGET
 	setalpha 12, 8
 	delay 12
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 18, 1
 	createsprite gCrossImpactSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 36
-	playsewithpan SE_W043, SOUND_PAN_TARGET
+	playsewithpan SE_M_LEER, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -4521,7 +4521,7 @@ Move_DRAGON_DANCE:
 	monbgprio_28 ANIM_ATTACKER
 	delay 1
 	createvisualtask AnimTask_DragonDanceWaver, 5
-	playsewithpan SE_W100, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
 	delay 8
 	createvisualtask AnimTask_BlendPalInAndOutByTag, 5, ANIM_TAG_HOLLOW_ORB, RGB(0, 0, 19), 14, 0, 3
 	createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 0
@@ -4531,9 +4531,9 @@ Move_DRAGON_DANCE:
 	createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 170
 	createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 213
 	delay 30
-	playsewithpan SE_W100, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
 	delay 30
-	playsewithpan SE_W100, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
 	delay 1
@@ -4549,7 +4549,7 @@ Move_SHOCK_WAVE:
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
 	createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 20, 0, 2
-	playsewithpan SE_W268, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
 	delay 12
 	createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2
 	delay 30
@@ -4557,7 +4557,7 @@ Move_SHOCK_WAVE:
 	delay 12
 	waitforvisualfinish
 	createvisualtask AnimTask_ShockWaveLightning, 5
-	playsewithpan SE_W161B, SOUND_PAN_TARGET
+	playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 18, 1
 	createvisualtask AnimTask_BlendBattleAnimPal, 5, 1, 3, 16, 0, RGB_WHITE
@@ -4570,7 +4570,7 @@ Move_SHOCK_WAVE:
 	end
 
 Move_HARDEN:
-	loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
+	loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
 	createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
 	waitforvisualfinish
 	end
@@ -4582,27 +4582,27 @@ Move_BELLY_DRUM:
 	waitforvisualfinish
 	call BellyDrumRight
 	createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0
-	playsewithpan SE_W187, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER
 	delay 15
 	call BellyDrumLeft
 	createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 1, 0
-	playsewithpan SE_W187, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER
 	delay 15
 	call BellyDrumRight
 	createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 3, 3, 128
-	playsewithpan SE_W187, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER
 	delay 7
 	call BellyDrumLeft
 	createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 128
-	playsewithpan SE_W187, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER
 	delay 7
 	call BellyDrumRight
 	createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 1, 0
-	playsewithpan SE_W187, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER
 	delay 7
 	call BellyDrumLeft
 	createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 3, 0
-	playsewithpan SE_W187, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2
 	waitforvisualfinish
@@ -4623,11 +4623,11 @@ Move_MIND_READER:
 	loadspritegfx ANIM_TAG_OPENING_EYE
 	loadspritegfx ANIM_TAG_ROUND_WHITE_HALO
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W109, SOUND_PAN_TARGET
+	playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET
 	createsprite gOpeningEyeSpriteTemplate, ANIM_ATTACKER, 5, 0, 0, 1, 0
 	createsprite gWhiteHaloSpriteTemplate, ANIM_ATTACKER, 5
 	delay 40
-	playsewithpan SE_W043, SOUND_PAN_TARGET
+	playsewithpan SE_M_LEER, SOUND_PAN_TARGET
 	createvisualtask AnimTask_BlendColorCycle, 2, 1, 1, 2, 0, 10, RGB_BLACK
 	call MindReaderEyeSpikeEffect
 	waitforvisualfinish
@@ -4667,7 +4667,7 @@ Move_ICE_PUNCH:
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 9, RGB(12, 26, 31)
 	delay 20
-	playsewithpan SE_W081, SOUND_PAN_TARGET
+	playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET
 	createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 0
 	createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 64
 	createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 128
@@ -4680,7 +4680,7 @@ Move_ICE_PUNCH:
 	delay 17
 	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, -10, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, ANIM_TARGET, 1
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	delay 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1
 	waitforvisualfinish
@@ -4696,7 +4696,7 @@ Move_ICE_PUNCH:
 	end
 
 Move_REST:
-	playsewithpan SE_W173, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER
 	loadspritegfx ANIM_TAG_LETTER_Z
 	createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0
 	delay 20
@@ -4713,7 +4713,7 @@ Move_CONFUSION:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 8, RGB_WHITE
 	waitforvisualfinish
-	playsewithpan SE_W048, SOUND_PAN_TARGET
+	playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1
 	waitforvisualfinish
@@ -4730,7 +4730,7 @@ Move_PSYCHIC:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 8, RGB(31, 23, 0)
 	waitforvisualfinish
-	loopsewithpan SE_W048, SOUND_PAN_TARGET, 10, 3
+	loopsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 10, 3
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1
 	waitforvisualfinish
@@ -4749,10 +4749,10 @@ FutureSightContinue:
 	end
 FutureSight:
 	monbg ANIM_ATK_PARTNER
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	call SetPsychicBackground
 	setalpha 8, 8
-	playsewithpan SE_W048, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 8, RGB_WHITE
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
 	waitforvisualfinish
@@ -4769,7 +4769,7 @@ Move_THUNDER:
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK
 	delay 16
 	createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257
-	playsewithpan SE_W086, SOUND_PAN_TARGET
+	playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
 	delay 1
 	createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, -36
 	delay 1
@@ -4778,12 +4778,12 @@ Move_THUNDER:
 	createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, 12
 	delay 20
 	createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, -32
-	playsewithpan SE_W086, SOUND_PAN_TARGET
+	playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
 	delay 1
 	createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, -16
 	delay 1
 	createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, 16
-	playsewithpan SE_W086, SOUND_PAN_TARGET
+	playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
 	delay 5
 	createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257
 	delay 1
@@ -4798,7 +4798,7 @@ Move_THUNDER:
 	createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257
 	delay 1
 	createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -32
-	playsewithpan SE_W161B, SOUND_PAN_TARGET
+	playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
 	delay 1
 	createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16
 	delay 1
@@ -4826,7 +4826,7 @@ Move_THUNDER_PUNCH:
 	setalpha 12, 8
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK
 	waitforvisualfinish
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
 	delay 1
@@ -4838,7 +4838,7 @@ Move_THUNDER_PUNCH:
 	delay 1
 	createsprite gLightningSpriteTemplate, ANIM_ATTACKER, 2, 0, 16
 	delay 1
-	playsewithpan SE_W161B, SOUND_PAN_TARGET
+	playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257
 	delay 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
@@ -4854,7 +4854,7 @@ Move_THUNDER_PUNCH:
 Move_SACRED_FIRE:
 	loadspritegfx ANIM_TAG_FIRE
 	loadspritegfx ANIM_TAG_FIRE_PLUME
-	loopsewithpan SE_W221, SOUND_PAN_ATTACKER, 7, 5
+	loopsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER, 7, 5
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 50, 5, -2, 0
 	delay 1
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, -20, -10, 50, 5, -1, -1
@@ -4875,13 +4875,13 @@ Move_SACRED_FIRE:
 	createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257
 	delay 1
 	waitforvisualfinish
-	playsewithpan SE_W221B, SOUND_PAN_TARGET
+	playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
 	createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, -16, 0, 70, 16, 0, 1
 	delay 10
-	playsewithpan SE_W221B, SOUND_PAN_TARGET
+	playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
 	createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, 0, 0, 70, 16, 0, 1
 	delay 10
-	playsewithpan SE_W221B, SOUND_PAN_TARGET
+	playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
 	createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, 16, 0, 80, 16, 0, 1
 	delay 1
 	createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257
@@ -4889,7 +4889,7 @@ Move_SACRED_FIRE:
 	waitforvisualfinish
 	createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257
 	delay 1
-	playsewithpan SE_W172B, SOUND_PAN_TARGET
+	playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET
 	createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0
 	delay 1
 	createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1
@@ -4912,7 +4912,7 @@ Move_SCRATCH:
 	loadspritegfx ANIM_TAG_SCRATCH
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W010, SOUND_PAN_TARGET
+	playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET
 	createsprite gScratchSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
@@ -4925,7 +4925,7 @@ Move_DRAGON_BREATH:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	loopsewithpan SE_W172, SOUND_PAN_ATTACKER, 7, 7
+	loopsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER, 7, 7
 	createsprite gDragonBreathFireSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0, 0, 20
 	delay 2
 	createsprite gDragonBreathFireSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0, 0, 20
@@ -5007,7 +5007,7 @@ Move_SNORE:
 	blendoff
 	end
 SnoreEffect:
-	playsewithpan SE_W173, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, ANIM_ATTACKER, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1
 	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0
@@ -5020,7 +5020,7 @@ Move_LIGHT_SCREEN:
 	loadspritegfx ANIM_TAG_SPARKLE_3
 	loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL
 	setalpha 0, 16
-	waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15
+	waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 15
 	createsprite gLightScreenWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, ANIM_TAG_GREEN_LIGHT_WALL
 	delay 10
 	call SpecialScreenSparkle
@@ -5049,7 +5049,7 @@ Move_MIRROR_COAT:
 	setalpha 0, 16
 	createsprite gMirrorCoatWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, ANIM_TAG_RED_LIGHT_WALL
 	delay 10
-	playsewithpan SE_W115, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER
 	call SpecialScreenSparkle
 	waitforvisualfinish
 	delay 1
@@ -5060,7 +5060,7 @@ Move_REFLECT:
 	loadspritegfx ANIM_TAG_SPARKLE_4
 	loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL
 	setalpha 0, 16
-	waitplaysewithpan SE_W115, SOUND_PAN_ATTACKER, 15
+	waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 15
 	createsprite gReflectWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, ANIM_TAG_BLUE_LIGHT_WALL
 	delay 20
 	createsprite gReflectSparkleSpriteTemplate, ANIM_ATTACKER, 2, 30, 0, ANIM_ATTACKER, 1
@@ -5076,7 +5076,7 @@ Move_REFLECT:
 Move_BARRIER:
 	loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL
 	setalpha 0, 16
-	waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15
+	waitplaysewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER, 15
 	createsprite gBarrierWallSpriteTemplate, ANIM_ATTACKER, 3, 40, 0, ANIM_TAG_GRAY_LIGHT_WALL
 	waitforvisualfinish
 	delay 1
@@ -5090,28 +5090,28 @@ Move_BUBBLE:
 	setalpha 12, 8
 	delay 1
 	createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 128, 100
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100
 	delay 6
 	createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 35, 37, 40, 128, 100
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100
 	delay 6
 	createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 10, -37, 30, 128, 100
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100
 	delay 6
 	createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 30, 10, 15, 128, 100
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100
 	delay 6
 	createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 20, 33, 20, 128, 100
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100
 	delay 6
 	createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 128, 100
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W145B, SOUND_PAN_TARGET, 100
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET, 100
 	waitforvisualfinish
 	call WaterBubblesEffectLong
 	waitforvisualfinish
@@ -5124,7 +5124,7 @@ Move_SMOG:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_29
 	setalpha 12, 8
-	loopsewithpan SE_W054, SOUND_PAN_TARGET, 17, 10
+	loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 17, 10
 	call SmogCloud
 	call SmogCloud
 	call SmogCloud
@@ -5133,7 +5133,7 @@ Move_SMOG:
 	call SmogCloud
 	call SmogCloud
 	delay 120
-	loopsewithpan SE_W092, SOUND_PAN_TARGET, 18, 2
+	loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 18, 2
 	createvisualtask AnimTask_BlendColorCycle, 2, 4, 2, 2, 0, 12, RGB(26, 0, 26)
 	delay 10
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1
@@ -5152,7 +5152,7 @@ Move_FAINT_ATTACK:
 	fadetobg BG_DARK
 	waitbgfadein
 	delay 0
-	playsewithpan SE_W185, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3
 	createvisualtask AnimTask_AttackerFadeToInvisible, 2, 1
 	waitforvisualfinish
@@ -5163,7 +5163,7 @@ Move_FAINT_ATTACK:
 	setalpha 12, 8
 	monbg ANIM_TARGET
 	delay 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 9, 1
 	waitforvisualfinish
@@ -5187,7 +5187,7 @@ Move_SAND_ATTACK:
 	monbg ANIM_ATK_PARTNER
 	monbgprio_28 ANIM_ATTACKER
 	setalpha 12, 8
-	playsewithpan SE_W028, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2
@@ -5212,7 +5212,7 @@ SandAttackDirt:
 
 Move_MUD_SLAP:
 	loadspritegfx ANIM_TAG_MUD_SAND
-	playsewithpan SE_W028, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2
@@ -5236,14 +5236,14 @@ MudSlapMud:
 Move_DRAGON_RAGE:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	loadspritegfx ANIM_TAG_FIRE_PLUME
-	playsewithpan SE_W082, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_TARGET, 2, 0, 15, 0, 0, 4
 	waitforvisualfinish
 	createsprite gDragonRageFireSpitSpriteTemplate, ANIM_TARGET, 2, 30, 15, 0, 10, 10
 	waitforvisualfinish
-	loopsewithpan SE_W172B, SOUND_PAN_TARGET, 11, 3
+	loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET, 11, 3
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1
 	createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 5, 0
 	delay 1
@@ -5267,7 +5267,7 @@ Move_DRAGON_RAGE:
 
 Move_RAIN_DANCE:
 	loadspritegfx ANIM_TAG_RAIN_DROPS
-	playsewithpan SE_W240, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
 	createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120
@@ -5284,7 +5284,7 @@ Move_BITE:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W044, SOUND_PAN_TARGET
+	playsewithpan SE_M_BITE, SOUND_PAN_TARGET
 	createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0, -32, 0, 0, 819, 10
 	createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 4, 0, -819, 10
 	delay 10
@@ -5303,14 +5303,14 @@ Move_CRUNCH:
 	fadetobg BG_DARK
 	waitbgfadein
 	setalpha 12, 8
-	playsewithpan SE_W044, SOUND_PAN_TARGET
+	playsewithpan SE_M_BITE, SOUND_PAN_TARGET
 	createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, -32, -32, 1, 819, 819, 10
 	createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 32, 32, 5, -819, -819, 10
 	delay 10
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2
 	waitforvisualfinish
-	playsewithpan SE_W044, SOUND_PAN_TARGET
+	playsewithpan SE_M_BITE, SOUND_PAN_TARGET
 	createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 32, -32, 7, -819, 819, 10
 	createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, -32, 32, 3, 819, -819, 10
 	delay 10
@@ -5329,7 +5329,7 @@ Move_CLAMP:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W011, SOUND_PAN_TARGET
+	playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET
 	createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10
 	createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10
 	delay 10
@@ -5348,7 +5348,7 @@ Move_ICE_BEAM:
 	loadspritegfx ANIM_TAG_ICE_CRYSTALS
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, RGB_BLACK
 	waitforvisualfinish
-	createsoundtask SoundTask_LoopSEAdjustPanning, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
+	createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_BUBBLE_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
 	createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20
 	createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20
 	delay 1
@@ -5386,7 +5386,7 @@ IceBeamCreateCrystals:
 	return
 
 Move_WITHDRAW:
-	playsewithpan SE_W029, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_Withdraw, 5
 	waitforvisualfinish
 	end
@@ -5395,7 +5395,7 @@ Move_AURORA_BEAM:
 	loadspritegfx ANIM_TAG_RAINBOW_RINGS
 	fadetobg BG_AURORA
 	waitbgfadein
-	playsewithpan SE_W062, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE_BEAM, SOUND_PAN_ATTACKER
 	setarg 7, 0
 	createvisualtask AnimTask_RotateAuroraRingColors, 10, 130
 	call AuroraBeamCreateRings
@@ -5404,7 +5404,7 @@ Move_AURORA_BEAM:
 	call AuroraBeamCreateRings
 	call AuroraBeamCreateRings
 	setarg 7, 0xFFFF
-	createsoundtask SoundTask_LoopSEAdjustPanning, SE_W062B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
+	createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_BUBBLE_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 6, 0, 10
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 40, 1
 	call AuroraBeamCreateRings
 	call AuroraBeamCreateRings
@@ -5437,7 +5437,7 @@ SolarBeamSetUp:
 	monbg ANIM_ATK_PARTNER
 	setalpha 12, 8
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 1, 4, 0, 11, RGB(31, 31, 11)
-	playsewithpan SE_W025, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
 	call SolarBeamAbsorbEffect
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -5475,7 +5475,7 @@ SolarBeamAbsorbEffect:
 	return
 SolarBeamUnleash:
 	call SetSolarbeamBg
-	panse_1B SE_W076, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5
 	createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0
 	delay 4
@@ -5527,10 +5527,10 @@ BlizzardContinue:
 	createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1
 	waitbgfadein
 	waitforvisualfinish
-	panse_1B SE_W059, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_BLIZZARD, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	call BlizzardIceCrystals
 	call BlizzardIceCrystals
-	playsewithpan SE_W059B, SOUND_PAN_TARGET
+	playsewithpan SE_M_BLIZZARD2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	call IceCrystalEffectLong
 	waitforvisualfinish
@@ -5573,10 +5573,10 @@ Move_POWDER_SNOW:
 	monbg ANIM_DEF_PARTNER
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 0, 3, RGB_BLACK
 	waitforvisualfinish
-	panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	call PowderSnowSnowballs
 	call PowderSnowSnowballs
-	playsewithpan SE_W016B, SOUND_PAN_TARGET
+	playsewithpan SE_M_GUST2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	waitsound
 	call IceCrystalEffectLong
@@ -5610,7 +5610,7 @@ Move_HYDRO_PUMP:
 	setalpha 12, 8
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 40, 1
 	delay 6
-	panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	createvisualtask AnimTask_StartSinAnimTimer, 5, 100
 	call HydroPumpBeams
 	call HydroPumpBeams
@@ -5655,7 +5655,7 @@ Move_SIGNAL_BEAM:
 	loadspritegfx ANIM_TAG_DUCK
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 25, 1
 	delay 6
-	panse_1B SE_W062, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
+	panse_1B SE_M_BUBBLE_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
 	createvisualtask AnimTask_StartSinAnimTimer, 5, 100
 	call SignalBeamOrbs
 	call SignalBeamOrbs
@@ -5699,7 +5699,7 @@ Move_ABSORB:
 	setalpha 12, 8
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB(13, 31, 12)
 	waitforvisualfinish
-	playsewithpan SE_W071, SOUND_PAN_TARGET
+	playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
 	delay 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
@@ -5717,28 +5717,28 @@ Move_ABSORB:
 	end
 
 AbsorbEffect:
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
 	delay 4
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
 	delay 4
 	return
@@ -5752,7 +5752,7 @@ Move_MEGA_DRAIN:
 	setalpha 12, 8
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 8, RGB(13, 31, 12)
 	waitforvisualfinish
-	playsewithpan SE_W071, SOUND_PAN_TARGET
+	playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
 	delay 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
@@ -5770,35 +5770,35 @@ Move_MEGA_DRAIN:
 	end
 
 MegaDrainAbsorbEffect:
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
 	delay 4
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
 	delay 4
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	delay 4
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	delay 4
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
 	delay 4
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
 	delay 4
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	delay 4
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
 	delay 4
@@ -5813,7 +5813,7 @@ Move_GIGA_DRAIN:
 	setalpha 12, 8
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 12, RGB(13, 31, 12)
 	waitforvisualfinish
-	playsewithpan SE_W071, SOUND_PAN_TARGET
+	playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0
 	delay 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
@@ -5831,42 +5831,42 @@ Move_GIGA_DRAIN:
 	end
 
 GigaDrainAbsorbEffect:
-	playsewithpan SE_W202, SOUND_PAN_TARGET
+	playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
 	delay 4
-	playsewithpan SE_W202, SOUND_PAN_TARGET
+	playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39
 	delay 4
-	playsewithpan SE_W202, SOUND_PAN_TARGET
+	playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26
 	delay 4
-	playsewithpan SE_W202, SOUND_PAN_TARGET
+	playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	delay 4
-	playsewithpan SE_W202, SOUND_PAN_TARGET
+	playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	delay 4
-	playsewithpan SE_W202, SOUND_PAN_TARGET
+	playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26
 	delay 4
-	playsewithpan SE_W202, SOUND_PAN_TARGET
+	playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
 	delay 4
-	playsewithpan SE_W202, SOUND_PAN_TARGET
+	playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
@@ -5886,7 +5886,7 @@ Move_LEECH_LIFE:
 	createsprite gLeechLifeNeedleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 12
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
-	playsewithpan SE_W071, SOUND_PAN_TARGET
+	playsewithpan SE_M_ABSORB, SOUND_PAN_TARGET
 	delay 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
 	waitforvisualfinish
@@ -5906,7 +5906,7 @@ Move_LEECH_LIFE:
 Move_SYNTHESIS:
 	loadspritegfx ANIM_TAG_SPARKLE_2
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 16, RGB(27, 31, 18)
-	playsewithpan SE_W025, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
 	call GrantingStarsEffect
 	waitforvisualfinish
 	unloadspritegfx ANIM_TAG_SPARKLE_2
@@ -5928,22 +5928,22 @@ Move_TOXIC:
 	end
 ToxicBubbles:
 	createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -24, 16, 1, 1
-	playsewithpan SE_W092, SOUND_PAN_TARGET
+	playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET
 	delay 15
 	createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, 8, 16, 1, 1
-	playsewithpan SE_W092, SOUND_PAN_TARGET
+	playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET
 	delay 15
 	createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -8, 16, 1, 1
-	playsewithpan SE_W092, SOUND_PAN_TARGET
+	playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET
 	delay 15
 	createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, 24, 16, 1, 1
-	playsewithpan SE_W092, SOUND_PAN_TARGET
+	playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET
 	delay 15
 	return
 
 Move_SLUDGE:
 	loadspritegfx ANIM_TAG_POISON_BUBBLE
-	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
 	createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 5, 1
@@ -5970,19 +5970,19 @@ Move_SLUDGE_BOMB:
 	createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20
 	createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20
 	createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20
-	playsewithpan SE_W091, SOUND_PAN_TARGET
+	playsewithpan SE_M_DIG, SOUND_PAN_TARGET
 	delay 5
 	createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 0, 40, 20
 	createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -8, -44, 20
 	createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -46, -28, 20
 	createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 46, 9, 20
-	playsewithpan SE_W091, SOUND_PAN_TARGET
+	playsewithpan SE_M_DIG, SOUND_PAN_TARGET
 	delay 5
 	createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 0, 20
 	createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -43, -12, 20
 	createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 16, -46, 20
 	createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -16, 44, 20
-	playsewithpan SE_W091, SOUND_PAN_TARGET
+	playsewithpan SE_M_DIG, SOUND_PAN_TARGET
 	delay 0
 	waitsound
 	waitforvisualfinish
@@ -5990,7 +5990,7 @@ Move_SLUDGE_BOMB:
 	waitforvisualfinish
 	end
 SludgeBombProjectile:
-	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
 	createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0
 	delay 3
 	return
@@ -5999,31 +5999,31 @@ Move_ACID:
 	loadspritegfx ANIM_TAG_POISON_BUBBLE
 	monbg ANIM_DEF_PARTNER
 	createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 0, 0
-	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 24, 0
-	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, -24, 0
-	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
 	delay 15
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_DEF_PARTNER, 2, 0, 10, 1
 	createvisualtask AnimTask_BlendColorCycle, 2, 20, 2, 2, 0, 12, RGB(30, 0, 31)
 	createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -22, 0, 15, 55
-	playsewithpan SE_W145, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
 	delay 10
 	createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, -26, -24, 0, 15, 55
-	playsewithpan SE_W145, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
 	delay 10
 	createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 15, -27, 0, 15, 50
-	playsewithpan SE_W145, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
 	delay 10
 	createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, -15, -17, 0, 10, 45
-	playsewithpan SE_W145, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
 	delay 10
 	createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 27, -22, 0, 15, 50
-	playsewithpan SE_W145, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	end
@@ -6034,14 +6034,14 @@ Move_BONEMERANG:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W155, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BONEMERANG, SOUND_PAN_ATTACKER
 	createsprite gBonemerangSpriteTemplate, ANIM_ATTACKER, 2
 	delay 20
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 5, 1
 	delay 17
-	playsewithpan SE_W233, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, -4
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -6054,13 +6054,13 @@ Move_BONE_CLUB:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W155, SOUND_PAN_TARGET
+	playsewithpan SE_M_BONEMERANG, SOUND_PAN_TARGET
 	createsprite gSpinningBoneSpriteTemplate, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15
 	delay 12
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, RGB_BLACK, 10, 0, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6071,12 +6071,12 @@ Move_BONE_RUSH:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W155, SOUND_PAN_TARGET
+	playsewithpan SE_M_BONEMERANG, SOUND_PAN_TARGET
 	createsprite gSpinningBoneSpriteTemplate, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15
 	delay 12
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 5, 1
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6085,15 +6085,15 @@ Move_BONE_RUSH:
 Move_SPIKES:
 	loadspritegfx ANIM_TAG_SPIKES
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W026, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28
 	createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 30
 	delay 10
-	playsewithpan SE_W026, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28
 	createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, -24, 24, 30
 	delay 10
-	waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28
+	waitplaysewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET, 28
 	createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 24, 24, 30
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -6103,7 +6103,7 @@ Move_MEGAHORN:
 	loadspritegfx ANIM_TAG_HORN_HIT_2
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W082, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
 	jumpifcontest MegahornInContest
 	fadetobg BG_DRILL
 	waitbgfadeout
@@ -6118,7 +6118,7 @@ MegahornContinue:
 	delay 3
 	createsprite gMegahornHornSpriteTemplate, ANIM_ATTACKER, 3, -42, 25, 0, 0, 6
 	delay 4
-	playsewithpan SE_W011, SOUND_PAN_TARGET
+	playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 4, 1, 4
 	waitforvisualfinish
@@ -6148,13 +6148,13 @@ Move_GUST:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W016, SOUND_PAN_TARGET
+	playsewithpan SE_M_GUST, SOUND_PAN_TARGET
 	createsprite gEllipticalGustSpriteTemplate, ANIM_ATTACKER, 2, 0, -16
 	createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 7, 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
-	playsewithpan SE_W016B, SOUND_PAN_TARGET
+	playsewithpan SE_M_GUST2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6166,7 +6166,7 @@ Move_WING_ATTACK:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2
+	loopsewithpan SE_M_WING_ATTACK, SOUND_PAN_ATTACKER, 20, 2
 	createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4
 	createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70
 	createsprite gGustToTargetSpriteTemplate, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20
@@ -6176,7 +6176,7 @@ Move_WING_ATTACK:
 	delay 17
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, ANIM_TARGET, 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, ANIM_TARGET, 1
-	loopsewithpan SE_W003, SOUND_PAN_TARGET, 5, 2
+	loopsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET, 5, 2
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11
 	waitforvisualfinish
@@ -6186,7 +6186,7 @@ Move_WING_ATTACK:
 
 Move_PECK:
 	loadspritegfx ANIM_TAG_IMPACT
-	playsewithpan SE_W030, SOUND_PAN_TARGET
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
 	createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 3, -768, ANIM_TARGET, 2
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 0, ANIM_TARGET, 3
 	waitforvisualfinish
@@ -6207,7 +6207,7 @@ Move_AEROBLAST:
 	call AeroblastBeam
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6215,19 +6215,19 @@ Move_AEROBLAST:
 	call UnsetSkyBg
 	end
 AeroblastBeam:
-	playsewithpan SE_W026, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
 	createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 0, 0
 	createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 0, 0
 	delay 3
-	playsewithpan SE_W026, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
 	createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 1, 0
 	createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 1, 0
 	delay 3
-	playsewithpan SE_W026, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
 	createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 2, 0
 	createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 2, 0
 	delay 3
-	playsewithpan SE_W026, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
 	createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 3, 0
 	createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 3, 0
 	delay 3
@@ -6240,18 +6240,18 @@ Move_WATER_GUN:
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
 	createsprite gWaterGunProjectileSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 40, -25
-	playsewithpan SE_W145, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 1, 0, 8, 1
 	createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 2
 	createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, 0, -15, 0, 15, 55
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	delay 10
 	createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, 15, -20, 0, 15, 50
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	delay 10
 	createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, -15, -10, 0, 10, 45
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6263,7 +6263,7 @@ Move_CRABHAMMER:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	delay 1
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB(13, 21, 31), 10, 0, 0
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4
@@ -6272,7 +6272,7 @@ Move_CRABHAMMER:
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 4
 	waitforvisualfinish
-	loopsewithpan SE_W152, SOUND_PAN_TARGET, 20, 3
+	loopsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET, 20, 3
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1
 	createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 20, ANIM_TARGET
 	delay 4
@@ -6297,7 +6297,7 @@ Move_CRABHAMMER:
 Move_SURF:
 	createvisualtask AnimTask_CreateSurfWave, 2, FALSE
 	delay 24
-	panse_1B SE_W057, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	waitforvisualfinish
 	end
 
@@ -6309,7 +6309,7 @@ Move_FLAMETHROWER:
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
 	delay 6
 	createvisualtask AnimTask_StartSinAnimTimer, 5, 100
-	panse_1B SE_W053, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	call FlamethrowerCreateFlames
 	call FlamethrowerCreateFlames
 	call FlamethrowerCreateFlames
@@ -6337,7 +6337,7 @@ FlamethrowerCreateFlames:
 @ Also used by Sandstorm weather
 Move_SANDSTORM:
 	loadspritegfx ANIM_TAG_FLYING_DIRT
-	playsewithpan SE_W201, 0
+	playsewithpan SE_M_SANDSTORM, 0
 	createvisualtask AnimTask_LoadSandstormBackground, 5, FALSE
 	delay 16
 	createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 10, 2304, 96, 0
@@ -6362,7 +6362,7 @@ Move_WHIRLPOOL:
 	setalpha 12, 8
 	delay 0
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23)
-	playsewithpan SE_W250, SOUND_PAN_TARGET
+	playsewithpan SE_M_WHIRLPOOL, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1
 	call WhirlpoolEffect
 	call WhirlpoolEffect
@@ -6397,19 +6397,19 @@ FlyEnd:
 	end
 
 FlySetUp:
-	playsewithpan SE_W019, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
 	createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336
 	goto FlyEnd
 
 FlyUnleash:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	createsprite gFlyBallAttackSpriteTemplate, ANIM_ATTACKER, 2, 20
 	delay 20
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6423,17 +6423,17 @@ BounceEnd:
 	end
 
 BounceSetUp:
-	playsewithpan SE_W100, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
 	createsprite gBounceBallShrinkSpriteTemplate, ANIM_ATTACKER, 2, 0, 0
 	goto BounceEnd
 
 BounceUnleash:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gBounceBallLandSpriteTemplate, ANIM_TARGET, 3
 	delay 7
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1
 	waitforvisualfinish
@@ -6447,10 +6447,10 @@ Move_KARATE_CHOP:
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W104, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
 	createsprite gKarateChopSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0
 	waitforvisualfinish
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
 	waitforvisualfinish
@@ -6463,11 +6463,11 @@ Move_CROSS_CHOP:
 	loadspritegfx ANIM_TAG_CROSS_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W025, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET
 	createsprite gCrossChopHandSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0
 	createsprite gCrossChopHandSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1
 	delay 40
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10
 	createsprite gCrossImpactSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 20
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1
@@ -6484,11 +6484,11 @@ Move_JUMP_KICK:
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4
 	delay 3
 	createsprite gJumpKickSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, ANIM_TARGET, 1, 1
-	playsewithpan SE_W026, SOUND_PAN_TARGET
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6505,10 +6505,10 @@ Move_HI_JUMP_KICK:
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 3
 	delay 2
 	createsprite gJumpKickSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, ANIM_TARGET, 1, 1
-	playsewithpan SE_W026, SOUND_PAN_TARGET
+	playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3
 	delay 3
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1
@@ -6527,7 +6527,7 @@ Move_DOUBLE_KICK:
 	setalpha 12, 8
 	createsprite gFistFootRandomPosSpriteTemplate, ANIM_ATTACKER, 3, 1, 20, 1
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -6538,7 +6538,7 @@ Move_TRIPLE_KICK:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	jumpifmoveturn 0, TripleKickLeft
 	jumpifmoveturn 1, TripleKickRight
 	goto TripleKickCenter
@@ -6574,26 +6574,26 @@ Move_DYNAMIC_PUNCH:
 	delay 1
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 20, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 7, 1
 	delay 1
 	waitsound
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 5, 0, 28, 1
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -6606,23 +6606,23 @@ Move_COUNTER:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 4
-	playsewithpan SE_W233, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4
 	delay 4
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -15, 18, ANIM_TARGET, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	delay 1
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 25, 1
 	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -15, 18, 8, 1, 0
 	delay 3
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -4, ANIM_TARGET, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	delay 1
 	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 8, 1, 0
 	delay 3
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 15, 9, ANIM_TARGET, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	delay 1
 	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 15, 9, 8, 1, 0
 	delay 5
@@ -6636,13 +6636,13 @@ Move_VITAL_THROW:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W233, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 1, 2
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4
 	delay 2
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	delay 1
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4
 	waitforvisualfinish
@@ -6664,10 +6664,10 @@ Move_ROCK_SMASH:
 	delay 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
 	createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 8, 1, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1
 	waitforvisualfinish
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 20, 24, 14, 2
 	createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 5, 0, -20, 24, 14, 1
 	createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 0, 5, 20, -24, 14, 2
@@ -6686,16 +6686,16 @@ Move_SUBMISSION:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 10
-	waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 20
-	waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 30
-	waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 40
-	waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 50
-	waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 60
-	waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 70
-	waitplaysewithpan SE_W104, SOUND_PAN_ATTACKER, 80
-	waitplaysewithpan SE_W004, SOUND_PAN_TARGET, 90
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 10
+	waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 20
+	waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 30
+	waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 40
+	waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 50
+	waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 60
+	waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 70
+	waitplaysewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 80
+	waitplaysewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 90
 	createvisualtask AnimTask_TranslateMonElliptical, 2, 0, -18, 6, 6, 4
 	createvisualtask AnimTask_TranslateMonElliptical, 2, 1, 18, 6, 6, 4
 	call SubmissionHit
@@ -6722,7 +6722,7 @@ Move_SUNNY_DAY:
 	setalpha 13, 3
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 1, 0, 6, RGB_WHITE
 	waitforvisualfinish
-	panse_26 SE_W080, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
+	panse_26 SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
 	call SunnyDayLightRay
 	call SunnyDayLightRay
 	call SunnyDayLightRay
@@ -6743,7 +6743,7 @@ Move_COTTON_SPORE:
 	loadspritegfx ANIM_TAG_SPORE
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	loopsewithpan SE_W077, SOUND_PAN_TARGET, 18, 10
+	loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 18, 10
 	call CreateCottonSpores
 	call CreateCottonSpores
 	call CreateCottonSpores
@@ -6765,7 +6765,7 @@ Move_SPORE:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	createvisualtask AnimTask_SporeDoubleBattle, 2
-	loopsewithpan SE_W077, SOUND_PAN_TARGET, 16, 11
+	loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 16, 11
 	call CreateSpore
 	call CreateSpore
 	call CreateSpore
@@ -6789,7 +6789,7 @@ Move_PETAL_DANCE:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W080, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3
 	createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140
 	createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 8, 100
@@ -6811,7 +6811,7 @@ Move_PETAL_DANCE:
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 5
 	delay 3
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 0
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1
 	waitforvisualfinish
@@ -6829,7 +6829,7 @@ Move_RAZOR_LEAF:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	delay 1
-	loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5
+	loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER, 10, 5
 	createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10
 	delay 2
 	createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15
@@ -6850,11 +6850,11 @@ Move_RAZOR_LEAF:
 	delay 2
 	createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8
 	delay 60
-	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
 	createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1
 	createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1
 	delay 20
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 8, 1
 	waitforvisualfinish
@@ -6878,7 +6878,7 @@ Move_ANCIENT_POWER:
 	createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 20, 32, -28, 60, 1
 	createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, -28, 30, 4
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 30, 1
-	playsewithpan SE_W082, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
 	delay 10
 	createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 15, 32, -48, 25, 5
 	createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, -10, 32, -42, 30, 4
@@ -6888,7 +6888,7 @@ Move_ANCIENT_POWER:
 	waitforvisualfinish
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 0, 0, 4
 	delay 3
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
@@ -6901,10 +6901,10 @@ Move_ANCIENT_POWER:
 Move_OCTAZOOKA:
 	loadspritegfx ANIM_TAG_GRAY_SMOKE
 	loadspritegfx ANIM_TAG_BLACK_BALL
-	playsewithpan SE_W025B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_ATTACKER
 	createsprite gOctazookaBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0
 	waitforvisualfinish
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, 8, 8, 1, 0
 	delay 2
 	createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, -8, -8, 1, 0
@@ -6919,7 +6919,7 @@ Move_MIST:
 	loadspritegfx ANIM_TAG_MIST_CLOUD
 	monbg ANIM_ATK_PARTNER
 	setalpha 12, 8
-	loopsewithpan SE_W054, SOUND_PAN_ATTACKER, 20, 15
+	loopsewithpan SE_M_MIST, SOUND_PAN_ATTACKER, 20, 15
 	call MistCloud
 	call MistCloud
 	call MistCloud
@@ -6941,7 +6941,7 @@ MistCloud:
 
 Move_HAZE:
 	waitforvisualfinish
-	playsewithpan SE_W114, 0
+	playsewithpan SE_M_HAZE, 0
 	createvisualtask AnimTask_HazeScrollingFog, 5
 	delay 30
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x780, 2, 0, 16, RGB_BLACK
@@ -6960,14 +6960,14 @@ Move_FIRE_PUNCH:
 	createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 64
 	createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 128
 	createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 196
-	playsewithpan SE_W172, SOUND_PAN_TARGET
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 8, 1, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
 	call FireSpreadEffect
 	delay 4
-	playsewithpan SE_W007, SOUND_PAN_TARGET
+	playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 9, 0, RGB_RED
 	waitforvisualfinish
@@ -6990,7 +6990,7 @@ Move_LEER:
 	monbg ANIM_ATTACKER
 	monbgprio_28 ANIM_ATTACKER
 	setalpha 8, 8
-	playsewithpan SE_W043, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
 	createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 24, -12
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1
 	waitforvisualfinish
@@ -7009,10 +7009,10 @@ Move_DREAM_EATER:
 	loadspritegfx ANIM_TAG_BLUE_STAR
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	call SetPsychicBackground
 	setalpha 8, 8
-	playsewithpan SE_W107, SOUND_PAN_TARGET
+	playsewithpan SE_M_MINIMIZE, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1
 	waitforvisualfinish
@@ -7029,42 +7029,42 @@ Move_DREAM_EATER:
 	call UnsetPsychicBackground
 	end
 DreamEaterAbsorb:
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
 	delay 4
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39
 	delay 4
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26
 	delay 4
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	delay 4
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	delay 4
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26
 	delay 4
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39
 	delay 4
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26
 	createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35
@@ -7079,25 +7079,25 @@ Move_POISON_GAS:
 	monbgprio_29
 	setalpha 12, 8
 	delay 0
-	playsewithpan SE_W054, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER
 	createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 4
-	playsewithpan SE_W054, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER
 	createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 4
-	playsewithpan SE_W054, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER
 	createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 4
-	playsewithpan SE_W054, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER
 	createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 4
-	playsewithpan SE_W054, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER
 	createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 4
-	playsewithpan SE_W054, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MIST, SOUND_PAN_ATTACKER
 	createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0
 	delay 40
-	loopsewithpan SE_W054, SOUND_PAN_TARGET, 28, 6
+	loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 28, 6
 	createvisualtask AnimTask_BlendColorCycle, 2, 4, 6, 2, 0, 12, RGB(26, 0, 26)
 	waitforvisualfinish
 	blendoff
@@ -7110,7 +7110,7 @@ Move_BIND:
 	goto BindWrap
 
 BindWrap:
-	playsewithpan SE_W020, SOUND_PAN_TARGET
+	playsewithpan SE_M_BIND, SOUND_PAN_TARGET
 	call BindWrapSqueezeTarget
 	call BindWrapSqueezeTarget
 	waitforvisualfinish
@@ -7126,9 +7126,9 @@ Move_WRAP:
 
 Move_PSYBEAM:
 	loadspritegfx ANIM_TAG_GOLD_RING
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	call SetPsychicBackground
-	createsoundtask SoundTask_LoopSEAdjustPanning, SE_W060B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
+	createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 3, 4, 0, 15
 	call PsybeamRings
 	call PsybeamRings
 	createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET
@@ -7163,7 +7163,7 @@ Move_HYPNOSIS:
 	call UnsetPsychicBackground
 	end
 HypnosisRings:
-	playsewithpan SE_W048, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
 	createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 0, 8, 27, 0
 	createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0, -8, 27, 0
 	delay 6
@@ -7171,10 +7171,10 @@ HypnosisRings:
 
 Move_PSYWAVE:
 	loadspritegfx ANIM_TAG_BLUE_RING
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	call SetPsychicBackground
 	createvisualtask AnimTask_StartSinAnimTimer, 5, 100
-	createsoundtask SoundTask_LoopSEAdjustPanning, SE_W100, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
+	createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_TELEPORT, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 9, 0, 10
 	call PsywaveRings
 	call PsywaveRings
 	createvisualtask AnimTask_BlendColorCycle, 2, 4, 1, 4, 0, 12, RGB(31, 18, 31)
@@ -7196,7 +7196,7 @@ PsywaveRings:
 Move_ZAP_CANNON:
 	loadspritegfx ANIM_TAG_BLACK_BALL_2
 	loadspritegfx ANIM_TAG_SPARK_2
-	playsewithpan SE_W086, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_ATTACKER
 	createsprite gZapCannonBallSpriteTemplate, ANIM_TARGET, 3, 10, 0, 0, 0, 30, 0
 	createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0
 	createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 64, 40, 1
@@ -7209,7 +7209,7 @@ Move_ZAP_CANNON:
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
 	delay 15
-	waitplaysewithpan SE_W085B, SOUND_PAN_TARGET, 19
+	waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19
 	call ElectricityEffect
 	waitforvisualfinish
 	end
@@ -7217,13 +7217,13 @@ Move_ZAP_CANNON:
 Move_STEEL_WING:
 	loadspritegfx ANIM_TAG_GUST
 	loadspritegfx ANIM_TAG_IMPACT
-	loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
+	loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
 	createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
 	waitforvisualfinish
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
-	loopsewithpan SE_W017, SOUND_PAN_ATTACKER, 20, 2
+	loopsewithpan SE_M_WING_ATTACK, SOUND_PAN_ATTACKER, 20, 2
 	createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4
 	createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70
 	createsprite gGustToTargetSpriteTemplate, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20
@@ -7233,7 +7233,7 @@ Move_STEEL_WING:
 	delay 17
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, ANIM_TARGET, 1
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, ANIM_TARGET, 1
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11
 	waitforvisualfinish
@@ -7243,7 +7243,7 @@ Move_STEEL_WING:
 
 Move_IRON_TAIL:
 	loadspritegfx ANIM_TAG_IMPACT
-	loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
+	loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
 	createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0
 	waitforvisualfinish
 	monbg ANIM_TARGET
@@ -7252,7 +7252,7 @@ Move_IRON_TAIL:
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
 	clearmonbg ANIM_TARGET
@@ -7263,7 +7263,7 @@ Move_IRON_TAIL:
 Move_POISON_TAIL:
 	loadspritegfx ANIM_TAG_IMPACT
 	loadspritegfx ANIM_TAG_POISON_BUBBLE
-	loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
+	loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
 	createvisualtask AnimTask_MetallicShine, 5, 1, 1, RGB(24, 6, 23)
 	waitforvisualfinish
 	monbg ANIM_TARGET
@@ -7272,7 +7272,7 @@ Move_POISON_TAIL:
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
 	clearmonbg ANIM_TARGET
@@ -7283,19 +7283,19 @@ Move_POISON_TAIL:
 
 Move_METAL_CLAW:
 	loadspritegfx ANIM_TAG_CLAW_SLASH
-	loopsewithpan SE_W231, SOUND_PAN_ATTACKER, 28, 2
+	loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
 	createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0
 	waitforvisualfinish
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
 	delay 2
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0
 	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1
 	delay 8
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
 	delay 2
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1
 	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1
@@ -7305,11 +7305,11 @@ Move_METAL_CLAW:
 Move_NIGHT_SHADE:
 	monbg ANIM_ATTACKER
 	monbgprio_28 ANIM_ATTACKER
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	fadetobg BG_GHOST
 	waitbgfadein
 	delay 10
-	playsewithpan SE_W043, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_NightShadeClone, 5, 85
 	delay 70
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1
@@ -7324,24 +7324,24 @@ Move_NIGHT_SHADE:
 Move_EGG_BOMB:
 	loadspritegfx ANIM_TAG_EXPLOSION
 	loadspritegfx ANIM_TAG_LARGE_FRESH_EGG
-	playsewithpan SE_W039, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	createsprite gEggThrowSpriteTemplate, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 16, 1
 	createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 6, 5, 1, 0
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	delay 3
 	createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -16, -15, 1, 0
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	delay 3
 	createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 16, -5, 1, 0
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	delay 3
 	createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -12, 18, 1, 0
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	delay 3
 	createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 0, 5, 1, 0
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	delay 3
 	waitforvisualfinish
 	end
@@ -7351,10 +7351,10 @@ Move_SHADOW_BALL:
 	fadetobg BG_GHOST
 	waitbgfadein
 	delay 15
-	createsoundtask SoundTask_LoopSEAdjustPanning, SE_W054, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
+	createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_MIST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 5, 0, 5
 	createsprite gShadowBallSpriteTemplate, ANIM_TARGET, 2, 16, 16, 8
 	waitforvisualfinish
-	playsewithpan SE_W028, SOUND_PAN_TARGET
+	playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1
 	waitforvisualfinish
 	restorebg
@@ -7364,7 +7364,7 @@ Move_SHADOW_BALL:
 Move_LICK:
 	loadspritegfx ANIM_TAG_LICK
 	delay 15
-	playsewithpan SE_W122, SOUND_PAN_TARGET
+	playsewithpan SE_M_LICK, SOUND_PAN_TARGET
 	createsprite gLickSpriteTemplate, ANIM_TARGET, 2, 0, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 16, 1
 	waitforvisualfinish
@@ -7372,7 +7372,7 @@ Move_LICK:
 
 Move_FOCUS_ENERGY:
 	loadspritegfx ANIM_TAG_FOCUS_ENERGY
-	playsewithpan SE_W082, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
 	call EndureEffect
 	delay 8
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 11, RGB_WHITE
@@ -7387,7 +7387,7 @@ Move_BIDE:
 	choosetwoturnanim BideSetUp, BideUnleash
 	end
 BideSetUp:
-	loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2
+	loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 9, 2
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 11, RGB_RED
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
 	waitforvisualfinish
@@ -7397,7 +7397,7 @@ BideUnleash:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 9, 2
+	loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER, 9, 2
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 2, 0, 11, RGB_RED
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
 	waitforvisualfinish
@@ -7405,13 +7405,13 @@ BideUnleash:
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 12, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 16, 1
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 18, -8, ANIM_TARGET, 1
 	delay 5
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -18, 8, ANIM_TARGET, 1
 	delay 5
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -8, -5, ANIM_TARGET, 1
 	waitforvisualfinish
 	delay 5
@@ -7430,7 +7430,7 @@ Move_STRING_SHOT:
 	delay 0
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK
 	waitforvisualfinish
-	loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6
+	loopsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER, 9, 6
 	call StringShotThread
 	call StringShotThread
 	call StringShotThread
@@ -7450,7 +7450,7 @@ Move_STRING_SHOT:
 	call StringShotThread
 	call StringShotThread
 	waitforvisualfinish
-	playsewithpan SE_W081B, SOUND_PAN_TARGET
+	playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET
 	createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, 10
 	delay 4
 	createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, -2
@@ -7476,7 +7476,7 @@ Move_SPIDER_WEB:
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, RGB_BLACK
 	waitforvisualfinish
 	monbgprio_28 ANIM_TARGET
-	loopsewithpan SE_W081, SOUND_PAN_ATTACKER, 9, 6
+	loopsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER, 9, 6
 	call SpiderWebThread
 	call SpiderWebThread
 	call SpiderWebThread
@@ -7492,7 +7492,7 @@ Move_SPIDER_WEB:
 	call SpiderWebThread
 	call SpiderWebThread
 	waitforvisualfinish
-	playsewithpan SE_W081B, SOUND_PAN_TARGET
+	playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET
 	createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -7513,12 +7513,12 @@ RazorWindEnd:
 
 RazorWindSetUp:
 	loadspritegfx ANIM_TAG_GUST
-	playsewithpan SE_W016, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER
 	createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40
 	createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40
 	createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40
 	waitforvisualfinish
-	playsewithpan SE_W016B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER
 	goto RazorWindEnd
 
 RazorWindUnleash:
@@ -7526,16 +7526,16 @@ RazorWindUnleash:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
 	createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, 8, 0, 0, 22, 2, 1
 	delay 2
-	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
 	createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -8, 16, 14, 22, 1, 1
 	delay 2
-	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
 	createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, 12, -16, -14, 22, 0, 1
 	delay 17
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 10, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 10, 1
 	waitforvisualfinish
@@ -7548,11 +7548,11 @@ Move_DISABLE:
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
 	setalpha 8, 8
-	playsewithpan SE_W197, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
 	createsprite gSpinningSparkleSpriteTemplate, ANIM_ATTACKER, 13, 24, -16
 	waitforvisualfinish
 	createvisualtask AnimTask_GrowAndGreyscale, 5
-	loopsewithpan SE_W020, SOUND_PAN_TARGET, 15, 4
+	loopsewithpan SE_M_BIND, SOUND_PAN_TARGET, 15, 4
 	waitforvisualfinish
 	delay 1
 	clearmonbg ANIM_TARGET
@@ -7564,7 +7564,7 @@ Move_RECOVER:
 	loadspritegfx ANIM_TAG_BLUE_STAR
 	monbg ANIM_ATK_PARTNER
 	setalpha 12, 8
-	loopsewithpan SE_W025, SOUND_PAN_ATTACKER, 13, 3
+	loopsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER, 13, 3
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 6, 0, 11, RGB(31, 31, 11)
 	call RecoverAbsorbEffect
 	call RecoverAbsorbEffect
@@ -7599,14 +7599,14 @@ Move_MIMIC:
 	setalpha 11, 5
 	monbg_22 ANIM_DEF_PARTNER
 	monbgprio_29
-	panse_1B SE_W107, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0
+	panse_1B SE_M_MINIMIZE, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0
 	createvisualtask AnimTask_ShrinkTargetCopy, 5, 128, 24
 	delay 15
 	createsprite gMimicOrbSpriteTemplate, ANIM_TARGET, 2, -12, 24
 	delay 10
 	setarg 7, 0xFFFF
 	waitforvisualfinish
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 2, 0, 11, RGB_WHITE
 	waitforvisualfinish
 	clearmonbg_23 ANIM_DEF_PARTNER
@@ -7615,7 +7615,7 @@ Move_MIMIC:
 
 Move_CONSTRICT:
 	loadspritegfx ANIM_TAG_TENDRILS
-	loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 4
+	loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 4
 	createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2
 	delay 7
 	createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 2
@@ -7625,7 +7625,7 @@ Move_CONSTRICT:
 	delay 8
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
 	delay 20
-	playsewithpan SE_W020, SOUND_PAN_TARGET
+	playsewithpan SE_M_BIND, SOUND_PAN_TARGET
 	setarg 7, 0xFFFF
 	waitforvisualfinish
 	end
@@ -7650,7 +7650,7 @@ CurseGhost:
 	clearmonbg ANIM_ATK_PARTNER
 	delay 1
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W171, SOUND_PAN_TARGET
+	playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET
 	createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1
 	waitforvisualfinish
@@ -7660,7 +7660,7 @@ CurseGhost:
 	end
 CurseGhostShakeFromNail:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 4, 0, 10, 0
-	playsewithpan SE_W020, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BIND, SOUND_PAN_ATTACKER
 	return
 CurseStats:
 	createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, ANIM_ATTACKER
@@ -7670,7 +7670,7 @@ CurseStats:
 	waitforvisualfinish
 	end
 CurseStats1:
-	playsewithpan SE_W082, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_DrawFallingWhiteLinesOnAttacker, 5
 	createvisualtask AnimTask_BlendColorCycle, 5, 2, 4, 2, 0, 10, RGB_RED
 	return
@@ -7680,13 +7680,13 @@ Move_SOFT_BOILED:
 	loadspritegfx ANIM_TAG_THIN_RING
 	loadspritegfx ANIM_TAG_BLUE_STAR
 	monbg ANIM_ATK_PARTNER
-	playsewithpan SE_W039, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 6, 1
 	createsprite gSoftBoiledEggSpriteTemplate, ANIM_ATTACKER, 4, 0, 16, 0
 	createsprite gSoftBoiledEggSpriteTemplate, ANIM_ATTACKER, 4, 0, 16, 1
 	delay 120
 	delay 7
-	playsewithpan SE_W030, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_ATTACKER
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30)
 	createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 31, 16, 0, 1
 	delay 8
@@ -7731,14 +7731,14 @@ Move_HEAL_BELL:
 	unloadspritegfx ANIM_TAG_MUSIC_NOTES_2
 	unloadspritegfx ANIM_TAG_THIN_RING
 	loadspritegfx ANIM_TAG_SPARKLE_2
-	playsewithpan SE_W234, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
 	createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1
 	delay 8
 	createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1
 	waitforvisualfinish
 	unloadspritegfx ANIM_TAG_SPARKLE_2
 	loadspritegfx ANIM_TAG_THIN_RING
-	playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER
+	playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 3, 10, 0, RGB(12, 24, 30)
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 10, 3, 10, 0, RGB_WHITE
 	createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1
@@ -7747,14 +7747,14 @@ HealBellRing:
 	createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 4, 3, 8, 0, RGB(12, 24, 30)
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 10, 3, 2, 10, RGB_WHITE
 	createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1
-	playsewithpan SE_W215, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER
 	return
 
 Move_FAKE_OUT:
-	playsewithpan SE_W260, 0
+	playsewithpan SE_M_FLATTER, 0
 	createvisualtask AnimTask_FakeOut, 5
 	waitforvisualfinish
-	playsewithpan SE_W166, SOUND_PAN_TARGET
+	playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
 	createvisualtask AnimTask_StretchTargetUp, 3
 	waitforvisualfinish
@@ -7764,17 +7764,17 @@ Move_FAKE_OUT:
 Move_SCARY_FACE:
 	loadspritegfx ANIM_TAG_EYE_SPARKLE
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 0, 16, RGB_BLACK
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 10
-	playsewithpan SE_W043, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaryFace, 5
 	delay 13
 	createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8
 	createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeTargetInPattern, 3, 20, 1, FALSE
-	playsewithpan SE_W081B, SOUND_PAN_TARGET
+	playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 16, 0, RGB_BLACK
 	waitforvisualfinish
 	end
@@ -7783,14 +7783,14 @@ Move_SWEET_KISS:
 	loadspritegfx ANIM_TAG_RED_HEART
 	loadspritegfx ANIM_TAG_ANGEL
 	createsprite gAngelSpriteTemplate, ANIM_TARGET, 2, 16, -48
-	playsewithpan SE_W215, SOUND_PAN_TARGET
+	playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET
 	delay 23
-	playsewithpan SE_W215, SOUND_PAN_TARGET
+	playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET
 	delay 23
-	playsewithpan SE_W215, SOUND_PAN_TARGET
+	playsewithpan SE_M_HEAL_BELL, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -30
-	playsewithpan SE_W213, SOUND_PAN_TARGET
+	playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET
 	createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -42
 	createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -14
 	createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38
@@ -7802,9 +7802,9 @@ Move_LOVELY_KISS:
 	loadspritegfx ANIM_TAG_PINK_HEART
 	loadspritegfx ANIM_TAG_DEVIL
 	createsprite gDevilSpriteTemplate, ANIM_TARGET, 2, 0, -24
-	playsewithpan SE_W060B, SOUND_PAN_TARGET
+	playsewithpan SE_M_PSYBEAM2, SOUND_PAN_TARGET
 	waitforvisualfinish
-	playsewithpan SE_W213, SOUND_PAN_TARGET
+	playsewithpan SE_M_ATTRACT, SOUND_PAN_TARGET
 	createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -256, -42
 	createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 128, -14
 	createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 416, -38
@@ -7815,13 +7815,13 @@ Move_FURY_SWIPES:
 	loadspritegfx ANIM_TAG_SWIPE
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5
 	delay 4
-	playsewithpan SE_W010, SOUND_PAN_TARGET
+	playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET
 	createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, 16, 0, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 5, 1
 	delay 10
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_TARGET, 2, 5, 5
 	delay 4
-	playsewithpan SE_W010, SOUND_PAN_TARGET
+	playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET
 	createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, -16, 0, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 7, 1
 	end
@@ -7830,28 +7830,28 @@ Move_INGRAIN:
 	loadspritegfx ANIM_TAG_ROOTS
 	loadspritegfx ANIM_TAG_ORBS
 	createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150
-	playsewithpan SE_W010, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER
 	delay 10
 	createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140
-	playsewithpan SE_W010, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER
 	delay 10
 	createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130
-	playsewithpan SE_W010, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER
 	delay 10
 	createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120
-	playsewithpan SE_W010, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER
 	delay 40
 	createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30
 	delay 5
-	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30
-	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
 	delay 5
-	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18
-	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
 	delay 10
 	waitforvisualfinish
 	end
@@ -7860,13 +7860,13 @@ Move_PRESENT:
 	loadspritegfx ANIM_TAG_ITEM_BAG
 	createvisualtask AnimTask_IsHealingMove, 2
 	createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1
-	playsewithpan SE_W039, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	delay 14
-	playsewithpan SE_W145B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE2, SOUND_PAN_ATTACKER
 	delay 14
-	playsewithpan SE_W145B, 0
+	playsewithpan SE_M_BUBBLE2, 0
 	delay 20
-	playsewithpan SE_W145B, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	jumpretfalse PresentDamage
 	jumprettrue PresentHeal
@@ -7874,26 +7874,26 @@ Move_PRESENT:
 
 PresentDamage:
 	loadspritegfx ANIM_TAG_EXPLOSION
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 24, -24, 1, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -16, 16, 1, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -24, -12, 1, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 16, 16, 1, 1
 	end
 
 PresentHeal:
 	loadspritegfx ANIM_TAG_GREEN_SPARKLE
 	loadspritegfx ANIM_TAG_BLUE_STAR
-	playsewithpan SE_W234, SOUND_PAN_TARGET
+	playsewithpan SE_M_MORNING_SUN, SOUND_PAN_TARGET
 	createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -16, 32, -3, 1
 	delay 3
 	createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 16, 32, -3, -1
@@ -7918,7 +7918,7 @@ PresentHeal:
 
 Move_BATON_PASS:
 	loadspritegfx ANIM_TAG_POKEBALL
-	playsewithpan SE_W226, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BATON_PASS, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_BlendColorCycle, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30)
 	createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2
 	end
@@ -7943,7 +7943,7 @@ Move_PERISH_SONG:
 	createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 240
 	createsprite gPerishSongMusicNote2SpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 0
 	delay 20
-	panse_1B SE_W195, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	delay 80
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK
 	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 0
@@ -7964,21 +7964,21 @@ Move_SLEEP_TALK:
 	createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER
 	delay 20
 	createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1
-	playsewithpan SE_W173, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1
 	delay 6
 	createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1
 	delay 20
 	createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5
-	playsewithpan SE_W173, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5
 	delay 6
 	createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5
 	delay 20
 	createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3
-	playsewithpan SE_W173, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER
 	delay 6
 	createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3
 	delay 6
@@ -7988,7 +7988,7 @@ Move_SLEEP_TALK:
 
 Move_HYPER_FANG:
 	loadspritegfx ANIM_TAG_FANG_ATTACK
-	playsewithpan SE_W044, SOUND_PAN_TARGET
+	playsewithpan SE_M_BITE, SOUND_PAN_TARGET
 	delay 1
 	delay 2
 	createvisualtask AnimTask_IsContest, 2
@@ -8001,7 +8001,7 @@ HyperFangContinue:
 	createsprite gFangSpriteTemplate, ANIM_TARGET, 2
 	waitbgfadein
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1
-	playsewithpan SE_W043, SOUND_PAN_TARGET
+	playsewithpan SE_M_LEER, SOUND_PAN_TARGET
 	delay 20
 	restorebg
 	waitbgfadein
@@ -8020,17 +8020,17 @@ HyperFangInContest:
 Move_TRI_ATTACK:
 	loadspritegfx ANIM_TAG_TRI_ATTACK_TRIANGLE
 	createsprite gTriAttackTriangleSpriteTemplate, ANIM_TARGET, 2, 16, 0
-	playsewithpan SE_W161, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER
 	delay 20
-	playsewithpan SE_W161, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER
 	delay 20
-	createsoundtask SoundTask_LoopSEAdjustPanning, SE_W161, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
+	createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 6, 0, 7
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, RGB_BLACK
 	delay 16
 	loadspritegfx ANIM_TAG_FIRE
 	createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0
-	playsewithpan SE_W172B, SOUND_PAN_TARGET
+	playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET
 	createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1
 	delay 1
 	createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, -1
@@ -8049,7 +8049,7 @@ Move_TRI_ATTACK:
 	waitforvisualfinish
 	loadspritegfx ANIM_TAG_LIGHTNING
 	createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257
-	playsewithpan SE_W161B, SOUND_PAN_TARGET
+	playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
 	createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -48
 	delay 1
 	createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16
@@ -8071,8 +8071,8 @@ Move_WILL_O_WISP:
 	loadspritegfx ANIM_TAG_WISP_ORB
 	monbg ANIM_DEF_PARTNER
 	monbgprio_2A ANIM_TARGET
-	playsewithpan SE_W052, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W052, SOUND_PAN_ATTACKER, 10
+	playsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_EMBER, SOUND_PAN_ATTACKER, 10
 	createvisualtask SoundTask_AdjustPanningVar, 2, SOUND_PAN_ATTACKER, SOUND_PAN_ATTACKER, 1, 0
 	createsprite gWillOWispOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0
 	delay 3
@@ -8085,7 +8085,7 @@ Move_WILL_O_WISP:
 	createvisualtask SoundTask_AdjustPanningVar, 2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0
 	waitforvisualfinish
 	monbgprio_29
-	playsewithpan SE_W172B, SOUND_PAN_TARGET
+	playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 13, 1
 	createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 0
 	createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 42
@@ -8109,7 +8109,7 @@ Move_ENCORE:
 	createsprite gClappingHand2SpriteTemplate, ANIM_ATTACKER, 3, -2, 0, 0, 0, 9
 	createsprite gClappingHand2SpriteTemplate, ANIM_ATTACKER, 3, 2, 0, 1, 0, 9
 	delay 16
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W227B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1
@@ -8123,23 +8123,23 @@ Move_TRICK:
 	createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 80
 	createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 208
 	delay 16
-	playsewithpan SE_W166, 0
+	playsewithpan SE_M_SKETCH, 0
 	createvisualtask AnimTask_StretchTargetUp, 3
 	createvisualtask AnimTask_StretchAttackerUp, 3
 	delay 30
-	playsewithpan SE_W104, 0
+	playsewithpan SE_M_DOUBLE_TEAM, 0
 	delay 24
-	playsewithpan SE_W104, 0
+	playsewithpan SE_M_DOUBLE_TEAM, 0
 	delay 16
-	playsewithpan SE_W104, 0
+	playsewithpan SE_M_DOUBLE_TEAM, 0
 	delay 16
-	playsewithpan SE_W104, 0
+	playsewithpan SE_M_DOUBLE_TEAM, 0
 	delay 16
-	playsewithpan SE_W104, 0
+	playsewithpan SE_M_DOUBLE_TEAM, 0
 	delay 16
-	playsewithpan SE_W104, 0
+	playsewithpan SE_M_DOUBLE_TEAM, 0
 	delay 16
-	playsewithpan SE_W213, 0
+	playsewithpan SE_M_ATTRACT, 0
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_ATTACKER, 5, 0, 7, 2
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 5, 0, 7, 2
 	waitforvisualfinish
@@ -8150,11 +8150,11 @@ Move_WISH:
 	loadspritegfx ANIM_TAG_SPARKLE_2
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK
 	waitforvisualfinish
-	panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0
+	panse_27 SE_M_REFLECT, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0
 	createsprite gWishStarSpriteTemplate, ANIM_ATTACKER, 40
 	waitforvisualfinish
 	delay 60
-	loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3
+	loopsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER, 16, 3
 	call GrantingStarsEffect
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, RGB_BLACK
@@ -8163,7 +8163,7 @@ Move_WISH:
 
 Move_STOCKPILE:
 	loadspritegfx ANIM_TAG_GRAY_ORB
-	playsewithpan SE_W025, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 8, 1, 0, 12, RGB_WHITE
 	createvisualtask AnimTask_StockpileDeformMon, 5
 	call StockpileAbsorb
@@ -8193,11 +8193,11 @@ StockpileAbsorb:
 Move_SPIT_UP:
 	loadspritegfx ANIM_TAG_RED_ORB_2
 	loadspritegfx ANIM_TAG_IMPACT
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_SpitUpDeformMon, 5
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2
 	delay 45
-	playsewithpan SE_W255, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER
 	delay 3
 	createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 12
 	createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 32, 12
@@ -8213,10 +8213,10 @@ Move_SPIT_UP:
 SpitUpContinue:
 	delay 5
 	createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 8, 1, 0
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 10, ANIM_TARGET, 1
 	delay 5
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 12, -10, ANIM_TARGET, 1
 	waitforvisualfinish
 	end
@@ -8240,11 +8240,11 @@ SpitUpStrongest:
 Move_SWALLOW:
 	loadspritegfx ANIM_TAG_BLUE_ORB
 	loadspritegfx ANIM_TAG_BLUE_STAR
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_SwallowDeformMon, 5
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2
 	delay 38
-	playsewithpan SE_W255, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SPIT_UP, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 12, 1
 	call SwallowEffect
 	jumpifmoveturn 2, SwallowGood
@@ -8275,8 +8275,8 @@ SwallowBest:
 
 Move_TRANSFORM:
 	monbg ANIM_ATTACKER
-	playsewithpan SE_W100, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48
+	playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48
 	createvisualtask AnimTask_TransformMon, 2, 0
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
@@ -8316,7 +8316,7 @@ MorningSunStar:
 
 Move_SWEET_SCENT:
 	loadspritegfx ANIM_TAG_PINK_PETAL
-	playsewithpan SE_W230, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWEET_SCENT, SOUND_PAN_ATTACKER
 	createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100
 	delay 25
 	setpan 0
@@ -8357,11 +8357,11 @@ Move_HYPER_BEAM:
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 0, 16, RGB_BLACK
 	waitforvisualfinish
 	delay 10
-	playsewithpan SE_W063, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 4, 1
 	waitforvisualfinish
 	delay 30
-	createsoundtask SoundTask_LoopSEAdjustPanning, SE_W063B, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
+	createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_HYPER_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
 	createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB(31, 0, 0), 16, 0, 0
 	call HyperBeamOrbs
@@ -8405,7 +8405,7 @@ HyperBeamOrbs:
 Move_FLATTER:
 	loadspritegfx ANIM_TAG_SPOTLIGHT
 	loadspritegfx ANIM_TAG_CONFETTI
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W227B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_CreateSpotlight, 2
 	createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 0, 10, 0
 	waitforvisualfinish
@@ -8415,7 +8415,7 @@ Move_FLATTER:
 	delay 10
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET
 	delay 0
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W260, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_FLATTER, SOUND_PAN_ATTACKER
 	call CreateFlatterConfetti
 	call CreateFlatterConfetti
 	call CreateFlatterConfetti
@@ -8436,7 +8436,7 @@ Move_FLATTER:
 	call CreateFlatterConfetti
 	call CreateFlatterConfetti
 	delay 5
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W260, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_FLATTER, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1
 	waitforvisualfinish
@@ -8452,8 +8452,8 @@ Move_ROLE_PLAY:
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 16, RGB_WHITE
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 10, RGB_BLACK
 	waitforvisualfinish
-	playsewithpan SE_W161, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30
+	playsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_DETECT, SOUND_PAN_ATTACKER, 30
 	createvisualtask AnimTask_RolePlaySilhouette, 2
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
@@ -8465,13 +8465,13 @@ Move_ROLE_PLAY:
 Move_REFRESH:
 	loadspritegfx ANIM_TAG_THIN_RING
 	loadspritegfx ANIM_TAG_SPARKLE_2
-	playsewithpan SE_W287, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_STAT_INCREASE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_StatusClearedEffect, 2, 0
 	waitforvisualfinish
-	playsewithpan SE_W234, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
 	call GrantingStarsEffect
 	waitforvisualfinish
-	playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER
+	playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, RGB(12, 24, 30)
 	createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0
 	end
@@ -8482,11 +8482,11 @@ Move_BLAZE_KICK:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W172, SOUND_PAN_TARGET
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET
 	createsprite gSpinningHandOrFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 30
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 7, RGB_WHITE
 	delay 30
-	playsewithpan SE_W007, SOUND_PAN_TARGET
+	playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 14, 1
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 0, RGB_WHITE
@@ -8521,7 +8521,7 @@ Move_SAND_TOMB:
 	loadspritegfx ANIM_TAG_MUD_SAND
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0)
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 43, 1
-	playsewithpan SE_W328, SOUND_PAN_TARGET
+	playsewithpan SE_M_SAND_TOMB, SOUND_PAN_TARGET
 	call SandTombSwirlingDirt
 	call SandTombSwirlingDirt
 	call SandTombSwirlingDirt
@@ -8548,14 +8548,14 @@ SandTombSwirlingDirt:
 Move_SHEER_COLD:
 	fadetobg BG_ICE
 	waitbgfadeout
-	playsewithpan SE_W196, 0
+	playsewithpan SE_M_ICY_WIND, 0
 	waitbgfadein
 	loadspritegfx ANIM_TAG_ICE_CUBE
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
 	setalpha 12, 8
 	createvisualtask AnimTask_FrozenIceCube, 2
-	waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17
+	waitplaysewithpan SE_M_HAIL, SOUND_PAN_TARGET, 17
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -8572,11 +8572,11 @@ Move_ARM_THRUST:
 	delay 6
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 3
 	delay 4
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gArmThrustHandSpriteTemplate, ANIM_TARGET, 2, 10, -8, 14, 3
 	waitforvisualfinish
 	createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, 0, 1
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	choosetwoturnanim ArmThrustRight, ArmThrustLeft
 ArmThrustContinue:
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
@@ -8591,7 +8591,7 @@ ArmThrustLeft:
 	goto ArmThrustContinue
 
 Move_MUDDY_WATER:
-	panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	createvisualtask AnimTask_CreateSurfWave, 2, TRUE
 	waitforvisualfinish
 	end
@@ -8624,7 +8624,7 @@ Move_BULLET_SEED:
 Move_DRAGON_CLAW:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	loadspritegfx ANIM_TAG_CLAW_SLASH
-	playsewithpan SE_W221B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 4, 0, 8, RGB(31, 19, 0)
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 15, 1
 	call DragonClawFireSpiral
@@ -8632,7 +8632,7 @@ Move_DRAGON_CLAW:
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
 	createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, ANIM_ATTACKER
 	delay 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W013, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0
 	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1
@@ -8645,7 +8645,7 @@ Move_DRAGON_CLAW:
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
 	createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 512, 25, 16, 46, ANIM_ATTACKER
 	delay 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W013, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1
 	createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1
 	createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1
@@ -8689,7 +8689,7 @@ Move_MUD_SHOT:
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
 	delay 6
 	createvisualtask AnimTask_StartSinAnimTimer, 5, 100
-	panse_1B SE_W250, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
+	panse_1B SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
 	call MudShotOrbs
 	call MudShotOrbs
 	call MudShotOrbs
@@ -8717,7 +8717,7 @@ Move_METEOR_MASH:
 	loadspritegfx ANIM_TAG_GOLD_STARS
 	loadspritegfx ANIM_TAG_IMPACT
 	loadspritegfx ANIM_TAG_HANDS_AND_FEET
-	panse_1B SE_W112, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0
+	panse_1B SE_M_BARRIER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +3, 0
 	fadetobg BG_COSMIC
 	waitbgfadein
 	waitforvisualfinish
@@ -8728,7 +8728,7 @@ Move_METEOR_MASH:
 	createsprite gSpinningHandOrFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 30
 	createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -80, -64, 40, 32, 30
 	delay 20
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 5, 0, 20, 1
 	waitforvisualfinish
@@ -8742,7 +8742,7 @@ Move_REVENGE:
 	loadspritegfx ANIM_TAG_PURPLE_SCRATCH
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	createsprite gRevengeSmallScratchSpriteTemplate, ANIM_ATTACKER, 2, 10, -10
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 0, 4, 2, 8, RGB_RED
@@ -8751,17 +8751,17 @@ Move_REVENGE:
 	loadspritegfx ANIM_TAG_PURPLE_SWIPE
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
 	delay 4
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gRevengeBigScratchSpriteTemplate, ANIM_TARGET, 2, 10, -10
 	waitforvisualfinish
 	unloadspritegfx ANIM_TAG_PURPLE_SWIPE
 	loadspritegfx ANIM_TAG_IMPACT
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1
 	createsprite gPersistHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, ANIM_TARGET, 1, 8
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	delay 8
 	createsprite gPersistHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 8, ANIM_TARGET, 1, 8
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_TARGET
 	blendoff
@@ -8770,7 +8770,7 @@ Move_REVENGE:
 Move_POISON_FANG:
 	loadspritegfx ANIM_TAG_FANG_ATTACK
 	loadspritegfx ANIM_TAG_POISON_BUBBLE
-	playsewithpan SE_W044, SOUND_PAN_TARGET
+	playsewithpan SE_M_BITE, SOUND_PAN_TARGET
 	createsprite gFangSpriteTemplate, ANIM_TARGET, 2
 	delay 10
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1
@@ -8781,7 +8781,7 @@ Move_POISON_FANG:
 	end
 
 Move_SUBSTITUTE:
-	playsewithpan SE_W213, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_MonToSubstitute, 2
 	end
 
@@ -8794,50 +8794,50 @@ Move_FRENZY_PLANT:
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 0, 5, RGB_BLACK
 	waitforvisualfinish
 	createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100
-	playsewithpan SE_W010, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95
-	playsewithpan SE_W010, -43
+	playsewithpan SE_M_SCRATCH, -43
 	delay 5
 	createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90
-	playsewithpan SE_W010, -22
+	playsewithpan SE_M_SCRATCH, -22
 	delay 5
 	createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85
-	playsewithpan SE_W010, 0
+	playsewithpan SE_M_SCRATCH, 0
 	delay 5
 	createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85
-	playsewithpan SE_W010, +21
+	playsewithpan SE_M_SCRATCH, +21
 	delay 5
 	createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85
-	playsewithpan SE_W010, +42
+	playsewithpan SE_M_SCRATCH, +42
 	delay 5
 	createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85
-	playsewithpan SE_W010, SOUND_PAN_TARGET
+	playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET
 	delay 5
 	createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80
-	playsewithpan SE_W010, SOUND_PAN_TARGET
+	playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET
 	delay 5
 	createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75
-	playsewithpan SE_W010, SOUND_PAN_TARGET
+	playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -10, ANIM_TARGET, 3
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 8, 0, 20, 1
 	delay 3
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, ANIM_TARGET, 3
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	delay 3
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -3, ANIM_TARGET, 2
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	delay 3
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -3, 1, ANIM_TARGET, 2
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	delay 2
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, 1, ANIM_TARGET, 1
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	delay 2
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 10, ANIM_TARGET, 1
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 5, 0, RGB_BLACK
 	waitforvisualfinish
@@ -8860,7 +8860,7 @@ Move_METAL_SOUND:
 	waitforvisualfinish
 	end
 MetalSoundRings:
-	panse_1B SE_W103, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_SCREECH, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	createsprite gMetalSoundSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0
 	delay 2
 	return
@@ -8883,20 +8883,20 @@ FocusPunchContinue:
 	waitbgfadein
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W207, SOUND_PAN_TARGET
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
 	createsprite gFocusPunchFistSpriteTemplate, ANIM_TARGET, 2
 	delay 10
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 0
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 2, ANIM_TARGET, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -6, ANIM_TARGET, 0
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 8, ANIM_TARGET, 0
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	restorebg
 	waitbgfadein
@@ -8930,94 +8930,94 @@ ReturnContinue:
 	end
 ReturnWeak:
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W004, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	goto ReturnContinue
 ReturnMedium:
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	delay 11
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 4
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	goto ReturnContinue
 ReturnStrong:
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, ANIM_TARGET, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, ANIM_TARGET, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -5, 3, ANIM_TARGET, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	goto ReturnContinue
 ReturnStrongest:
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 6, RGB_BLACK
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, ANIM_TARGET, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 12, 1, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	waitforvisualfinish
 	delay 4
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	waitforvisualfinish
 	delay 2
 	createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 5, 1
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 5, 1
 	waitforvisualfinish
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 2, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	delay 5
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 5, 1
 	waitforvisualfinish
@@ -9026,25 +9026,25 @@ ReturnStrongest:
 	call ReturnStrongestHit
 	call ReturnStrongestHit
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, ANIM_TARGET, 0
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 8, 0, 24, 1
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, ANIM_TARGET, 0
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 3, -5, ANIM_TARGET, 0
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -5, 3, ANIM_TARGET, 0
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W025B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6, 0, RGB_BLACK
 	goto ReturnContinue
 ReturnStrongestHit:
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 3, ANIM_ATTACKER
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W039, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W233B, SOUND_PAN_TARGET
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
 	createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 5, 1
 	waitforvisualfinish
@@ -9052,8 +9052,8 @@ ReturnStrongestHit:
 
 Move_COSMIC_POWER:
 	loadspritegfx ANIM_TAG_SPARKLE_2
-	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_W322, 0
-	playsewithpan SE_W322, 0
+	createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_COSMIC_POWER, 0
+	playsewithpan SE_M_COSMIC_POWER, 0
 	createvisualtask AnimTask_BlendNonAttackerPalettes, 2, 0, 0, 15, RGB_BLACK
 	waitforvisualfinish
 	fadetobg BG_COSMIC
@@ -9061,7 +9061,7 @@ Move_COSMIC_POWER:
 	createvisualtask AnimTask_StartSlidingBg, 2, 0, 128, 0, -1
 	waitbgfadein
 	delay 70
-	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_W234, SOUND_PAN_ATTACKER
+	createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
 	createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60
 	delay 8
 	createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60
@@ -9080,7 +9080,7 @@ Move_BLAST_BURN:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W221, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 24, 0, 0, 0
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -20, -10, 24, 0, 0, 0
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, 0, -16, 24, 0, 0, 0
@@ -9090,7 +9090,7 @@ Move_BLAST_BURN:
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 24, 0, 0, 0
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -20, 10, 24, 0, 0, 0
 	delay 25
-	playsewithpan SE_W172B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -64, 0, 24, 0, 0, 0
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 6, -40, -20, 24, 0, 0, 0
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 70, 0, -32, 24, 0, 0, 0
@@ -9102,7 +9102,7 @@ Move_BLAST_BURN:
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -40, 20, 24, 0, 0, 0
 	createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257
 	delay 25
-	playsewithpan SE_W172B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -96, 0, 24, 0, 0, 0
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 6, -60, -30, 24, 0, 0, 0
 	createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 70, 0, -48, 24, 0, 0, 0
@@ -9128,24 +9128,24 @@ Move_ROCK_TOMB:
 	createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, 20, 12, 64, 114, 0
 	delay 8
 	createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1
-	playsewithpan SE_W070, SOUND_PAN_TARGET
+	playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
 	delay 8
 	createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, -20, 12, 64, 98, 0
 	delay 8
 	createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1
-	playsewithpan SE_W070, SOUND_PAN_TARGET
+	playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
 	delay 8
 	createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 66, 3, 6, 64, 82, 0
 	delay 8
 	createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1
-	playsewithpan SE_W070, SOUND_PAN_TARGET
+	playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
 	delay 8
 	createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, -3, 13, 64, 66, 0
 	delay 8
 	createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1
-	playsewithpan SE_W070, SOUND_PAN_TARGET
+	playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
 	delay 24
-	playsewithpan SE_W063, SOUND_PAN_TARGET
+	playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET
 	createsprite gRedXSpriteTemplate, ANIM_TARGET, 5, ANIM_TARGET, 50
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 20, 1
 	createvisualtask AnimTask_ShakeBattleTerrain, 2, 2, 0, 10, 1
@@ -9154,8 +9154,8 @@ Move_ROCK_TOMB:
 
 Move_SILVER_WIND:
 	loadspritegfx ANIM_TAG_SPARKLE_6
-	panse_1B SE_W016, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
-	playsewithpan SE_W234, 0
+	panse_1B SE_M_GUST, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	playsewithpan SE_M_MORNING_SUN, 0
 	delay 0
 	monbg ANIM_DEF_PARTNER
 	monbgprio_29
@@ -9194,7 +9194,7 @@ SilverWindContinue:
 	createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1
 	createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1
 	waitforvisualfinish
-	playsewithpan SE_W016B, SOUND_PAN_TARGET
+	playsewithpan SE_M_GUST2, SOUND_PAN_TARGET
 	clearmonbg ANIM_DEF_PARTNER
 	delay 0
 	restorebg
@@ -9210,7 +9210,7 @@ SilverWindOnPlayer:
 	goto SilverWindContinue
 
 Move_SNATCH:
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -12, 4, 10, 10, 12, 6
 	end
 
@@ -9220,10 +9220,10 @@ Move_DIVE:
 	choosetwoturnanim DiveSetUp, DiveAttack
 DiveSetUp:
 	loadspritegfx ANIM_TAG_ROUND_SHADOW
-	playsewithpan SE_W029, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
 	createsprite gDiveBallSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336
 	waitforvisualfinish
-	playsewithpan SE_W291, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER
 	createsprite gDiveWaterSplashSpriteTemplate, ANIM_ATTACKER, 3, 0
 	call DiveSetUpWaterDroplets
 	call DiveSetUpWaterDroplets
@@ -9240,7 +9240,7 @@ DiveAttack:
 	loadspritegfx ANIM_TAG_SMALL_BUBBLES
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W153, SOUND_PAN_TARGET
+	playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
 	createsprite gDiveWaterSplashSpriteTemplate, ANIM_TARGET, 3, 1
 	call DiveAttackWaterDroplets
 	call DiveAttackWaterDroplets
@@ -9264,11 +9264,11 @@ Move_ROCK_BLAST:
 	loadspritegfx ANIM_TAG_IMPACT
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
 	delay 3
-	playsewithpan SE_W207, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
 	createsprite gRockBlastRockSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 25, 257
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 2, 0, 0, 20, 24, 14, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1
 	createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 2, 5, 0, -20, 24, 14, 1
@@ -9290,13 +9290,13 @@ Move_OVERHEAT:
 	delay 1
 	createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 0
 	delay 1
-	playsewithpan SE_W082, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_CopyPalUnfadedToBackup, 5, 1, 0
 	delay 1
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 1, 0, 13, RGB(28, 0, 0)
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1
 	waitforvisualfinish
-	playsewithpan SE_W172B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER
 	createsprite gOverheatFlameSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 30, 25, -20
 	createsprite gOverheatFlameSpriteTemplate, ANIM_ATTACKER, 2, 1, 32, 30, 25, -20
 	createsprite gOverheatFlameSpriteTemplate, ANIM_ATTACKER, 2, 1, 64, 30, 25, -20
@@ -9326,17 +9326,17 @@ Move_OVERHEAT:
 	delay 5
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, 3, ANIM_TARGET, 0
-	playsewithpan SE_W007, SOUND_PAN_TARGET
+	playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 10, 0, 25, 1
 	delay 6
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -5, ANIM_TARGET, 0
-	playsewithpan SE_W007, SOUND_PAN_TARGET
+	playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 10, ANIM_TARGET, 0
-	playsewithpan SE_W007, SOUND_PAN_TARGET
+	playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
 	delay 8
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 0
-	playsewithpan SE_W007, SOUND_PAN_TARGET
+	playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
 	createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 1
 	delay 1
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 0, 13, RGB(18, 18, 18)
@@ -9363,12 +9363,12 @@ Move_HYDRO_CANNON:
 	loadspritegfx ANIM_TAG_WATER_IMPACT
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
-	playsewithpan SE_W057, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SURF, SOUND_PAN_ATTACKER
 	createsprite gHydroCannonChargeSpriteTemplate, ANIM_TARGET, 2
 	delay 10
 	createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257
 	delay 30
-	panse_1B SE_W056, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+	panse_1B SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	call HydroCannonBeam
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 10, 0, 40, 1
 	createsprite gWaterHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0
@@ -9402,11 +9402,11 @@ HydroCannonBeam:
 
 Move_ASTONISH:
 	loadspritegfx ANIM_TAG_SWEAT_BEAD
-	playsewithpan SE_W227, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_ENCORE, SOUND_PAN_ATTACKER
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
 	delay 25
 	createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1
-	playsewithpan SE_W166, SOUND_PAN_TARGET
+	playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET
 	createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
 	createvisualtask AnimTask_StretchTargetUp, 3
@@ -9425,7 +9425,7 @@ Move_SEISMIC_TOSS:
 	fadetobg BG_IN_AIR
 	waitbgfadeout
 	createvisualtask AnimTask_MoveSeismicTossBg, 3
-	playsewithpan SE_W327, 0
+	playsewithpan SE_M_SKY_UPPERCUT, 0
 	waitbgfadein
 	waitforvisualfinish
 	createvisualtask AnimTask_SeismicTossBgAccelerateDownAtEnd, 3
@@ -9463,7 +9463,7 @@ SeismicTossStrong:
 	goto SeismicTossContinue
 SeismicTossRockScatter1:
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, ANIM_TARGET, 1
-	playsewithpan SE_W070, SOUND_PAN_TARGET
+	playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1
 	createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 27, 2, 3
 	createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 28, 3, 4
@@ -9472,7 +9472,7 @@ SeismicTossRockScatter1:
 	return
 SeismicTossRockScatter2:
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, -8, ANIM_TARGET, 1
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1
 	createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 32, 3, 4
 	createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 31, 2, 2
@@ -9483,7 +9483,7 @@ SeismicTossRockScatter2:
 Move_MAGIC_COAT:
 	loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL
 	setalpha 0, 16
-	waitplaysewithpan SE_W112, SOUND_PAN_ATTACKER, 15
+	waitplaysewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER, 15
 	createsprite gMagicCoatWallSpriteTemplate, ANIM_ATTACKER, 3, 40, 0, ANIM_TAG_ORANGE_LIGHT_WALL
 	waitforvisualfinish
 	delay 1
@@ -9495,7 +9495,7 @@ Move_WATER_PULSE:
 	loadspritegfx ANIM_TAG_BLUE_RING_2
 	monbg ANIM_TARGET
 	monbgprio_28 ANIM_TARGET
-	playsewithpan SE_W145C, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 7, RGB(0, 25, 28)
 	delay 10
 	createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0
@@ -9503,15 +9503,15 @@ Move_WATER_PULSE:
 	createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 200, 80, 8, 1, 40, 20, 0
 	createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 80, 60, 10, 3, 20, 50, 0
 	createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 140, 100, 16, 1, 20, 30, 1
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	waitforvisualfinish
-	playsewithpan SE_W202, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER
 	createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15
 	delay 5
-	playsewithpan SE_W202, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER
 	createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15
 	delay 5
-	playsewithpan SE_W202, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER
 	createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15
 	delay 13
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 8, 18, 1
@@ -9535,13 +9535,13 @@ Move_PSYCHO_BOOST:
 	setalpha 8, 8
 	delay 10
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0
-	loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 14, 10
+	loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 14, 10
 	createsprite gPsychoBoostOrbSpriteTemplate, ANIM_ATTACKER, 2
 	delay 110
-	loopsewithpan SE_W060B, SOUND_PAN_ATTACKER, 7, 10
+	loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 7, 10
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, -8, 1, 24, 1
-	playsewithpan SE_W043, SOUND_PAN_TARGET
+	playsewithpan SE_M_LEER, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER
 	blendoff
@@ -9553,12 +9553,12 @@ Move_KNOCK_OFF:
 	loadspritegfx ANIM_TAG_IMPACT
 	createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
 	delay 4
-	playsewithpan SE_W233, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET
 	createsprite gKnockOffStrikeSpriteTemplate, ANIM_TARGET, 2, -16, -16
 	delay 8
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 2
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3
 	createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
 	delay 3
@@ -9577,7 +9577,7 @@ Move_DOOM_DESIRE:
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK
 	waitforvisualfinish
 	setalpha 8, 8
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
 	waitforvisualfinish
 	delay 20
@@ -9594,7 +9594,7 @@ Move_SKY_UPPERCUT:
 	monbgprio_28 ANIM_TARGET
 	fadetobg BG_IN_AIR
 	waitbgfadeout
-	playsewithpan SE_W327, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SKY_UPPERCUT, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_MoveSkyUppercutBg, 5, 55
 	waitbgfadein
 	setalpha 12, 8
@@ -9602,20 +9602,20 @@ Move_SKY_UPPERCUT:
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 0, 0, 5
 	delay 4
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 6, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -28, 28, ANIM_TARGET, 1
 	delay 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -15, 8, ANIM_TARGET, 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	delay 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, -12, ANIM_TARGET, 1
 	delay 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -32, ANIM_TARGET, 1
 	delay 1
-	playsewithpan SE_W233B, SOUND_PAN_TARGET
+	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 5, -52, ANIM_TARGET, 1
 	createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -26, 16, 1, 4
 	delay 4
@@ -9651,7 +9651,7 @@ Move_TWISTER:
 	loadspritegfx ANIM_TAG_ROCKS
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	playsewithpan SE_W239, SOUND_PAN_TARGET
+	playsewithpan SE_M_TWISTER, SOUND_PAN_TARGET
 	createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 120, 70, 5, 70, 30
 	delay 1
 	createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 115, 55, 6, 60, 25
@@ -9674,18 +9674,18 @@ Move_TWISTER:
 	createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 110, 10, 8, 32, 20
 	waitforvisualfinish
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -32, -16, ANIM_TARGET, 3
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1
 	delay 4
 	createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	delay 4
 	createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	delay 4
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3
-	playsewithpan SE_W004, SOUND_PAN_TARGET
+	playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
 	blendoff
@@ -9698,7 +9698,7 @@ Move_MAGICAL_LEAF:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	delay 1
-	loopsewithpan SE_W077, SOUND_PAN_ATTACKER, 10, 5
+	loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_ATTACKER, 10, 5
 	createvisualtask AnimTask_CycleMagicalLeafPal, 5
 	createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10
 	delay 2
@@ -9720,11 +9720,11 @@ Move_MAGICAL_LEAF:
 	delay 2
 	createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8
 	delay 60
-	playsewithpan SE_W013B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
 	createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0
 	createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0
 	delay 30
-	playsewithpan SE_W013, SOUND_PAN_TARGET
+	playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, -4, ANIM_TARGET, 2
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 10, 4, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
@@ -9741,10 +9741,10 @@ Move_ICE_BALL:
 	createvisualtask AnimTask_GetIceBallCounter, 5, 0
 	jumpargeq 0, 4, IceBallSetIceBg
 IceBallContinue:
-	playsewithpan SE_W196, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER
 	createsprite gIceBallChunkSpriteTemplate, ANIM_TARGET, 2, 15, 0, -12, -16, 30, -40
 	delay 28
-	playsewithpan SE_W280, SOUND_PAN_TARGET
+	playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
 	createvisualtask AnimTask_GetIceBallCounter, 5, 0
 	jumpargeq 0, 0, IceBallWeakest
 	jumpargeq 0, 1, IceBallWeak
@@ -9829,11 +9829,11 @@ Move_WEATHER_BALL:
 	loadspritegfx ANIM_TAG_WEATHER_BALL
 	createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, ANIM_ATTACKER
 	delay 8
-	playsewithpan SE_W207, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
 	createsprite gWeatherBallUpSpriteTemplate, ANIM_ATTACKER, 2
 	waitforvisualfinish
 	delay 15
-	playsewithpan SE_W197, 0
+	playsewithpan SE_M_DETECT, 0
 	createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0
 	waitforvisualfinish
 	createvisualtask AnimTask_GetWeather, 2
@@ -9847,7 +9847,7 @@ WeatherBallNormal:
 	loadspritegfx ANIM_TAG_IMPACT
 	createsprite gWeatherBallNormalDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0
 	waitforvisualfinish
-	playsewithpan SE_W025B, SOUND_PAN_TARGET
+	playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1
 	waitforvisualfinish
@@ -9855,45 +9855,45 @@ WeatherBallNormal:
 WeatherBallFire:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
 	createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 40, 10
-	playsewithpan SE_W172, SOUND_PAN_TARGET
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET
 	delay 10
 	createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20
-	playsewithpan SE_W172, SOUND_PAN_TARGET
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET
 	delay 10
 	createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0
-	playsewithpan SE_W172, SOUND_PAN_TARGET
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET
 	waitforvisualfinish
-	playsewithpan SE_W172B, SOUND_PAN_TARGET
+	playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1
 	waitforvisualfinish
 	end
 WeatherBallWater:
 	loadspritegfx ANIM_TAG_SMALL_BUBBLES
 	createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 50, 10
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	delay 8
 	createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -20, 20
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	delay 13
 	createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0
-	playsewithpan SE_W152, SOUND_PAN_TARGET
+	playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 8, 1
-	playsewithpan SE_W202, SOUND_PAN_TARGET
+	playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 WeatherBallSandstorm:
 	loadspritegfx ANIM_TAG_ROCKS
 	createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 30, 0
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 5
 	createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	delay 14
 	createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0
-	playsewithpan SE_W088, SOUND_PAN_TARGET
+	playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
 	waitforvisualfinish
-	playsewithpan SE_W070, SOUND_PAN_TARGET
+	playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
 	createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 27, 2, 3
 	createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 28, 3, 4
 	createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -4, 30, 2, 3
@@ -9905,16 +9905,16 @@ WeatherBallIce:
 	loadspritegfx ANIM_TAG_HAIL
 	loadspritegfx ANIM_TAG_ICE_CRYSTALS
 	createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, -40, 20
-	playsewithpan SE_W258, SOUND_PAN_TARGET
+	playsewithpan SE_M_HAIL, SOUND_PAN_TARGET
 	delay 10
 	createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, 40, 0
-	playsewithpan SE_W258, SOUND_PAN_TARGET
+	playsewithpan SE_M_HAIL, SOUND_PAN_TARGET
 	delay 10
 	createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, 0, 0
-	playsewithpan SE_W258, SOUND_PAN_TARGET
+	playsewithpan SE_M_HAIL, SOUND_PAN_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	call IceCrystalEffectShort
 	waitforvisualfinish
 	end
@@ -9923,7 +9923,7 @@ Move_COUNT:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
@@ -9933,64 +9933,64 @@ Move_COUNT:
 
 IceCrystalEffectShort:
 	createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 10, 20, 0
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -5, 10, 0
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 17, -12, 0
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, -15, 15, 0
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 20, 2, 0
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	return
 
 IceCrystalEffectLong:
 	createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -10, -10, 1
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 10, 20, 1
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -29, 0, 1
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 29, -20, 1
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -5, 10, 1
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 17, -12, 1
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -20, 0, 1
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, -15, 15, 1
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 26, -5, 1
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	delay 4
 	createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 20, 2, 1
-	playsewithpan SE_W196, SOUND_PAN_TARGET
+	playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
 	return
 
 IceSpikesEffectShort: @ Unused
-	loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4
+	loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 6, 4
 	createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 0, 24, 0
 	delay 4
 	createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 8, 24, 0
@@ -10007,7 +10007,7 @@ IceSpikesEffectShort: @ Unused
 	return
 
 IceSpikesEffectLong:
-	loopsewithpan SE_W196, SOUND_PAN_TARGET, 6, 4
+	loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 6, 4
 	createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 0, 24, 1
 	delay 4
 	createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 8, 24, 1
@@ -10037,7 +10037,7 @@ GrantingStarsEffect:
 	return
 
 HealingEffect:
-	playsewithpan SE_W071B, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_ABSORB_2, SOUND_PAN_ATTACKER
 	createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 0, 0
 	delay 7
 	createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, -15, 10, 0, 0
@@ -10049,7 +10049,7 @@ HealingEffect:
 	return
 
 HealingEffect2:
-	playsewithpan SE_W071B, SOUND_PAN_TARGET
+	playsewithpan SE_M_ABSORB_2, SOUND_PAN_TARGET
 	createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 0, -5, 1, 0
 	delay 7
 	createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, -15, 10, 1, 0
@@ -10062,72 +10062,72 @@ HealingEffect2:
 
 PoisonBubblesEffect:
 	createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 10, 10, 0
-	playsewithpan SE_W092, SOUND_PAN_TARGET
+	playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET
 	delay 6
 	createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, -20, 0
-	playsewithpan SE_W092, SOUND_PAN_TARGET
+	playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET
 	delay 6
 	createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, 15, 0
-	playsewithpan SE_W092, SOUND_PAN_TARGET
+	playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET
 	delay 6
 	createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0
-	playsewithpan SE_W092, SOUND_PAN_TARGET
+	playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET
 	delay 6
 	createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, -20, 0
-	playsewithpan SE_W092, SOUND_PAN_TARGET
+	playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET
 	delay 6
 	createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0
-	playsewithpan SE_W092, SOUND_PAN_TARGET
+	playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET
 	return
 
 WaterBubblesEffectShort:
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 0
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 0
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 0
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 0
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 0
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	return
 
 WaterBubblesEffectLong:
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -28, -10, 1
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 1
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 1
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 27, 8, 1
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 1
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	delay 6
 	createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 1
-	playsewithpan SE_W145C, SOUND_PAN_TARGET
+	playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
 	return
 
 ElectricityEffect:
-	playsewithpan SE_W085B, SOUND_PAN_TARGET
+	playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET
 	createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0
 	delay 2
 	createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1
@@ -10146,7 +10146,7 @@ ElectricityEffect:
 	return
 
 ConfusionEffect:
-	loopsewithpan SE_W146, SOUND_PAN_TARGET, 13, 6
+	loopsewithpan SE_M_DIZZY_PUNCH, SOUND_PAN_TARGET, 13, 6
 	createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 0, 3, 90
 	createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 51, 3, 90
 	createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 102, 3, 90
@@ -10214,7 +10214,7 @@ UnsetSolarbeamBg:
 	return
 
 Status_Poison:
-	loopsewithpan SE_W092, SOUND_PAN_TARGET, 13, 6
+	loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 13, 6
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 18, 2
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 12, RGB(30, 0, 31)
 	end
@@ -10226,7 +10226,7 @@ Status_Confusion:
 
 Status_Burn:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
-	playsewithpan SE_W172, SOUND_PAN_TARGET
+	playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET
 	call BurnFlame
 	call BurnFlame
 	call BurnFlame
@@ -10239,19 +10239,19 @@ BurnFlame:
 
 Status_Infatuation:
 	loadspritegfx ANIM_TAG_MAGENTA_HEART
-	playsewithpan SE_W204, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
 	createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20
 	delay 15
-	playsewithpan SE_W204, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
 	createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20
 	delay 15
-	playsewithpan SE_W204, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
 	createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
 	end
 
 Status_Sleep:
 	loadspritegfx ANIM_TAG_LETTER_Z
-	playsewithpan SE_W173, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_SNORE, SOUND_PAN_ATTACKER
 	createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0
 	delay 30
 	createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0
@@ -10264,11 +10264,11 @@ Status_Paralysis:
 	end
 
 Status_Freeze:
-	playsewithpan SE_W196, 0
+	playsewithpan SE_M_ICY_WIND, 0
 	loadspritegfx ANIM_TAG_ICE_CUBE
 	monbg ANIM_DEF_PARTNER
 	monbgprio_28 ANIM_TARGET
-	waitplaysewithpan SE_W258, SOUND_PAN_TARGET, 17
+	waitplaysewithpan SE_M_HAIL, SOUND_PAN_TARGET, 17
 	createvisualtask AnimTask_FrozenIceCube, 2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
@@ -10277,7 +10277,7 @@ Status_Freeze:
 Status_Curse:
 	loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W171, SOUND_PAN_TARGET
+	playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET
 	createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1
 	waitforvisualfinish
@@ -10287,7 +10287,7 @@ Status_Curse:
 Status_Nightmare:
 	loadspritegfx ANIM_TAG_DEVIL
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W171, SOUND_PAN_TARGET
+	playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET
 	createsprite gNightmareDevilSpriteTemplate, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1
 	waitforvisualfinish
@@ -10300,8 +10300,8 @@ General_CastformChange:
 	goto CastformChangeContinue
 CastformChangeContinue:
 	monbg ANIM_ATTACKER
-	playsewithpan SE_W100, SOUND_PAN_ATTACKER
-	waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48
+	playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
+	waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48
 	createvisualtask AnimTask_TransformMon, 2, 1
 	waitforvisualfinish
 	clearmonbg ANIM_ATTACKER
@@ -10336,10 +10336,10 @@ General_PokeblockThrow:
 	createvisualtask AnimTask_SetAttackerTargetLeftPos, 2, 0
 	createvisualtask AnimTask_LoadPokeblockGfx, 2
 	delay 0
-	waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22
+	waitplaysewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER, 22
 	createsprite gPokeblockSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32
 	delay 50
-	loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2
+	loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET, 19, 2
 	createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET
 	waitforvisualfinish
 	createvisualtask AnimTask_FreePokeblockGfx, 2
@@ -10359,7 +10359,7 @@ General_TurnTrap:
 	goto Status_BindWrap
 Status_BindWrap:
 	loadspritegfx ANIM_TAG_TENDRILS
-	loopsewithpan SE_W010, SOUND_PAN_TARGET, 6, 2
+	loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 2
 	createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1
 	delay 7
 	createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 1
@@ -10367,13 +10367,13 @@ Status_BindWrap:
 	createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
 	delay 20
 	setarg 7, 0xFFFF
-	playsewithpan SE_W020, SOUND_PAN_TARGET
+	playsewithpan SE_M_BIND, SOUND_PAN_TARGET
 	waitforvisualfinish
 	end
 
 Status_FireSpin:
 	loadspritegfx ANIM_TAG_SMALL_EMBER
-	playsewithpan SE_W221B, SOUND_PAN_TARGET
+	playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1
 	call FireSpinEffect
 	call FireSpinEffect
@@ -10388,7 +10388,7 @@ Status_Whirlpool:
 	setalpha 12, 8
 	delay 0
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(0, 13, 23)
-	playsewithpan SE_W250, SOUND_PAN_TARGET
+	playsewithpan SE_M_WHIRLPOOL, SOUND_PAN_TARGET
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1
 	call WhirlpoolEffect
 	call WhirlpoolEffect
@@ -10404,7 +10404,7 @@ Status_Clamp:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W011, SOUND_PAN_TARGET
+	playsewithpan SE_M_VICEGRIP, SOUND_PAN_TARGET
 	createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10
 	createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10
 	delay 10
@@ -10420,7 +10420,7 @@ Status_SandTomb:
 	loadspritegfx ANIM_TAG_MUD_SAND
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, RGB(19, 17, 0)
 	createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 30, 1
-	playsewithpan SE_W328, SOUND_PAN_TARGET
+	playsewithpan SE_M_SAND_TOMB, SOUND_PAN_TARGET
 	call SandTombSwirlingDirt
 	call SandTombSwirlingDirt
 	delay 22
@@ -10433,19 +10433,19 @@ General_HeldItemEffect:
 	loadspritegfx ANIM_TAG_THIN_RING
 	loadspritegfx ANIM_TAG_SPARKLE_2
 	delay 0
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, ANIM_ATTACKER, 2
 	waitforvisualfinish
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, ANIM_ATTACKER, 2
 	waitforvisualfinish
-	playsewithpan SE_W036, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, ANIM_ATTACKER, 2
 	waitforvisualfinish
-	playsewithpan SE_W234, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
 	call GrantingStarsEffect
 	waitforvisualfinish
-	playsewithpan SE_REAPOKE, SOUND_PAN_ATTACKER
+	playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 3, 7, 0, RGB(17, 31, 25)
 	createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0
 	waitforvisualfinish
@@ -10456,23 +10456,23 @@ General_SmokeballEscape:
 	monbg ANIM_ATTACKER
 	setalpha 12, 4
 	delay 0
-	playsewithpan SE_BOWA2, SOUND_PAN_TARGET
+	playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET
 	createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_TARGET, 0, 0, 32, 28, 30
 	delay 4
-	playsewithpan SE_BOWA2, SOUND_PAN_TARGET
+	playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET
 	createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 127, 2, 12, 20, 30
 	delay 12
-	playsewithpan SE_BOWA2, SOUND_PAN_TARGET
+	playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET
 	createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 126, 2, -28, 4, 30
 	delay 12
-	playsewithpan SE_BOWA2, SOUND_PAN_TARGET
+	playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET
 	createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 124, 2, 14, -20, 30
 	delay 4
-	playsewithpan SE_BOWA2, SOUND_PAN_TARGET
+	playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET
 	createvisualtask AnimTask_AttackerFadeToInvisible, 2, 2
 	createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 123, 3, 4, 4, 30
 	delay 14
-	playsewithpan SE_BOWA2, SOUND_PAN_TARGET
+	playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET
 	createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 46
 	delay 0
 	createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, -14, 46
@@ -10491,7 +10491,7 @@ General_SmokeballEscape:
 
 General_FocusBand:
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 7, 0, 9, RGB_RED
-	playsewithpan SE_W082, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_SlideMonForFocusBand, 5, 30, 128, 0, 1, 2, 0, 1
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 4, 9, 0, RGB_RED
@@ -10502,7 +10502,7 @@ General_FocusBand:
 
 General_Rain:
 	loadspritegfx ANIM_TAG_RAIN_DROPS
-	playsewithpan SE_W240, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, 0x781, 2, 0, 4, RGB_BLACK
 	waitforvisualfinish
 	createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60
@@ -10531,7 +10531,7 @@ General_MonHit:
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_TARGET
 	setalpha 12, 8
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	waitforvisualfinish
@@ -10562,22 +10562,22 @@ SnatchMoveContinue:
 	call SnatchMoveTrySwapToSubstitute
 	end
 SnatchOpposingMonMove:
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_SnatchOpposingMonMove, 2
 	goto SnatchMoveContinue
 SnatchPartnerMonMove:
-	playsewithpan SE_W104, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
 	createvisualtask AnimTask_SnatchPartnerMove, 2
 	goto SnatchMoveContinue
 
 General_FutureSightHit:
 	createvisualtask AnimTask_SetAnimTargetToBattlerTarget, 2
 	monbg ANIM_DEF_PARTNER
-	playsewithpan SE_W060, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
 	call SetPsychicBackground
 	setalpha 8, 8
-	playsewithpan SE_W048, SOUND_PAN_TARGET
-	waitplaysewithpan SE_W048, SOUND_PAN_TARGET, 8
+	playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET
+	waitplaysewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 8
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 15, 1
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_TARGET, 1
 	waitforvisualfinish
@@ -10598,26 +10598,26 @@ General_DoomDesireHit:
 	delay 10
 	createvisualtask AnimTask_DoomDesireLightBeam, 5
 	delay 9
-	playsewithpan SE_W109, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER
 	delay 9
-	playsewithpan SE_W109, 0
+	playsewithpan SE_M_CONFUSE_RAY, 0
 	delay 9
-	playsewithpan SE_W109, SOUND_PAN_TARGET
+	playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET
 	delay 25
 	createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1
 	delay 6
-	playsewithpan SE_W120, SOUND_PAN_TARGET
+	playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
 	createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1
 	waitforvisualfinish
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE
@@ -10626,7 +10626,7 @@ General_DoomDesireHit:
 
 General_FocusPunchSetUp:
 	loadspritegfx ANIM_TAG_FOCUS_ENERGY
-	playsewithpan SE_W082, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
 	call EndureEffect
 	delay 8
 	createvisualtask AnimTask_BlendColorCycle, 2, 2, 2, 2, 0, 11, RGB_RED
@@ -10660,7 +10660,7 @@ General_WishHeal:
 	loadspritegfx ANIM_TAG_SPARKLE_2
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK
 	waitforvisualfinish
-	playsewithpan SE_W025, SOUND_PAN_ATTACKER
+	playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
 	call GrantingStarsEffect
 	waitforvisualfinish
 	unloadspritegfx ANIM_TAG_SPARKLE_2
@@ -10694,7 +10694,7 @@ SnatchMoveSwapMonForSubstitute:
 
 @ Healthbox blue flash effect on level up
 Special_LevelUp:
-	playsewithpan SE_EXPMAX, 0
+	playsewithpan SE_EXP_MAX, 0
 	createvisualtask AnimTask_LoadHealthboxPalsForLevelUp, 2
 	delay 0
 	createvisualtask AnimTask_FlashHealthboxOnLevelUp, 5, 0, 0
@@ -10717,7 +10717,7 @@ Special_SwitchOutOpponentMon:
 Special_BallThrow:
 	createvisualtask AnimTask_LoadBallGfx, 2
 	delay 0
-	playsewithpan SE_NAGERU, 0
+	playsewithpan SE_BALL_THROW, 0
 	createvisualtask AnimTask_ThrowBall, 2
 	createvisualtask AnimTask_IsBallBlockedByTrainer, 2
 	jumpreteq -1, BallThrowTrainerBlock
@@ -10731,7 +10731,7 @@ BallThrowTrainerBlock:
 	monbg ANIM_DEF_PARTNER
 	setalpha 12, 8
 	delay 0
-	playsewithpan SE_W003, SOUND_PAN_TARGET
+	playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
 	createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -4, -20, ANIM_TARGET, 2
 	waitforvisualfinish
 	clearmonbg ANIM_DEF_PARTNER
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index f0c0a7ea8..873425c63 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -3165,7 +3165,7 @@ BattleScript_Pausex20::
 	return
 
 BattleScript_LevelUp::
-	fanfare MUS_FANFA1
+	fanfare MUS_LEVEL_UP
 	printstring STRINGID_PKMNGREWTOLV
 	setbyte sLVLBOX_STATE, 0x0
 	drawlvlupbox
@@ -3193,7 +3193,7 @@ BattleScript_ForgotAndLearnedNewMove::
 	printstring STRINGID_ANDELLIPSIS
 BattleScript_LearnedNewMove::
 	buffermovetolearn
-	fanfare MUS_FANFA1
+	fanfare MUS_LEVEL_UP
 	printstring STRINGID_PKMNLEARNEDMOVE
 	waitmessage 0x40
 	updatechoicemoveonlvlup BS_ATTACKER
@@ -4459,9 +4459,9 @@ BattleScript_PalaceEndFlavorText::
 BattleScript_ArenaTurnBeginning::
 	waitcry BS_ATTACKER
 	volumedown
-	playse SE_HANTEI1
+	playse SE_ARENA_TIMEUP1
 	pause 0x8
-	playse SE_HANTEI1
+	playse SE_ARENA_TIMEUP1
 	various14 BS_ATTACKER
 	arenajudmengtstring 8
 	arenawaitmessage 8
@@ -4471,7 +4471,7 @@ BattleScript_ArenaTurnBeginning::
 	end2
 	
 BattleScript_82DB8E0:: @ Unused battlescript
-	playse SE_PINPON
+	playse SE_DING_DONG
 	various14 BS_ATTACKER
 	arenajudmengtstring BS_TARGET
 	arenawaitmessage BS_TARGET
@@ -4485,9 +4485,9 @@ BattleScript_ArenaDoJudgment::
 	makevisible BS_OPPONENT1
 	waitstate
 	volumedown
-	playse SE_HANTEI1
+	playse SE_ARENA_TIMEUP1
 	pause 0x8
-	playse SE_HANTEI1
+	playse SE_ARENA_TIMEUP1
 	pause 0x40
 	various14 BS_ATTACKER
 	arenajudmengtstring 1
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index 316b4df25..caa6cddac 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -118,7 +118,7 @@ BattleScript_PlayerUsesItem::
 BattleScript_OpponentUsesHealItem::
 	printstring STRINGID_EMPTYSTRING3
 	pause 0x30
-	playse SE_KAIFUKU
+	playse SE_USE_ITEM
 	printstring STRINGID_TRAINER1USEDITEM
 	waitmessage 0x40
 	useitemonopponent
@@ -135,7 +135,7 @@ BattleScript_OpponentUsesHealItem::
 BattleScript_OpponentUsesStatusCureItem::
 	printstring STRINGID_EMPTYSTRING3
 	pause 0x30
-	playse SE_KAIFUKU
+	playse SE_USE_ITEM
 	printstring STRINGID_TRAINER1USEDITEM
 	waitmessage 0x40
 	useitemonopponent
@@ -149,7 +149,7 @@ BattleScript_OpponentUsesStatusCureItem::
 BattleScript_OpponentUsesXItem::
 	printstring STRINGID_EMPTYSTRING3
 	pause 0x30
-	playse SE_KAIFUKU
+	playse SE_USE_ITEM
 	printstring STRINGID_TRAINER1USEDITEM
 	waitmessage 0x40
 	useitemonopponent
@@ -162,7 +162,7 @@ BattleScript_OpponentUsesXItem::
 BattleScript_OpponentUsesGuardSpecs::
 	printstring STRINGID_EMPTYSTRING3
 	pause 0x30
-	playse SE_KAIFUKU
+	playse SE_USE_ITEM
 	printstring STRINGID_TRAINER1USEDITEM
 	waitmessage 0x40
 	useitemonopponent
@@ -173,7 +173,7 @@ BattleScript_OpponentUsesGuardSpecs::
 	finishaction
 
 BattleScript_RunByUsingItem::
-	playse SE_NIGERU
+	playse SE_FLEE
 	setbyte gBattleOutcome, B_OUTCOME_RAN
 	finishturn
 
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 058de953b..f8348d0b0 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -713,13 +713,13 @@ Common_EventScript_SetAbnormalWeather:: @ 827207A
 	return
 
 Common_EventScript_PlayGymBadgeFanfare:: @ 827207E
-	playfanfare MUS_ME_BACHI
+	playfanfare MUS_OBTAIN_BADGE
 	waitfanfare
 	return
 
 Common_EventScript_OutOfCenterPartyHeal:: @ 8272083
 	fadescreen FADE_TO_BLACK
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 	fadescreen FADE_FROM_BLACK
@@ -736,7 +736,7 @@ EventScript_RegionMap:: @ 827208F
 
 Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0
 	setflag FLAG_DONT_TRANSITION_MUSIC
-	playbgm MUS_M_BOAT, 0
+	playbgm MUS_SAILING, 0
 	return
 
 Common_EventScript_StopBrineysBoatMusic:: @ 82720A8
@@ -820,7 +820,7 @@ Common_EventScript_NameReceivedPartyMon:: @ 82723DD
 
 Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4
 	bufferitemname 0, VAR_0x8004
-	playfanfare MUS_ME_WAZA
+	playfanfare MUS_OBTAIN_TMHM
 	message gText_PlayerHandedOverTheItem
 	waitmessage
 	waitfanfare
diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json
index 320bbb0d1..e4522dfca 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/map.json
+++ b/data/maps/AbandonedShip_CaptainsOffice/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE",
   "name": "AbandonedShip_CaptainsOffice",
   "layout": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json
index 13ccd41cd..94f42d654 100644
--- a/data/maps/AbandonedShip_Corridors_1F/map.json
+++ b/data/maps/AbandonedShip_Corridors_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
   "name": "AbandonedShip_Corridors_1F",
   "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json
index d024bb953..c65e58ca5 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/map.json
+++ b/data/maps/AbandonedShip_Corridors_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
   "name": "AbandonedShip_Corridors_B1F",
   "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json
index 781dfa193..d50e015f3 100644
--- a/data/maps/AbandonedShip_Deck/map.json
+++ b/data/maps/AbandonedShip_Deck/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_DECK",
   "name": "AbandonedShip_Deck",
   "layout": "LAYOUT_ABANDONED_SHIP_DECK",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json
index 22c63c092..e0cba2d6a 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
   "name": "AbandonedShip_HiddenFloorCorridors",
   "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json
index c41f9a7c7..b81c33c84 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
   "name": "AbandonedShip_HiddenFloorRooms",
   "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json
index aa0800faa..f5d14ac59 100644
--- a/data/maps/AbandonedShip_Room_B1F/map.json
+++ b/data/maps/AbandonedShip_Room_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_ROOM_B1F",
   "name": "AbandonedShip_Room_B1F",
   "layout": "LAYOUT_ABANDONED_SHIP_ROOM_B1F",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json
index b4f923500..b85422096 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/map.json
+++ b/data/maps/AbandonedShip_Rooms2_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_ROOMS2_1F",
   "name": "AbandonedShip_Rooms2_1F",
   "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json
index 16abfbdc2..5768a9a95 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/map.json
+++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_ROOMS2_B1F",
   "name": "AbandonedShip_Rooms2_B1F",
   "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json
index 9655f75ce..3fae6f96e 100644
--- a/data/maps/AbandonedShip_Rooms_1F/map.json
+++ b/data/maps/AbandonedShip_Rooms_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_ROOMS_1F",
   "name": "AbandonedShip_Rooms_1F",
   "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_1F",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json
index eacd70a10..d69b43157 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/map.json
+++ b/data/maps/AbandonedShip_Rooms_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_ROOMS_B1F",
   "name": "AbandonedShip_Rooms_B1F",
   "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json
index 5b2273528..7a2f9cd15 100644
--- a/data/maps/AbandonedShip_Underwater1/map.json
+++ b/data/maps/AbandonedShip_Underwater1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_UNDERWATER1",
   "name": "AbandonedShip_Underwater1",
   "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER1",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json
index 5032eb4fc..072ec34f4 100644
--- a/data/maps/AbandonedShip_Underwater2/map.json
+++ b/data/maps/AbandonedShip_Underwater2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ABANDONED_SHIP_UNDERWATER2",
   "name": "AbandonedShip_Underwater2",
   "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER2",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_ABANDONED_SHIP",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json
index df36f588d..f6b0acc10 100644
--- a/data/maps/AlteringCave/map.json
+++ b/data/maps/AlteringCave/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ALTERING_CAVE",
   "name": "AlteringCave",
   "layout": "LAYOUT_ALTERING_CAVE",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_ALTERING_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json
index da955f23a..06254e1f9 100644
--- a/data/maps/AncientTomb/map.json
+++ b/data/maps/AncientTomb/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ANCIENT_TOMB",
   "name": "AncientTomb",
   "layout": "LAYOUT_ANCIENT_TOMB",
-  "music": "MUS_MABOROSI",
+  "music": "MUS_SEALED_CHAMBER",
   "region_map_section": "MAPSEC_ANCIENT_TOMB",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json
index 2f440bec6..6b9145add 100644
--- a/data/maps/AquaHideout_1F/map.json
+++ b/data/maps/AquaHideout_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_AQUA_HIDEOUT_1F",
   "name": "AquaHideout_1F",
   "layout": "LAYOUT_AQUA_HIDEOUT_1F",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_AQUA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json
index 80b5c1d27..0b4cb8317 100644
--- a/data/maps/AquaHideout_B1F/map.json
+++ b/data/maps/AquaHideout_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_AQUA_HIDEOUT_B1F",
   "name": "AquaHideout_B1F",
   "layout": "LAYOUT_AQUA_HIDEOUT_B1F",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_AQUA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json
index e33af3c9a..d5697bfcd 100644
--- a/data/maps/AquaHideout_B2F/map.json
+++ b/data/maps/AquaHideout_B2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_AQUA_HIDEOUT_B2F",
   "name": "AquaHideout_B2F",
   "layout": "LAYOUT_AQUA_HIDEOUT_B2F",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_AQUA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.json b/data/maps/AquaHideout_UnusedRubyMap1/map.json
index b641e80d1..a2aefc63b 100644
--- a/data/maps/AquaHideout_UnusedRubyMap1/map.json
+++ b/data/maps/AquaHideout_UnusedRubyMap1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1",
   "name": "AquaHideout_UnusedRubyMap1",
   "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_AQUA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json
index 6690e5259..50175b5d5 100644
--- a/data/maps/AquaHideout_UnusedRubyMap2/map.json
+++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2",
   "name": "AquaHideout_UnusedRubyMap2",
   "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_AQUA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.json b/data/maps/AquaHideout_UnusedRubyMap3/map.json
index d1a9d6843..b26c4c1ae 100644
--- a/data/maps/AquaHideout_UnusedRubyMap3/map.json
+++ b/data/maps/AquaHideout_UnusedRubyMap3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3",
   "name": "AquaHideout_UnusedRubyMap3",
   "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_AQUA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json
index f9bd9bc65..0d315b8ee 100644
--- a/data/maps/ArtisanCave_1F/map.json
+++ b/data/maps/ArtisanCave_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ARTISAN_CAVE_1F",
   "name": "ArtisanCave_1F",
   "layout": "LAYOUT_ARTISAN_CAVE_1F",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_ARTISAN_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json
index debe5b307..07a897bb9 100644
--- a/data/maps/ArtisanCave_B1F/map.json
+++ b/data/maps/ArtisanCave_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ARTISAN_CAVE_B1F",
   "name": "ArtisanCave_B1F",
   "layout": "LAYOUT_ARTISAN_CAVE_B1F",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_ARTISAN_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json
index c0d8036a7..3c9887a65 100644
--- a/data/maps/BattleColosseum_2P/map.json
+++ b/data/maps/BattleColosseum_2P/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_COLOSSEUM_2P",
   "name": "BattleColosseum_2P",
   "layout": "LAYOUT_BATTLE_COLOSSEUM_2P",
-  "music": "MUS_RAINBOW",
+  "music": "MUS_EVER_GRANDE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json
index 4a7e250be..a6eddc9a8 100644
--- a/data/maps/BattleColosseum_4P/map.json
+++ b/data/maps/BattleColosseum_4P/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_COLOSSEUM_4P",
   "name": "BattleColosseum_4P",
   "layout": "LAYOUT_BATTLE_COLOSSEUM_4P",
-  "music": "MUS_RAINBOW",
+  "music": "MUS_EVER_GRANDE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
index c3b4154ba..5badc62d0 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
@@ -66,7 +66,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter
 	waitmovement 0
 	applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
-	playse SE_W187
+	playse SE_M_BELLY_DRUM
 	waitse
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward, MSGBOX_DEFAULT
@@ -74,7 +74,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward
 	waitmovement 0
 	applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
-	playse SE_W187
+	playse SE_M_BELLY_DRUM
 	waitse
 	waitmovement 0
 	arena_gettrainername
@@ -83,7 +83,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward
 	waitmovement 0
 	applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
-	playse SE_W187
+	playse SE_M_BELLY_DRUM
 	waitse
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT
@@ -103,7 +103,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner:: @ 82575
 	applymovement LOCALID_BLACK_BELT_2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
 	applymovement LOCALID_BLACK_BELT_3, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp
 	applymovement LOCALID_BLACK_BELT_4, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp
-	playse SE_W173
+	playse SE_M_SNORE
 	waitse
 	waitmovement 0
 	arena_gettrainername
@@ -131,7 +131,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent:: @ 8257630
 	special LoadPlayerParty
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0
@@ -286,7 +286,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight
 	waitmovement 0
 	applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
-	playse SE_W187
+	playse SE_M_BELLY_DRUM
 	waitse
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward, MSGBOX_DEFAULT
@@ -294,7 +294,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForwardLong
 	waitmovement 0
 	applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
-	playse SE_W187
+	playse SE_M_BELLY_DRUM
 	waitse
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_MakeWayForGreta, MSGBOX_DEFAULT
@@ -336,7 +336,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver:: @ 8257A5C
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll, MSGBOX_DEFAULT
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReceivedGutsSymbol
 	waitmessage
 	waitfanfare
@@ -373,7 +373,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold:: @ 8257B15
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway, MSGBOX_DEFAULT
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattleArenaBattleRoom_Text_GutsSymbolTookGoldenShine
 	waitmessage
 	waitfanfare
@@ -406,7 +406,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner:: @ 8257BA9
 	applymovement LOCALID_BLACK_BELT_2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
 	applymovement LOCALID_BLACK_BELT_3, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp
 	applymovement LOCALID_BLACK_BELT_4, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp
-	playse SE_BAN
+	playse SE_BANG
 	waitse
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
index 78665edc1..b01d5314b 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -67,7 +67,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter:: @ 824BD4E
 BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker:: @ 824BD5A
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker
 BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer:: @ 824BD61
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitmovement 0
 	compare VAR_TEMP_F, DOME_FINAL
@@ -95,7 +95,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent:: @ 824BD82
 BattleFrontier_BattleDomeBattleRoom_EventScript_Draw:: @ 824BDF7
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait, MSGBOX_DEFAULT
 	closemessage
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	delay 60
 	applymovement LOCALID_REFEREE, BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter
@@ -120,7 +120,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent:: @ 824BE4F
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw
 	compare VAR_TEMP_2, DRAW_TUCKER
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	delay 60
 BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney:: @ 824BE8D
@@ -153,7 +153,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent:: @ 824BEE0
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon
 	compare VAR_TEMP_2, DRAW_TRAINER
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	delay 60
 	dome_getroundtext
@@ -180,7 +180,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_WonLvOpenTourney:: @ 824BF96
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp, MSGBOX_DEFAULT
 BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin:: @ 824BF9E
 	special DoDomeConfetti
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	delay 60
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
@@ -361,25 +361,25 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter:: @ 824C211
 	applymovement LOCALID_AUDIENCE_TWIN, BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump
 	applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerEnterAndDance
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
 	waitmovement 0
 	message BattleFrontier_BattleDomeBattleRoom_Text_SpectatorTuckerChant
 	waitmessage
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
 	switch VAR_TEMP_E
@@ -407,7 +407,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver:: @ 824C2B9
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer
 	waitmovement 0
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_SeeYourFrontierPass, MSGBOX_DEFAULT
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattleDomeBattleRoom_Text_ReceivedTacticsSymbol
 	waitmessage
 	waitfanfare
@@ -437,7 +437,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold:: @ 824C373
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer
 	waitmovement 0
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_NeverLostWhenPowerUnleashed, MSGBOX_DEFAULT
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattleDomeBattleRoom_Text_TacticsSymbolTookGoldenShine
 	waitmessage
 	waitfanfare
@@ -456,7 +456,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle:: @ 824C400
 
 BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker:: @ 824C420
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_WinnerIsTucker, MSGBOX_DEFAULT
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json
index 5b661ce6a..89fc022c5 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/map.json
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR",
   "name": "BattleFrontier_BattleDomeCorridor",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR",
-  "music": "MUS_B_DOME1",
+  "music": "MUS_B_DOME_LOBBY",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json
index 35caadbc0..e550bbaf5 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/map.json
+++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY",
   "name": "BattleFrontier_BattleDomeLobby",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY",
-  "music": "MUS_B_DOME1",
+  "music": "MUS_B_DOME_LOBBY",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
index 0d67792b9..977a0bcae 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
@@ -224,7 +224,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle:: @ 824B5C7
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
 	special LoadPlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
index ee7a724d1..f15f6542e 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
@@ -150,7 +150,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver:: @ 825B
 	closemessage
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland
 	waitmovement 0
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattleFactoryBattleRoom_Text_ReceivedKnowledgeSymbol
 	waitmessage
 	waitfanfare
@@ -179,7 +179,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: @ 825B09
 	waitmessage
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland
 	waitmovement 0
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattleFactoryBattleRoom_Text_KnowledgeSymbolTookGoldenShine
 	waitmessage
 	waitfanfare
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
index 0491c925a..48d2bcc3a 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
@@ -62,13 +62,13 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle:: @
 	factory_setopponentmons
 	factory_resethelditems
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 	frontier_getbrainstatus
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
-	playse SE_TOREEYE
+	playse SE_POKENAV_CALL
 	waitse
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments, MSGBOX_DEFAULT
 	closemessage
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
index f1ea064d6..43db81321 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
@@ -89,7 +89,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent:: @ 824F911
 	special LoadPlayerParty
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98A
@@ -245,7 +245,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver:: @ 824F
 	applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_LetsSeeFrontierPass, MSGBOX_DEFAULT
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattlePalaceBattleRoom_Text_ReceivedSpiritsSymbol
 	waitmessage
 	waitfanfare
@@ -280,7 +280,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: @ 824FD8
 	applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_HurryWithFrontierPass, MSGBOX_DEFAULT
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattlePalaceBattleRoom_Text_SpiritsSymbolTookGoldenShine
 	waitmessage
 	waitfanfare
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json
index 8780bb0d3..1a5faadea 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/map.json
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR",
   "name": "BattleFrontier_BattlePikeCorridor",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR",
-  "music": "MUS_B_TUBE",
+  "music": "MUS_B_PIKE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json
index 3ce985ebc..2ca2ce485 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/map.json
+++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY",
   "name": "BattleFrontier_BattlePikeLobby",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY",
-  "music": "MUS_B_TUBE",
+  "music": "MUS_B_PIKE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index c1d3fc974..3e6111f42 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -265,7 +265,7 @@ BattleFrontier_BattlePikeLobby_EventScript_ExitRules:: @ 825BB47
 	end
 
 BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49
-	playse SE_CURTAIN
+	playse SE_PIKE_CURTAIN_CLOSE
 	special CloseBattlePikeCurtain
 	waitstate
 	waitse
diff --git a/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json
index 5d8067edc..5a53ad19c 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json
+++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL",
   "name": "BattleFrontier_BattlePikeRoomFinal",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL",
-  "music": "MUS_B_TUBE",
+  "music": "MUS_B_PIKE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json
index fcaac560e..82414ac6a 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json
+++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL",
   "name": "BattleFrontier_BattlePikeRoomNormal",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL",
-  "music": "MUS_B_TUBE",
+  "music": "MUS_B_PIKE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
index 327b6463c..4238dd3f3 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
@@ -83,7 +83,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle:: @ 825D285
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_RestoreToFullHealth, MSGBOX_DEFAULT
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge2, MSGBOX_DEFAULT
@@ -111,7 +111,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
 	applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp
 	applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy
 	waitmovement 0
-	playse SE_CURTAIN
+	playse SE_PIKE_CURTAIN_CLOSE
 	call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed
 	delay 4
 	call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed
@@ -120,7 +120,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
 	delay 4
 	waitse
 	delay 60
-	playse SE_CURTAIN1
+	playse SE_PIKE_CURTAIN_OPEN
 	delay 65
 	call BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed
 	showobjectat LOCALID_OBJ_0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL
@@ -154,7 +154,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver:: @ 825D3DA
 	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass, MSGBOX_DEFAULT
 	waitmessage
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattlePikeRoomNormal_Text_ReceivedLuckSymbol
 	waitmessage
 	waitfanfare
@@ -182,7 +182,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: @ 825D460
 	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass, MSGBOX_DEFAULT
 	waitmessage
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattlePikeRoomNormal_Text_LuckSymbolTookGoldenShine
 	waitmessage
 	waitfanfare
@@ -211,14 +211,14 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenNoHeal:: @ 825D4DC
 
 BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealOneMon:: @ 825D4EA
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealOne, MSGBOX_DEFAULT
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
 	end
 
 BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons:: @ 825D4FC
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealTwo, MSGBOX_DEFAULT
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
 	end
@@ -230,7 +230,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom:: @ 825D50E
 	waitmovement 0
 	message BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreToFullHealth
 	waitmessage
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge, MSGBOX_DEFAULT
@@ -573,7 +573,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC:: @ 825D83E
 	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons
 	compare VAR_RESULT, 1
 	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell, MSGBOX_DEFAULT
 	closemessage
diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json
index 433bff630..f74d54887 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json
+++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS",
   "name": "BattleFrontier_BattlePikeRoomWildMons",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS",
-  "music": "MUS_B_TUBE",
+  "music": "MUS_B_PIKE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
index 005e285d4..536e02a89 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM",
   "name": "BattleFrontier_BattlePikeThreePathRoom",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM",
-  "music": "MUS_B_TUBE",
+  "music": "MUS_B_PIKE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
index f590ff890..4f378c4e5 100644
--- a/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
@@ -33,7 +33,7 @@ BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName:: @ 8252A8F
 	end
 
 BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic:: @ 8252A98
-	playbgm MUS_PYRAMID, 0
+	playbgm MUS_B_PYRAMID, 0
 	setvar VAR_TEMP_E, 1
 	end
 
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json
index 98b62f580..56736628f 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/map.json
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
   "name": "BattleFrontier_BattlePyramidLobby",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
-  "music": "MUS_PYRAMID",
+  "music": "MUS_B_PYRAMID",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index 6c17ca02a..fc33a8c91 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -32,7 +32,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving:: @ 8250768
 	lockall
 	message BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag
 	waitmessage
-	playse SE_EXPMAX
+	playse SE_EXP_MAX
 	waitse
 	closemessage
 	pyramid_set PYRAMID_DATA_WIN_STREAK, 0
@@ -63,7 +63,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints:: @ 82507DA
 	special HealPlayerParty
 	message BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept
 	waitmessage
-	playse SE_EXPMAX
+	playse SE_EXP_MAX
 	waitse
 	msgbox BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
@@ -88,7 +88,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge:: @ 8250852
 	lockall
 	message BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag
 	waitmessage
-	playse SE_EXPMAX
+	playse SE_EXP_MAX
 	waitse
 	message BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait
 	waitmessage
@@ -388,7 +388,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag:: @ 8250D94
 BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C
 	message BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag
 	waitmessage
-	playse SE_EXPMAX
+	playse SE_EXP_MAX
 	waitse
 	msgbox BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel, MSGBOX_DEFAULT
 	closemessage
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
index 7aee4512d..076fae158 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
@@ -53,7 +53,7 @@ BattleFrontier_BattlePyramidTop_OnFrame: @ 825516E
 	.2byte 0
 
 BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic:: @ 8255180
-	playbgm MUS_PYRAMID_TOP, 0
+	playbgm MUS_B_PYRAMID_TOP, 0
 	setvar VAR_TEMP_E, 1
 	end
 
@@ -88,7 +88,7 @@ BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0
 	waitmovement 0
 	message BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid
 	waitmessage
-	playfanfare MUS_ME_POINTGET
+	playfanfare MUS_OBTAIN_B_POINTS
 	waitfanfare
 	closemessage
 BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon:: @ 825521A
@@ -136,7 +136,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech:: @ 82552D0
 BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver:: @ 82552DA
 	msgbox BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
-	playbgm MUS_PYRAMID_TOP, 0
+	playbgm MUS_B_PYRAMID_TOP, 0
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver
 	goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
@@ -146,7 +146,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver:: @ 82552FB
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
 	msgbox BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease, MSGBOX_DEFAULT
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol
 	waitmessage
 	waitfanfare
@@ -176,7 +176,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech:: @ 8255388
 BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold:: @ 8255392
 	msgbox BattleFrontier_BattlePyramidTop_Text_EverythingYouHave, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
-	playbgm MUS_PYRAMID_TOP, 0
+	playbgm MUS_B_PYRAMID_TOP, 0
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold
 	goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
@@ -186,7 +186,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold:: @ 82553B3
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
 	msgbox BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis, MSGBOX_DEFAULT
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine
 	waitmessage
 	waitfanfare
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json
index 157c9c83f..7cb154d8d 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
   "name": "BattleFrontier_BattleTowerBattleRoom",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
-  "music": "MUS_SATTOWER",
+  "music": "MUS_B_TOWER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
index bc12c14f4..493588b4d 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
@@ -69,7 +69,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
 	waitmovement 0
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F
@@ -272,7 +272,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver:: @ 824204
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized, MSGBOX_DEFAULT
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol
 	waitmessage
 	waitfanfare
@@ -299,7 +299,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold:: @ 82420CF
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease, MSGBOX_DEFAULT
-	playfanfare MUS_ME_SYMBOLGET
+	playfanfare MUS_OBTAIN_SYMBOL
 	message BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine
 	waitmessage
 	waitfanfare
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json
index fad132034..10d5ca7f7 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor/map.json
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR",
   "name": "BattleFrontier_BattleTowerCorridor",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR",
-  "music": "MUS_SATTOWER",
+  "music": "MUS_B_TOWER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json
index 3538a0469..f74dce233 100644
--- a/data/maps/BattleFrontier_BattleTowerElevator/map.json
+++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR",
   "name": "BattleFrontier_BattleTowerElevator",
   "layout": "LAYOUT_BATTLE_ELEVATOR",
-  "music": "MUS_SATTOWER",
+  "music": "MUS_B_TOWER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json
index 516a90038..3135c48fe 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/map.json
+++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
   "name": "BattleFrontier_BattleTowerLobby",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
-  "music": "MUS_SATTOWER",
+  "music": "MUS_B_TOWER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 4b1f196e3..c1174cf06 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -81,7 +81,7 @@ BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons:: @ 823E780
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints
 	message BattleFrontier_BattleTowerLobby_Text_HereAreSomeRibbons
 	waitmessage
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	waitfanfare
 	msgbox BattleFrontier_BattleTowerLobby_Text_PutRibbonOnMons, MSGBOX_DEFAULT
 BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints:: @ 823E7A5
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
index 0faeed92c..e48bcefd1 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM",
   "name": "BattleFrontier_BattleTowerMultiBattleRoom",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
-  "music": "MUS_SATTOWER",
+  "music": "MUS_B_TOWER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index d764419fd..f4de37232 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -144,7 +144,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty:: @ 8249121
 	frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_249514
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents:: @ 8249143
diff --git a/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json b/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json
index 3bb2a04b4..36b4ecd46 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json
+++ b/data/maps/BattleFrontier_BattleTowerMultiCorridor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR",
   "name": "BattleFrontier_BattleTowerMultiCorridor",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR",
-  "music": "MUS_SATTOWER",
+  "music": "MUS_B_TOWER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json
index 610c99713..c48458344 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json
+++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM",
   "name": "BattleFrontier_BattleTowerMultiPartnerRoom",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM",
-  "music": "MUS_SATTOWER",
+  "music": "MUS_B_TOWER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json
index 77742a116..50c6a90a9 100644
--- a/data/maps/BattleFrontier_ExchangeServiceCorner/map.json
+++ b/data/maps/BattleFrontier_ExchangeServiceCorner/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
   "name": "BattleFrontier_ExchangeServiceCorner",
   "layout": "LAYOUT_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
index f0fb42bb4..b7dfe19fa 100644
--- a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
+++ b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
@@ -42,7 +42,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: @ 825F0E5
 	special TakeFrontierBattlePoints
 	adddecoration VAR_0x8009
 	special UpdateBattlePointsWindow
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC, MSGBOX_DEFAULT
 	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -63,7 +63,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: @ 825F12A
 	special TakeFrontierBattlePoints
 	additem VAR_0x8009
 	special UpdateBattlePointsWindow
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize, MSGBOX_DEFAULT
 	compare VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json
index 2086ce78e..a650e3ce7 100644
--- a/data/maps/BattleFrontier_Lounge1/map.json
+++ b/data/maps/BattleFrontier_Lounge1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_LOUNGE1",
   "name": "BattleFrontier_Lounge1",
   "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json
index 11a5498af..856e2d395 100644
--- a/data/maps/BattleFrontier_Lounge2/map.json
+++ b/data/maps/BattleFrontier_Lounge2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_LOUNGE2",
   "name": "BattleFrontier_Lounge2",
   "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json
index 68d60c70e..58aee4d41 100644
--- a/data/maps/BattleFrontier_Lounge3/map.json
+++ b/data/maps/BattleFrontier_Lounge3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_LOUNGE3",
   "name": "BattleFrontier_Lounge3",
   "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc
index e892ad3ea..bc85d92d0 100644
--- a/data/maps/BattleFrontier_Lounge3/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge3/scripts.inc
@@ -74,7 +74,7 @@ BattleFrontier_Lounge3_EventScript_PlaceBet:: @ 8261E75
 	special TakeFrontierBattlePoints
 	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
 	special UpdateBattlePointsWindow
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox BattleFrontier_Lounge3_Text_ThanksOffYouGo, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge3_EventScript_FinishBet
 	end
diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json
index 9ac2466be..c82c51dce 100644
--- a/data/maps/BattleFrontier_Lounge4/map.json
+++ b/data/maps/BattleFrontier_Lounge4/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_LOUNGE4",
   "name": "BattleFrontier_Lounge4",
   "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json
index e0c2ff747..a8650cfd6 100644
--- a/data/maps/BattleFrontier_Lounge5/map.json
+++ b/data/maps/BattleFrontier_Lounge5/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_LOUNGE5",
   "name": "BattleFrontier_Lounge5",
   "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json
index 85b9bd615..36027a47e 100644
--- a/data/maps/BattleFrontier_Lounge6/map.json
+++ b/data/maps/BattleFrontier_Lounge6/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_LOUNGE6",
   "name": "BattleFrontier_Lounge6",
   "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json
index a2e795ae8..36cf3a882 100644
--- a/data/maps/BattleFrontier_Lounge7/map.json
+++ b/data/maps/BattleFrontier_Lounge7/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_LOUNGE7",
   "name": "BattleFrontier_Lounge7",
   "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json
index 794a83014..0736d3b5c 100644
--- a/data/maps/BattleFrontier_Lounge8/map.json
+++ b/data/maps/BattleFrontier_Lounge8/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_LOUNGE8",
   "name": "BattleFrontier_Lounge8",
   "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json
index 0be08a1d5..d73ad0e92 100644
--- a/data/maps/BattleFrontier_Lounge9/map.json
+++ b/data/maps/BattleFrontier_Lounge9/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_LOUNGE9",
   "name": "BattleFrontier_Lounge9",
   "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json
index 01f3352d6..10dc2cb1b 100644
--- a/data/maps/BattleFrontier_Mart/map.json
+++ b/data/maps/BattleFrontier_Mart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_MART",
   "name": "BattleFrontier_Mart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc
index 6995e405e..8e891dd32 100644
--- a/data/maps/BattleFrontier_OutsideEast/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
@@ -108,7 +108,7 @@ BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA
 	lock
 	faceplayer
 	waitse
-	playse SE_USSOKI
+	playse SE_SUDOWOODO_SHAKE
 	applymovement LOCALID_SUDOWOODO, BattleFrontier_OutsideEast_Movement_SudowoodoShake
 	waitmovement 0
 	release
@@ -120,7 +120,7 @@ BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC
 	special DoWateringBerryTreeAnim
 	waitstate
 	waitse
-	playse SE_USSOKI
+	playse SE_SUDOWOODO_SHAKE
 	applymovement LOCALID_SUDOWOODO, BattleFrontier_OutsideEast_Movement_SudowoodoShake
 	waitmovement 0
 	msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json
index 28a50f8af..b4b16ba94 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/map.json
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F",
   "name": "BattleFrontier_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json
index 98aa2be35..cb3191649 100644
--- a/data/maps/BattleFrontier_PokemonCenter_2F/map.json
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F",
   "name": "BattleFrontier_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json
index 8e179efda..5ac9f6699 100644
--- a/data/maps/BattleFrontier_RankingHall/map.json
+++ b/data/maps/BattleFrontier_RankingHall/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_RANKING_HALL",
   "name": "BattleFrontier_RankingHall",
   "layout": "LAYOUT_BATTLE_FRONTIER_RANKING_HALL",
-  "music": "MUS_BIJYUTU",
+  "music": "MUS_LILYCOVE_MUSEUM",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json
index 59f7862dc..44c71ccd1 100644
--- a/data/maps/BattleFrontier_ReceptionGate/map.json
+++ b/data/maps/BattleFrontier_ReceptionGate/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_RECEPTION_GATE",
   "name": "BattleFrontier_ReceptionGate",
   "layout": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
index 495ad165f..28f53de08 100644
--- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
@@ -33,7 +33,7 @@ BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3
 BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229
 	msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
 	msgbox BattleFrontier_ReceptionGate_Text_IssueFrontierPass, MSGBOX_DEFAULT
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass
 	waitfanfare
 	waitmessage
diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json
index a22711749..74393db0b 100644
--- a/data/maps/BattleFrontier_ScottsHouse/map.json
+++ b/data/maps/BattleFrontier_ScottsHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE",
   "name": "BattleFrontier_ScottsHouse",
   "layout": "LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 5c06e6f3a..16a1c7488 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -72,7 +72,7 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1
 	setfieldeffectargument 1, 58
 	setfieldeffectargument 2, 26
 	dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
-	playbgm MUS_RG_DEOEYE, 0
+	playbgm MUS_RG_ENCOUNTER_DEOXYS, 0
 	waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
 	addobject LOCALID_DEOXYS
 	applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach
diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json
index 36af5ca31..17da43907 100644
--- a/data/maps/CaveOfOrigin_1F/map.json
+++ b/data/maps/CaveOfOrigin_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_CAVE_OF_ORIGIN_1F",
   "name": "CaveOfOrigin_1F",
   "layout": "LAYOUT_CAVE_OF_ORIGIN_1F",
-  "music": "MUS_DAN03",
+  "music": "MUS_CAVE_OF_ORIGIN",
   "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc
index ea8d6cec8..db267aaaa 100644
--- a/data/maps/CaveOfOrigin_B1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
@@ -51,7 +51,7 @@ CaveOfOrigin_B1F_EventScript_DontRemember:: @ 8235842
 CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D
 	msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT
 	closemessage
-	playse SE_KAIDAN
+	playse SE_EXIT
 	fadescreenspeed FADE_TO_BLACK, 4
 	setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR
 	setvar VAR_SOOTOPOLIS_CITY_STATE, 3
diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json
index 78a8e58e0..f45f47f99 100644
--- a/data/maps/CaveOfOrigin_Entrance/map.json
+++ b/data/maps/CaveOfOrigin_Entrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_CAVE_OF_ORIGIN_ENTRANCE",
   "name": "CaveOfOrigin_Entrance",
   "layout": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE",
-  "music": "MUS_DAN03",
+  "music": "MUS_CAVE_OF_ORIGIN",
   "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json
index f27b15b85..8b05ac536 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1",
   "name": "CaveOfOrigin_UnusedRubySapphireMap1",
   "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1",
-  "music": "MUS_DAN03",
+  "music": "MUS_CAVE_OF_ORIGIN",
   "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
   "requires_flash": true,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json
index 5a377947c..9a3d09810 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
   "name": "CaveOfOrigin_UnusedRubySapphireMap2",
   "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
-  "music": "MUS_DAN03",
+  "music": "MUS_CAVE_OF_ORIGIN",
   "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
   "requires_flash": true,
   "weather": "WEATHER_FOG_HORIZONTAL",
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json
index 85f82b886..9456f4012 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3",
   "name": "CaveOfOrigin_UnusedRubySapphireMap3",
   "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3",
-  "music": "MUS_DAN03",
+  "music": "MUS_CAVE_OF_ORIGIN",
   "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
   "requires_flash": true,
   "weather": "WEATHER_FOG_HORIZONTAL",
diff --git a/data/maps/ContestHall/map.json b/data/maps/ContestHall/map.json
index 4f8254662..842c57968 100644
--- a/data/maps/ContestHall/map.json
+++ b/data/maps/ContestHall/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_CONTEST_HALL",
   "name": "ContestHall",
   "layout": "LAYOUT_CONTEST_HALL",
-  "music": "MUS_CONTEST0",
+  "music": "MUS_CONTEST",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ContestHall/scripts.inc b/data/maps/ContestHall/scripts.inc
index f9c3f4794..abde00cc2 100644
--- a/data/maps/ContestHall/scripts.inc
+++ b/data/maps/ContestHall/scripts.inc
@@ -32,23 +32,23 @@ ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF
 	return
 
 ContestHall_EventScript_SaveContestMusicPlayer1:: @ 823B7EF
-	savebgm MUS_TEST1
+	savebgm MUS_LINK_CONTEST_P1
 	return
 
 ContestHall_EventScript_SaveContestMusicPlayer2:: @ 823B7F3
-	savebgm MUS_TEST2
+	savebgm MUS_LINK_CONTEST_P2
 	return
 
 ContestHall_EventScript_SaveContestMusicPlayer3:: @ 823B7F7
-	savebgm MUS_TEST3
+	savebgm MUS_LINK_CONTEST_P3
 	return
 
 ContestHall_EventScript_SaveContestMusicPlayer4:: @ 823B7FB
-	savebgm MUS_TEST4
+	savebgm MUS_LINK_CONTEST_P4
 	return
 
 ContestHall_EventScript_SaveContestMusic:: @ 823B7FF
-	savebgm MUS_CONTEST0
+	savebgm MUS_CONTEST
 	return
 
 ContestHall_OnResume: @ 823B803
diff --git a/data/maps/ContestHallBeauty/map.json b/data/maps/ContestHallBeauty/map.json
index f0cb9168f..c0ba03bd3 100644
--- a/data/maps/ContestHallBeauty/map.json
+++ b/data/maps/ContestHallBeauty/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_CONTEST_HALL_BEAUTY",
   "name": "ContestHallBeauty",
   "layout": "LAYOUT_CONTEST_HALL_BEAUTY",
-  "music": "MUS_CONTEST0",
+  "music": "MUS_CONTEST",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ContestHallCool/map.json b/data/maps/ContestHallCool/map.json
index 4d1aa639e..0cd6e1e2a 100644
--- a/data/maps/ContestHallCool/map.json
+++ b/data/maps/ContestHallCool/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_CONTEST_HALL_COOL",
   "name": "ContestHallCool",
   "layout": "LAYOUT_CONTEST_HALL_COOL",
-  "music": "MUS_CONTEST0",
+  "music": "MUS_CONTEST",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ContestHallCute/map.json b/data/maps/ContestHallCute/map.json
index 4b81a3192..e52539070 100644
--- a/data/maps/ContestHallCute/map.json
+++ b/data/maps/ContestHallCute/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_CONTEST_HALL_CUTE",
   "name": "ContestHallCute",
   "layout": "LAYOUT_CONTEST_HALL_CUTE",
-  "music": "MUS_CONTEST0",
+  "music": "MUS_CONTEST",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ContestHallSmart/map.json b/data/maps/ContestHallSmart/map.json
index 42d16f911..2cbc841bd 100644
--- a/data/maps/ContestHallSmart/map.json
+++ b/data/maps/ContestHallSmart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_CONTEST_HALL_SMART",
   "name": "ContestHallSmart",
   "layout": "LAYOUT_CONTEST_HALL_SMART",
-  "music": "MUS_CONTEST0",
+  "music": "MUS_CONTEST",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ContestHallTough/map.json b/data/maps/ContestHallTough/map.json
index 4e460cd98..15dbb27b2 100644
--- a/data/maps/ContestHallTough/map.json
+++ b/data/maps/ContestHallTough/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_CONTEST_HALL_TOUGH",
   "name": "ContestHallTough",
   "layout": "LAYOUT_CONTEST_HALL_TOUGH",
-  "music": "MUS_CONTEST0",
+  "music": "MUS_CONTEST",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json
index 7e59053b7..c87df0dee 100644
--- a/data/maps/DesertRuins/map.json
+++ b/data/maps/DesertRuins/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_DESERT_RUINS",
   "name": "DesertRuins",
   "layout": "LAYOUT_DESERT_RUINS",
-  "music": "MUS_MABOROSI",
+  "music": "MUS_SEALED_CHAMBER",
   "region_map_section": "MAPSEC_DESERT_RUINS",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json
index 56d293411..20db73381 100644
--- a/data/maps/DesertUnderpass/map.json
+++ b/data/maps/DesertUnderpass/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_DESERT_UNDERPASS",
   "name": "DesertUnderpass",
   "layout": "LAYOUT_DESERT_UNDERPASS",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_DESERT_UNDERPASS",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json
index 501e68523..8beb5add7 100644
--- a/data/maps/DewfordTown/map.json
+++ b/data/maps/DewfordTown/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_DEWFORD_TOWN",
   "name": "DewfordTown",
   "layout": "LAYOUT_DEWFORD_TOWN",
-  "music": "MUS_HIGHTOWN",
+  "music": "MUS_DEWFORD",
   "region_map_section": "MAPSEC_DEWFORD_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json
index 41e7112a0..f28550f6e 100644
--- a/data/maps/DewfordTown_Gym/map.json
+++ b/data/maps/DewfordTown_Gym/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_DEWFORD_TOWN_GYM",
   "name": "DewfordTown_Gym",
   "layout": "LAYOUT_DEWFORD_TOWN_GYM",
-  "music": "MUS_GIM",
+  "music": "MUS_GYM",
   "region_map_section": "MAPSEC_DEWFORD_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc
index 98acc97dc..f67184045 100644
--- a/data/maps/DewfordTown_Gym/scripts.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
@@ -80,43 +80,43 @@ DewfordTown_Gym_EventScript_NoLightChange:: @ 81FC71A
 
 @ NOTE: A little confusingly, a larger animateflash param value is a smaller flash radius
 DewfordTown_Gym_EventScript_AnimateFlash1Trainer:: @ 81FC71B
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	animateflash 6
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
 DewfordTown_Gym_EventScript_AnimateFlash2Trainers:: @ 81FC726
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	animateflash 5
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
 DewfordTown_Gym_EventScript_AnimateFlash3Trainers:: @ 81FC731
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	animateflash 4
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
 DewfordTown_Gym_EventScript_AnimateFlash4Trainers:: @ 81FC73C
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	animateflash 3
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
 DewfordTown_Gym_EventScript_AnimateFlash5Trainers:: @ 81FC747
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	animateflash 2
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
 DewfordTown_Gym_EventScript_AnimateFlash6Trainers:: @ 81FC752
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	animateflash 1
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
 DewfordTown_Gym_EventScript_AnimateFlashFullBrightness:: @ 81FC75D
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	animateflash 0
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
@@ -169,7 +169,7 @@ DewfordTown_Gym_EventScript_BrawlyDefeated:: @ 81FC7F7
 	call DewfordTown_Gym_EventScript_GiveBulkUp
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox DewfordTown_Gym_Text_RegisteredBrawly, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json
index 6612db14b..24cde4ea1 100644
--- a/data/maps/DewfordTown_Hall/map.json
+++ b/data/maps/DewfordTown_Hall/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_DEWFORD_TOWN_HALL",
   "name": "DewfordTown_Hall",
   "layout": "LAYOUT_DEWFORD_TOWN_HALL",
-  "music": "MUS_HIGHTOWN",
+  "music": "MUS_DEWFORD",
   "region_map_section": "MAPSEC_DEWFORD_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json
index 7877a984f..fd53469b9 100644
--- a/data/maps/DewfordTown_House1/map.json
+++ b/data/maps/DewfordTown_House1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_DEWFORD_TOWN_HOUSE1",
   "name": "DewfordTown_House1",
   "layout": "LAYOUT_HOUSE3",
-  "music": "MUS_HIGHTOWN",
+  "music": "MUS_DEWFORD",
   "region_map_section": "MAPSEC_DEWFORD_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json
index 319bbed72..4384f3767 100644
--- a/data/maps/DewfordTown_House2/map.json
+++ b/data/maps/DewfordTown_House2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_DEWFORD_TOWN_HOUSE2",
   "name": "DewfordTown_House2",
   "layout": "LAYOUT_HOUSE4",
-  "music": "MUS_HIGHTOWN",
+  "music": "MUS_DEWFORD",
   "region_map_section": "MAPSEC_DEWFORD_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json
index 480bc5556..131c93092 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/map.json
+++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F",
   "name": "DewfordTown_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_DEWFORD_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json
index 8de59b2a3..56add5053 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/map.json
+++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F",
   "name": "DewfordTown_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_DEWFORD_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json
index 5f67720e6..9db9c8feb 100644
--- a/data/maps/EverGrandeCity/map.json
+++ b/data/maps/EverGrandeCity/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY",
   "name": "EverGrandeCity",
   "layout": "LAYOUT_EVER_GRANDE_CITY",
-  "music": "MUS_RAINBOW",
+  "music": "MUS_EVER_GRANDE",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json
index ded3a305f..34fb96e46 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/map.json
+++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
   "name": "EverGrandeCity_ChampionsRoom",
   "layout": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index 5ef3a946e..d41c10d0a 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -42,7 +42,7 @@ EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace: @ 8228A42
 	step_end
 
 EverGrandeCity_ChampionsRoom_EventScript_Wallace:: @ 8228A45
-	playbgm MUS_DAIGO, 0
+	playbgm MUS_ENCOUNTER_CHAMPION, 0
 	msgbox EverGrandeCity_ChampionsRoom_Text_IntroSpeech, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_Defeat
 	goto EverGrandeCity_ChampionsRoom_EventScript_Defeated
@@ -71,11 +71,11 @@ EverGrandeCity_ChampionsRoom_EventScript_Defeated:: @ 8228A61
 	end
 
 EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic:: @ 8228ABC
-	playbgm MUS_GIRL_SUP, 0
+	playbgm MUS_ENCOUNTER_MAY, 0
 	return
 
 EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic:: @ 8228AC1
-	playbgm MUS_BOY_SUP, 0
+	playbgm MUS_ENCOUNTER_BRENDAN, 0
 	return
 
 EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: @ 8228AC6
diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json
index 9b54a5e5b..b7bcd4966 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/map.json
+++ b/data/maps/EverGrandeCity_DrakesRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM",
   "name": "EverGrandeCity_DrakesRoom",
   "layout": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
index b9debf676..feb65d149 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
@@ -42,7 +42,7 @@ EverGrandeCity_DrakesRoom_EventScript_Drake:: @ 82286F3
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech
-	playbgm MUS_SITENNOU, 0
+	playbgm MUS_ENCOUNTER_ELITE_FOUR, 0
 	msgbox EverGrandeCity_DrakesRoom_Text_IntroSpeech, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_Defeat
 	goto EverGrandeCity_DrakesRoom_EventScript_Defeated
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json
index 21c50192b..86a840d13 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/map.json
+++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
   "name": "EverGrandeCity_GlaciasRoom",
   "layout": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
index 6e6254faa..ff04a752a 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
@@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_Glacia:: @ 8228469
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech
-	playbgm MUS_SITENNOU, 0
+	playbgm MUS_ENCOUNTER_ELITE_FOUR, 0
 	msgbox EverGrandeCity_GlaciasRoom_Text_IntroSpeech, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_Defeat
 	goto EverGrandeCity_GlaciasRoom_EventScript_Defeated
diff --git a/data/maps/EverGrandeCity_Hall1/map.json b/data/maps/EverGrandeCity_Hall1/map.json
index 692e7ff7c..426b9f6e4 100644
--- a/data/maps/EverGrandeCity_Hall1/map.json
+++ b/data/maps/EverGrandeCity_Hall1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_HALL1",
   "name": "EverGrandeCity_Hall1",
   "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_Hall2/map.json b/data/maps/EverGrandeCity_Hall2/map.json
index ea1203725..3535734e9 100644
--- a/data/maps/EverGrandeCity_Hall2/map.json
+++ b/data/maps/EverGrandeCity_Hall2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_HALL2",
   "name": "EverGrandeCity_Hall2",
   "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_Hall3/map.json b/data/maps/EverGrandeCity_Hall3/map.json
index 327b28399..b7fe8f4ec 100644
--- a/data/maps/EverGrandeCity_Hall3/map.json
+++ b/data/maps/EverGrandeCity_Hall3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_HALL3",
   "name": "EverGrandeCity_Hall3",
   "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_Hall4/map.json b/data/maps/EverGrandeCity_Hall4/map.json
index ff91999e0..b0501cd38 100644
--- a/data/maps/EverGrandeCity_Hall4/map.json
+++ b/data/maps/EverGrandeCity_Hall4/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_HALL4",
   "name": "EverGrandeCity_Hall4",
   "layout": "LAYOUT_EVER_GRANDE_CITY_HALL4",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_Hall5/map.json b/data/maps/EverGrandeCity_Hall5/map.json
index 562e11565..1f6705f3a 100644
--- a/data/maps/EverGrandeCity_Hall5/map.json
+++ b/data/maps/EverGrandeCity_Hall5/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_HALL5",
   "name": "EverGrandeCity_Hall5",
   "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json
index 04b68237d..e09190eb9 100644
--- a/data/maps/EverGrandeCity_HallOfFame/map.json
+++ b/data/maps/EverGrandeCity_HallOfFame/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME",
   "name": "EverGrandeCity_HallOfFame",
   "layout": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME",
-  "music": "MUS_EIKOU_R",
+  "music": "MUS_HALL_OF_FAME_ROOM",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json
index 5716b3ef1..09c6dd40e 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/map.json
+++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
   "name": "EverGrandeCity_PhoebesRoom",
   "layout": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
index 891b3c56e..e98bf4eb3 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
@@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_Phoebe:: @ 82281CB
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech
-	playbgm MUS_SITENNOU, 0
+	playbgm MUS_ENCOUNTER_ELITE_FOUR, 0
 	msgbox EverGrandeCity_PhoebesRoom_Text_IntroSpeech, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_Defeat
 	goto EverGrandeCity_PhoebesRoom_EventScript_Defeated
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json
index 85a2c677b..196ebd0f2 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F",
   "name": "EverGrandeCity_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index 3b6d94249..a6cf1b74e 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -45,7 +45,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_Scott:: @ 8229A79
 	call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit
 	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_IN_EVERGRANDE
-	playse SE_KAIDAN
+	playse SE_EXIT
 	waitse
 	removeobject LOCALID_SCOTT
 	release
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json
index 7dfa712a6..b734f9ad5 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F",
   "name": "EverGrandeCity_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
index 6b0c0be80..f76febc01 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
   "name": "EverGrandeCity_PokemonLeague_1F",
   "layout": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
index cf824b8e8..5eed4faa6 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
@@ -68,7 +68,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: @ 8229636
 	applymovement LOCALID_GUARD_2, EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay
 	waitmovement 0
 	delay 10
-	playfanfare MUS_ME_BACHI
+	playfanfare MUS_OBTAIN_BADGE
 	message EverGrandeCity_PokemonLeague_1F_Text_GoForth
 	waitmessage
 	waitfanfare
@@ -90,7 +90,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft:: @ 82296A
 	return
 
 EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges:: @ 82296AE
-	playse SE_HAZURE
+	playse SE_FAILURE
 	msgbox EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json
index 8289458b0..a4b5cb1f2 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F",
   "name": "EverGrandeCity_PokemonLeague_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json
index 39cdea6ce..dc84d36d6 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/map.json
+++ b/data/maps/EverGrandeCity_SidneysRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
   "name": "EverGrandeCity_SidneysRoom",
   "layout": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_EVER_GRANDE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
index 9bc975789..717651b26 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
@@ -47,7 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_Sidney:: @ 8227F64
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech
-	playbgm MUS_SITENNOU, 0
+	playbgm MUS_ENCOUNTER_ELITE_FOUR, 0
 	msgbox EverGrandeCity_SidneysRoom_Text_IntroSpeech, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_Defeat
 	goto EverGrandeCity_SidneysRoom_EventScript_Defeated
diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json
index 54809f977..74355a870 100644
--- a/data/maps/FallarborTown/map.json
+++ b/data/maps/FallarborTown/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FALLARBOR_TOWN",
   "name": "FallarborTown",
   "layout": "LAYOUT_FALLARBOR_TOWN",
-  "music": "MUS_TONEKUSA",
+  "music": "MUS_FALLARBOR",
   "region_map_section": "MAPSEC_FALLARBOR_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json
index adf6dfd94..7b702dc0e 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/map.json
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM",
   "name": "FallarborTown_BattleTentBattleRoom",
   "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_FALLARBOR_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
index feb8f49e1..fd1f27860 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
@@ -52,7 +52,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820090F
 	applymovement LOCALID_OPPONENT, FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter
 	waitmovement 0
 	applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump
-	playse SE_W187
+	playse SE_M_BELLY_DRUM
 	waitse
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT
@@ -63,7 +63,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820090F
 	switch VAR_RESULT
 	case 1, FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent
 	applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump
-	playse SE_W173
+	playse SE_M_SNORE
 	waitse
 	waitmovement 0
 	fallarbortent_getopponentname
@@ -76,7 +76,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost:: @ 820097E
 
 FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 820099C
 	applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump
-	playse SE_BAN
+	playse SE_BANG
 	waitse
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT
@@ -98,7 +98,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_IncrementBattleNum:: @ 82009B3
 	special LoadPlayerParty
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 8200A2A
diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json
index 3bda44484..c086a3288 100644
--- a/data/maps/FallarborTown_BattleTentCorridor/map.json
+++ b/data/maps/FallarborTown_BattleTentCorridor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR",
   "name": "FallarborTown_BattleTentCorridor",
   "layout": "LAYOUT_BATTLE_TENT_CORRIDOR",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_FALLARBOR_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json
index 58a1463e9..a796a3f10 100644
--- a/data/maps/FallarborTown_BattleTentLobby/map.json
+++ b/data/maps/FallarborTown_BattleTentLobby/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY",
   "name": "FallarborTown_BattleTentLobby",
   "layout": "LAYOUT_BATTLE_TENT_LOBBY",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_FALLARBOR_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
index 54248e402..0a6a4f16c 100644
--- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
@@ -55,7 +55,7 @@ FallarborTown_BattleTentLobby_EventScript_GivePrize:: @ 81FFF27
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	message FallarborTown_BattleTentLobby_Text_ReceivedPrize
 	waitmessage
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	waitfanfare
 	msgbox FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge2, MSGBOX_DEFAULT
 	closemessage
diff --git a/data/maps/FallarborTown_CozmosHouse/map.json b/data/maps/FallarborTown_CozmosHouse/map.json
index a1ed47885..a7ae1f90d 100644
--- a/data/maps/FallarborTown_CozmosHouse/map.json
+++ b/data/maps/FallarborTown_CozmosHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FALLARBOR_TOWN_COZMOS_HOUSE",
   "name": "FallarborTown_CozmosHouse",
   "layout": "LAYOUT_HOUSE1",
-  "music": "MUS_TONEKUSA",
+  "music": "MUS_FALLARBOR",
   "region_map_section": "MAPSEC_FALLARBOR_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json
index 29040bcd7..77c5df976 100644
--- a/data/maps/FallarborTown_Mart/map.json
+++ b/data/maps/FallarborTown_Mart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FALLARBOR_TOWN_MART",
   "name": "FallarborTown_Mart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_FALLARBOR_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/map.json b/data/maps/FallarborTown_MoveRelearnersHouse/map.json
index 220b6cb8e..ce3f3a3dd 100644
--- a/data/maps/FallarborTown_MoveRelearnersHouse/map.json
+++ b/data/maps/FallarborTown_MoveRelearnersHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FALLARBOR_TOWN_MOVE_RELEARNERS_HOUSE",
   "name": "FallarborTown_MoveRelearnersHouse",
   "layout": "LAYOUT_HOUSE2",
-  "music": "MUS_TONEKUSA",
+  "music": "MUS_FALLARBOR",
   "region_map_section": "MAPSEC_FALLARBOR_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json
index 5f85478dc..cb0690829 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/map.json
+++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F",
   "name": "FallarborTown_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_FALLARBOR_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index c65cf5d4e..e7967046d 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -50,7 +50,7 @@ FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest:: @ 8200C38
 	end
 
 FallarborTown_PokemonCenter_1F_EventScript_LanetteExited:: @ 8200C48
-	playse SE_JIDO_DOA
+	playse SE_SLIDING_DOOR
 	removeobject LOCALID_LANETTE
 	clearflag FLAG_HIDE_LANETTES_HOUSE_LANETTE
 	release
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json
index 202485ea0..ada498a42 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/map.json
+++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F",
   "name": "FallarborTown_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_FALLARBOR_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json
index 6898f5b24..d3c6056a0 100644
--- a/data/maps/FarawayIsland_Entrance/map.json
+++ b/data/maps/FarawayIsland_Entrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FARAWAY_ISLAND_ENTRANCE",
   "name": "FarawayIsland_Entrance",
   "layout": "LAYOUT_FARAWAY_ISLAND_ENTRANCE",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_FARAWAY_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json
index 4f427e8a4..1ec092fbe 100644
--- a/data/maps/FarawayIsland_Interior/map.json
+++ b/data/maps/FarawayIsland_Interior/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FARAWAY_ISLAND_INTERIOR",
   "name": "FarawayIsland_Interior",
   "layout": "LAYOUT_FARAWAY_ISLAND_INTERIOR",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_FARAWAY_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json
index 424596c0c..ef11990d8 100644
--- a/data/maps/FieryPath/map.json
+++ b/data/maps/FieryPath/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FIERY_PATH",
   "name": "FieryPath",
   "layout": "LAYOUT_FIERY_PATH",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_FIERY_PATH",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json
index 062d0808a..86d43693a 100644
--- a/data/maps/FortreeCity/map.json
+++ b/data/maps/FortreeCity/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FORTREE_CITY",
   "name": "FortreeCity",
   "layout": "LAYOUT_FORTREE_CITY",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_FORTREE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json
index f5af152af..59b707a95 100644
--- a/data/maps/FortreeCity_DecorationShop/map.json
+++ b/data/maps/FortreeCity_DecorationShop/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FORTREE_CITY_DECORATION_SHOP",
   "name": "FortreeCity_DecorationShop",
   "layout": "LAYOUT_FORTREE_CITY_DECORATION_SHOP",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_FORTREE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json
index fcaf1a036..0db326d07 100644
--- a/data/maps/FortreeCity_Gym/map.json
+++ b/data/maps/FortreeCity_Gym/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FORTREE_CITY_GYM",
   "name": "FortreeCity_Gym",
   "layout": "LAYOUT_FORTREE_CITY_GYM",
-  "music": "MUS_GIM",
+  "music": "MUS_GYM",
   "region_map_section": "MAPSEC_FORTREE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc
index f209ceefa..688c11645 100644
--- a/data/maps/FortreeCity_Gym/scripts.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
@@ -37,7 +37,7 @@ FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD
 	call FortreeCity_Gym_EventScript_GiveAerialAce
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox FortreeCity_Gym_Text_RegisteredWinona, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json
index ae35cf601..cef203093 100644
--- a/data/maps/FortreeCity_House1/map.json
+++ b/data/maps/FortreeCity_House1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FORTREE_CITY_HOUSE1",
   "name": "FortreeCity_House1",
   "layout": "LAYOUT_FORTREE_CITY_HOUSE1",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_FORTREE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json
index dcd8f30cd..fed6a9f65 100644
--- a/data/maps/FortreeCity_House2/map.json
+++ b/data/maps/FortreeCity_House2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FORTREE_CITY_HOUSE2",
   "name": "FortreeCity_House2",
   "layout": "LAYOUT_FORTREE_CITY_HOUSE2",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_FORTREE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json
index e96be4174..f7c47ede1 100644
--- a/data/maps/FortreeCity_House3/map.json
+++ b/data/maps/FortreeCity_House3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FORTREE_CITY_HOUSE3",
   "name": "FortreeCity_House3",
   "layout": "LAYOUT_FORTREE_CITY_HOUSE1",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_FORTREE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json
index 699660056..a01772eea 100644
--- a/data/maps/FortreeCity_House4/map.json
+++ b/data/maps/FortreeCity_House4/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FORTREE_CITY_HOUSE4",
   "name": "FortreeCity_House4",
   "layout": "LAYOUT_FORTREE_CITY_HOUSE2",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_FORTREE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json
index 32fcefe2b..b1577e648 100644
--- a/data/maps/FortreeCity_House5/map.json
+++ b/data/maps/FortreeCity_House5/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FORTREE_CITY_HOUSE5",
   "name": "FortreeCity_House5",
   "layout": "LAYOUT_FORTREE_CITY_HOUSE1",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_FORTREE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json
index a52ece8b2..61ab4cefd 100644
--- a/data/maps/FortreeCity_Mart/map.json
+++ b/data/maps/FortreeCity_Mart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FORTREE_CITY_MART",
   "name": "FortreeCity_Mart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_FORTREE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json
index 16c5fe8b6..d59349033 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/map.json
+++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FORTREE_CITY_POKEMON_CENTER_1F",
   "name": "FortreeCity_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_FORTREE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json
index fdd9ee79d..1859bf131 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/map.json
+++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_FORTREE_CITY_POKEMON_CENTER_2F",
   "name": "FortreeCity_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_FORTREE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json
index a4c2bf0ff..ff60d726b 100644
--- a/data/maps/GraniteCave_1F/map.json
+++ b/data/maps/GraniteCave_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_GRANITE_CAVE_1F",
   "name": "GraniteCave_1F",
   "layout": "LAYOUT_GRANITE_CAVE_1F",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_GRANITE_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json
index 103220612..be2f5ae01 100644
--- a/data/maps/GraniteCave_B1F/map.json
+++ b/data/maps/GraniteCave_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_GRANITE_CAVE_B1F",
   "name": "GraniteCave_B1F",
   "layout": "LAYOUT_GRANITE_CAVE_B1F",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_GRANITE_CAVE",
   "requires_flash": true,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json
index c3f6fbf9a..bf58a40e3 100644
--- a/data/maps/GraniteCave_B2F/map.json
+++ b/data/maps/GraniteCave_B2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_GRANITE_CAVE_B2F",
   "name": "GraniteCave_B2F",
   "layout": "LAYOUT_GRANITE_CAVE_B2F",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_GRANITE_CAVE",
   "requires_flash": true,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json
index 934a8320e..070530378 100644
--- a/data/maps/GraniteCave_StevensRoom/map.json
+++ b/data/maps/GraniteCave_StevensRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_GRANITE_CAVE_STEVENS_ROOM",
   "name": "GraniteCave_StevensRoom",
   "layout": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_GRANITE_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
index 7d0b275a5..650177b95 100644
--- a/data/maps/GraniteCave_StevensRoom/scripts.inc
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
@@ -17,7 +17,7 @@ GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B
 	msgbox GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox GraniteCave_StevensRoom_Text_RegisteredSteven, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
@@ -33,7 +33,7 @@ GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B
 	call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast
 	compare VAR_FACING, DIR_EAST
 	call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast
-	playse SE_KAIDAN
+	playse SE_EXIT
 	removeobject LOCALID_STEVEN
 	release
 	end
diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json
index 0cb71092d..7c540411f 100644
--- a/data/maps/IslandCave/map.json
+++ b/data/maps/IslandCave/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ISLAND_CAVE",
   "name": "IslandCave",
   "layout": "LAYOUT_ISLAND_CAVE",
-  "music": "MUS_MABOROSI",
+  "music": "MUS_SEALED_CHAMBER",
   "region_map_section": "MAPSEC_ISLAND_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc
index 8587e62c2..56643a504 100644
--- a/data/maps/IslandCave/scripts.inc
+++ b/data/maps/IslandCave/scripts.inc
@@ -46,7 +46,7 @@ IslandCave_EventScript_OpenRegiEntrance:: @ 8238EAF
 	setmetatile 8, 20, METATILE_Cave_SealedChamberEntrance_BottomMid, 0
 	setmetatile 9, 20, METATILE_Cave_SealedChamberEntrance_BottomRight, 1
 	special DrawWholeMapView
-	playse SE_BAN
+	playse SE_BANG
 	setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED
 	end
 
diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json
index eeac79e15..d7e7d5e2e 100644
--- a/data/maps/JaggedPass/map.json
+++ b/data/maps/JaggedPass/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_JAGGED_PASS",
   "name": "JaggedPass",
   "layout": "LAYOUT_JAGGED_PASS",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_JAGGED_PASS",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc
index eacc7835e..c7fc95676 100644
--- a/data/maps/JaggedPass/scripts.inc
+++ b/data/maps/JaggedPass/scripts.inc
@@ -58,7 +58,7 @@ JaggedPass_EventScript_OpenMagmaHideout:: @ 82306BB
 	setvar VAR_0x8007, 3   @ shake delay
 	special ShakeCamera
 	waitstate
-	playse SE_KOUKA_M
+	playse SE_EFFECTIVE
 	setmetatile 16, 17, METATILE_Lavaridge_CaveEntrance_Top, 1
 	setmetatile 16, 18, METATILE_Lavaridge_CaveEntrance_Bottom, 0
 	special DrawWholeMapView
diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json
index 1ab9f60cf..54bda6ca3 100644
--- a/data/maps/LavaridgeTown/map.json
+++ b/data/maps/LavaridgeTown/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LAVARIDGE_TOWN",
   "name": "LavaridgeTown",
   "layout": "LAYOUT_LAVARIDGE_TOWN",
-  "music": "MUS_MACHI_S4",
+  "music": "MUS_OLDALE",
   "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
index 47c5482a6..1f9fe421d 100644
--- a/data/maps/LavaridgeTown/scripts.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -105,11 +105,11 @@ LavaridgeTown_EventScript_RivalExit:: @ 81EA5FF
 	end
 
 LavaridgeTown_EventScript_PlayMayMusic:: @ 81EA630
-	playbgm MUS_GIRL_SUP, 1
+	playbgm MUS_ENCOUNTER_MAY, 1
 	return
 
 LavaridgeTown_EventScript_PlayBrendanMusic:: @ 81EA635
-	playbgm MUS_BOY_SUP, 1
+	playbgm MUS_ENCOUNTER_BRENDAN, 1
 	return
 
 LavaridgeTown_EventScript_RivalNoticePlayer:: @ 81EA63A
@@ -258,7 +258,7 @@ LavaridgeTown_EventScript_EggWoman:: @ 81EA744
 	goto_if_eq LavaridgeTown_EventScript_NoRoomForEgg
 	msgbox LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_LAVARIDGE_EGG
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message LavaridgeTown_Text_ReceivedTheEgg
 	waitfanfare
 	giveegg SPECIES_WYNAUT
diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json
index 49b4ef2fd..2f624a2f9 100644
--- a/data/maps/LavaridgeTown_Gym_1F/map.json
+++ b/data/maps/LavaridgeTown_Gym_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LAVARIDGE_TOWN_GYM_1F",
   "name": "LavaridgeTown_Gym_1F",
   "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_1F",
-  "music": "MUS_GIM",
+  "music": "MUS_GYM",
   "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
index 3747d854d..df95a0b4b 100644
--- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
@@ -76,7 +76,7 @@ LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1
 	call LavaridgeTown_Gym_1F_EventScript_GiveOverheat
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox LavaridgeTown_Gym_1F_Text_RegisteredFlannery, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json
index 0b1e81445..bbcdbcbe1 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/map.json
+++ b/data/maps/LavaridgeTown_Gym_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LAVARIDGE_TOWN_GYM_B1F",
   "name": "LavaridgeTown_Gym_B1F",
   "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F",
-  "music": "MUS_GIM",
+  "music": "MUS_GYM",
   "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json
index e76a98f64..6be35b729 100644
--- a/data/maps/LavaridgeTown_HerbShop/map.json
+++ b/data/maps/LavaridgeTown_HerbShop/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LAVARIDGE_TOWN_HERB_SHOP",
   "name": "LavaridgeTown_HerbShop",
   "layout": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP",
-  "music": "MUS_MACHI_S4",
+  "music": "MUS_OLDALE",
   "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json
index 5827399bd..2a8d5362c 100644
--- a/data/maps/LavaridgeTown_House/map.json
+++ b/data/maps/LavaridgeTown_House/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LAVARIDGE_TOWN_HOUSE",
   "name": "LavaridgeTown_House",
   "layout": "LAYOUT_HOUSE3",
-  "music": "MUS_MACHI_S4",
+  "music": "MUS_OLDALE",
   "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json
index 8099a5463..5c871785d 100644
--- a/data/maps/LavaridgeTown_Mart/map.json
+++ b/data/maps/LavaridgeTown_Mart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LAVARIDGE_TOWN_MART",
   "name": "LavaridgeTown_Mart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json
index 1542b7b50..42cf11aed 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F",
   "name": "LavaridgeTown_PokemonCenter_1F",
   "layout": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json
index eb68b0bb5..72a5f688b 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F",
   "name": "LavaridgeTown_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_LAVARIDGE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json
index 8d35fc0c6..a13904ca9 100644
--- a/data/maps/LilycoveCity/map.json
+++ b/data/maps/LilycoveCity/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY",
   "name": "LilycoveCity",
   "layout": "LAYOUT_LILYCOVE_CITY",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index b8f0cd566..0c94bce62 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -241,7 +241,7 @@ LilycoveCity_EventScript_Rival:: @ 81E2DDE
 	end
 
 LilycoveCity_EventScript_May:: @ 81E2DF8
-	playbgm MUS_GIRL_SUP, 1
+	playbgm MUS_ENCOUNTER_MAY, 1
 	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattleAgain
 	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattle
 	compare VAR_RESULT, NO
@@ -270,7 +270,7 @@ LilycoveCity_EventScript_DeclineMayBattle:: @ 81E2E5A
 	end
 
 LilycoveCity_EventScript_Brendan:: @ 81E2E6B
-	playbgm MUS_BOY_SUP, 1
+	playbgm MUS_ENCOUNTER_BRENDAN, 1
 	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattleAgain
 	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattle
 	compare VAR_RESULT, NO
diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json
index bddb6d7c1..e8151c832 100644
--- a/data/maps/LilycoveCity_ContestHall/map.json
+++ b/data/maps/LilycoveCity_ContestHall/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_CONTEST_HALL",
   "name": "LilycoveCity_ContestHall",
   "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL",
-  "music": "MUS_CONLOBBY",
+  "music": "MUS_CONTEST_LOBBY",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json
index eb7ebf907..ac5346dc4 100644
--- a/data/maps/LilycoveCity_ContestLobby/map.json
+++ b/data/maps/LilycoveCity_ContestLobby/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_CONTEST_LOBBY",
   "name": "LilycoveCity_ContestLobby",
   "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY",
-  "music": "MUS_CONLOBBY",
+  "music": "MUS_CONTEST_LOBBY",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 6b71c5125..51c38e3f4 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -99,7 +99,7 @@ LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon:: @ 821A314
 	applymovement LOCALID_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer
 	waitmovement 0
 	msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT
 	waitfanfare
 	msgbox LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon, MSGBOX_DEFAULT
@@ -272,7 +272,7 @@ LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon:: @ 821A4E4
 	applymovement LOCALID_ARTIST_LINK, LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer
 	waitmovement 0
 	msgbox LilycoveCity_ContestLobby_Text_TakeMementoOfPainting, MSGBOX_DEFAULT
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	msgbox LilycoveCity_ContestLobby_Text_ReceivedARibbon, MSGBOX_DEFAULT
 	waitfanfare
 	msgbox LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon, MSGBOX_DEFAULT
@@ -417,13 +417,13 @@ LilycoveCity_ContestLobby_EventScript_LeadToContestHall:: @ 821A670
 	lockall
 	applymovement LOCALID_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter
 	waitmovement 0
-	playse SE_HASHI
+	playse SE_BRIDGE_WALK
 	setmetatile 12, 2, METATILE_Contest_WallShadow, 1
 	setmetatile 12, 3, METATILE_Contest_FloorShadow, 1
 	special DrawWholeMapView
 	applymovement LOCALID_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter
 	waitmovement 0
-	playse SE_HASHI
+	playse SE_BRIDGE_WALK
 	setmetatile 12, 2, METATILE_Contest_CounterFlap_Top, 1
 	setmetatile 12, 3, METATILE_Contest_CounterFlap_Bottom, 1
 	special DrawWholeMapView
@@ -938,13 +938,13 @@ LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: @ 821AC49
 	closemessage
 	applymovement LOCALID_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter
 	waitmovement 0
-	playse SE_HASHI
+	playse SE_BRIDGE_WALK
 	setmetatile 17, 2, METATILE_Contest_WallShadow, 1
 	setmetatile 17, 3, METATILE_Contest_FloorShadow, 1
 	special DrawWholeMapView
 	applymovement LOCALID_LINK_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter
 	waitmovement 0
-	playse SE_HASHI
+	playse SE_BRIDGE_WALK
 	setmetatile 17, 2, METATILE_Contest_CounterFlap_Top, 1
 	setmetatile 17, 3, METATILE_Contest_CounterFlap_Bottom, 1
 	special DrawWholeMapView
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
index ba6563877..4b18e22c1 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F",
   "name": "LilycoveCity_CoveLilyMotel_1F",
   "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
index ff84a3bf7..f55770b88 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F",
   "name": "LilycoveCity_CoveLilyMotel_2F",
   "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
index 7878e791a..9d3520be5 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
@@ -18,7 +18,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex:: @ 82186F9
 
 LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare:: @ 8218702
 	setflag FLAG_TEMP_2
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	waitfanfare
 	goto LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma
 	end
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json
index 989cf65ef..9a3c43308 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR",
   "name": "LilycoveCity_DepartmentStoreElevator",
   "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
index 856c06bd4..deb7ad044 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP",
   "name": "LilycoveCity_DepartmentStoreRooftop",
   "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index 12cb4727c..8d7459b3c 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
@@ -145,7 +145,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F
 	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyLemonade
 	updatemoneybox 0, 0
 	bufferitemname 0, VAR_TEMP_0
-	playse SE_JIHANKI
+	playse SE_VEND
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown, MSGBOX_DEFAULT
 	additem VAR_TEMP_0
 	bufferitemname 1, VAR_TEMP_0
@@ -157,7 +157,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F
 	checkitemspace VAR_TEMP_0, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink
-	playse SE_JIHANKI
+	playse SE_VEND
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT
 	additem VAR_TEMP_0
 	bufferitemname 1, VAR_TEMP_0
@@ -169,7 +169,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F
 	checkitemspace VAR_TEMP_0, 1
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink
-	playse SE_JIHANKI
+	playse SE_VEND
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown, MSGBOX_DEFAULT
 	additem VAR_TEMP_0
 	bufferitemname 1, VAR_TEMP_0
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json
index 9efcdb13a..758e063f6 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F",
   "name": "LilycoveCity_DepartmentStore_1F",
   "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json
index 7a1e8bf04..ebef46ae5 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F",
   "name": "LilycoveCity_DepartmentStore_2F",
   "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json
index e95c8173f..c911b9d26 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F",
   "name": "LilycoveCity_DepartmentStore_3F",
   "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json
index d57963ac7..c6291ec2c 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F",
   "name": "LilycoveCity_DepartmentStore_4F",
   "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json
index d92404b98..6123c1c78 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F",
   "name": "LilycoveCity_DepartmentStore_5F",
   "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json
index b5238ac20..491d42624 100644
--- a/data/maps/LilycoveCity_Harbor/map.json
+++ b/data/maps/LilycoveCity_Harbor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_HARBOR",
   "name": "LilycoveCity_Harbor",
   "layout": "LAYOUT_HARBOR",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json
index 85ea994c5..bd6850f5a 100644
--- a/data/maps/LilycoveCity_House1/map.json
+++ b/data/maps/LilycoveCity_House1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_HOUSE1",
   "name": "LilycoveCity_House1",
   "layout": "LAYOUT_HOUSE1",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json
index 719a63067..5c208c852 100644
--- a/data/maps/LilycoveCity_House2/map.json
+++ b/data/maps/LilycoveCity_House2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_HOUSE2",
   "name": "LilycoveCity_House2",
   "layout": "LAYOUT_LILYCOVE_CITY_HOUSE2",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json
index 3b4212c1a..0331372c9 100644
--- a/data/maps/LilycoveCity_House3/map.json
+++ b/data/maps/LilycoveCity_House3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_HOUSE3",
   "name": "LilycoveCity_House3",
   "layout": "LAYOUT_HOUSE2",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json
index e086b2d45..7a1571abf 100644
--- a/data/maps/LilycoveCity_House4/map.json
+++ b/data/maps/LilycoveCity_House4/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_HOUSE4",
   "name": "LilycoveCity_House4",
   "layout": "LAYOUT_HOUSE1",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json
index 8e5605821..09875fddc 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F",
   "name": "LilycoveCity_LilycoveMuseum_1F",
   "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F",
-  "music": "MUS_BIJYUTU",
+  "music": "MUS_LILYCOVE_MUSEUM",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json
index 7c3c144c8..76d30eb68 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F",
   "name": "LilycoveCity_LilycoveMuseum_2F",
   "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F",
-  "music": "MUS_BIJYUTU",
+  "music": "MUS_LILYCOVE_MUSEUM",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json
index caed79705..814719a9c 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE",
   "name": "LilycoveCity_MoveDeletersHouse",
   "layout": "LAYOUT_HOUSE2",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
index 6e7f9c580..1a27e3b8f 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
@@ -45,7 +45,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove:: @ 821EAB0
 	compare VAR_RESULT, TRUE
 	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_LastMonWithSurf
 	special MoveDeleterForgetMove
-	playfanfare MUS_ME_WASURE
+	playfanfare MUS_MOVE_DELETED
 	waitfanfare
 	msgbox LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove, MSGBOX_DEFAULT
 	releaseall
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json
index 625904e41..daaec1191 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F",
   "name": "LilycoveCity_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json
index a82cc515a..b9c8e1302 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F",
   "name": "LilycoveCity_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
index 820bf34c4..7d5c42034 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB",
   "name": "LilycoveCity_PokemonTrainerFanClub",
   "layout": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json
index 65c9b2295..696674bf1 100644
--- a/data/maps/LilycoveCity_UnusedMart/map.json
+++ b/data/maps/LilycoveCity_UnusedMart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LILYCOVE_CITY_UNUSED_MART",
   "name": "LilycoveCity_UnusedMart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_LILYCOVE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json
index f0c5694d8..5335dd66e 100644
--- a/data/maps/LittlerootTown/map.json
+++ b/data/maps/LittlerootTown/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LITTLEROOT_TOWN",
   "name": "LittlerootTown",
   "layout": "LAYOUT_LITTLEROOT_TOWN",
-  "music": "MUS_MISHIRO",
+  "music": "MUS_LITTLEROOT",
   "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
index 347a805e8..ba5832309 100644
--- a/data/maps/LittlerootTown/scripts.inc
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -147,7 +147,7 @@ LittlerootTown_EventScript_StepOffTruckFemale:: @ 81E7EF9
 
 LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17
 	delay 15
-	playse SE_DANSA
+	playse SE_LEDGE
 	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck
 	waitmovement 0
 	opendoor VAR_0x8004, VAR_0x8005
@@ -950,7 +950,7 @@ LittlerootTown_EventScript_SetReceivedRunningShoes:: @ 81E8686
 
 LittlerootTown_EventScript_GiveRunningShoes:: @ 81E8693
 	msgbox LittlerootTown_Text_WearTheseRunningShoes, MSGBOX_DEFAULT
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message LittlerootTown_Text_SwitchShoesWithRunningShoes
 	waitfanfare
 	setflag FLAG_RECEIVED_RUNNING_SHOES
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json
index 9911e293a..3929b2e0c 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F",
   "name": "LittlerootTown_BrendansHouse_1F",
   "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F",
-  "music": "MUS_MISHIRO",
+  "music": "MUS_LITTLEROOT",
   "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
index 65ff3ab98..ee677fbff 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
@@ -147,7 +147,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival2:: @ 81F78D6
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2
-	playse SE_KAIDAN
+	playse SE_EXIT
 	delay 10
 	addobject LOCALID_RIVAL
 	delay 30
@@ -158,7 +158,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2
 	waitmovement 0
 	compare VAR_0x8008, 1
 	call_if_ne LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan
-	playbgm MUS_BOY_SUP, 1
+	playbgm MUS_ENCOUNTER_BRENDAN, 1
 	compare VAR_0x8008, 0
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0
 	compare VAR_0x8008, 1
@@ -173,7 +173,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1
 	compare VAR_0x8008, 2
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2
-	playse SE_KAIDAN
+	playse SE_EXIT
 	removeobject LOCALID_RIVAL
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json
index 9cfdec8fe..03e2dcd82 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F",
   "name": "LittlerootTown_BrendansHouse_2F",
   "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F",
-  "music": "MUS_MISHIRO",
+  "music": "MUS_LITTLEROOT",
   "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index 7af4580c3..ab6f55af5 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
@@ -74,7 +74,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: @ 81F8497
 	applymovement LOCALID_RIVAL, Common_Movement_Delay48
 	waitmovement 0
 	delay 10
-	playbgm MUS_BOY_SUP, 1
+	playbgm MUS_ENCOUNTER_BRENDAN, 1
 	compare VAR_FACING, DIR_NORTH
 	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth
 	compare VAR_FACING, DIR_SOUTH
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json
index 5e3a5aecd..739665181 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/map.json
+++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F",
   "name": "LittlerootTown_MaysHouse_1F",
   "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F",
-  "music": "MUS_MISHIRO",
+  "music": "MUS_LITTLEROOT",
   "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
index 958951dc9..1e1bb0e11 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
@@ -181,7 +181,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival2:: @ 81F8A7F
 	end
 
 LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B
-	playse SE_KAIDAN
+	playse SE_EXIT
 	delay 10
 	addobject LOCALID_RIVAL
 	delay 30
@@ -192,7 +192,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B
 	waitmovement 0
 	compare VAR_0x8008, 1
 	call_if_ne LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay
-	playbgm MUS_GIRL_SUP, 1
+	playbgm MUS_ENCOUNTER_MAY, 1
 	compare VAR_0x8008, 0
 	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0
 	compare VAR_0x8008, 1
@@ -207,7 +207,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B
 	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1
 	compare VAR_0x8008, 2
 	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2
-	playse SE_KAIDAN
+	playse SE_EXIT
 	removeobject LOCALID_RIVAL
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json
index 54b4e7c7e..1fa2ff01d 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/map.json
+++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F",
   "name": "LittlerootTown_MaysHouse_2F",
   "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F",
-  "music": "MUS_MISHIRO",
+  "music": "MUS_LITTLEROOT",
   "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
index 7c943e0e2..dd22ed670 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -74,7 +74,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: @ 81F934A
 	applymovement LOCALID_RIVAL, Common_Movement_Delay48
 	waitmovement 0
 	delay 10
-	playbgm MUS_GIRL_SUP, 1
+	playbgm MUS_ENCOUNTER_MAY, 1
 	compare VAR_FACING, DIR_NORTH
 	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth
 	compare VAR_FACING, DIR_SOUTH
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json
index 629516c25..deee3e264 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB",
   "name": "LittlerootTown_ProfessorBirchsLab",
   "layout": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB",
-  "music": "MUS_ODAMAKI",
+  "music": "MUS_BIRCH_LAB",
   "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 7886bda18..bc03be7b2 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -120,7 +120,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent:: @ 81F9DDB
 	bufferleadmonspeciesname 0
 	message LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon
 	waitmessage
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	waitfanfare
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -183,13 +183,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80
 	applymovement LOCALID_BIRCH, LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes
 	waitmovement 0
 	delay 20
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 10
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 10
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 10
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 20
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestRight
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -208,7 +208,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone, MSGBOX_DEFAULT
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message LittlerootTown_ProfessorBirchsLab_Text_PokedexUpgradedToNational
 	waitmessage
 	waitfanfare
@@ -492,7 +492,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita:: @ 81FA23F
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter:: @ 81FA24F
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message LittlerootTown_ProfessorBirchsLab_Text_ReceivedJohtoStarter
 	waitmessage
 	waitfanfare
@@ -536,7 +536,7 @@ EventScript_RegisterProfBirch:: @ 81FA2D2
 	msgbox MatchCall_Text_BirchRegisterCall, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox MatchCall_Text_RegisteredBirch, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
@@ -587,7 +587,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls:: @ 81FA37F
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex:: @ 81FA3AC
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex
 	waitfanfare
 	setflag FLAG_SYS_POKEDEX_GET
diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json
index 8865cff2f..fe5513e3f 100644
--- a/data/maps/MagmaHideout_1F/map.json
+++ b/data/maps/MagmaHideout_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAGMA_HIDEOUT_1F",
   "name": "MagmaHideout_1F",
   "layout": "LAYOUT_MAGMA_HIDEOUT_1F",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json
index 1d7d2958d..a5c52683c 100644
--- a/data/maps/MagmaHideout_2F_1R/map.json
+++ b/data/maps/MagmaHideout_2F_1R/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAGMA_HIDEOUT_2F_1R",
   "name": "MagmaHideout_2F_1R",
   "layout": "LAYOUT_MAGMA_HIDEOUT_2F_1R",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json
index 38f492421..4aa6896f6 100644
--- a/data/maps/MagmaHideout_2F_2R/map.json
+++ b/data/maps/MagmaHideout_2F_2R/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAGMA_HIDEOUT_2F_2R",
   "name": "MagmaHideout_2F_2R",
   "layout": "LAYOUT_MAGMA_HIDEOUT_2F_2R",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MagmaHideout_2F_3R/map.json b/data/maps/MagmaHideout_2F_3R/map.json
index fbed23781..51a4daf26 100644
--- a/data/maps/MagmaHideout_2F_3R/map.json
+++ b/data/maps/MagmaHideout_2F_3R/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAGMA_HIDEOUT_2F_3R",
   "name": "MagmaHideout_2F_3R",
   "layout": "LAYOUT_MAGMA_HIDEOUT_2F_3R",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json
index 082b1d4c6..edf4cfa21 100644
--- a/data/maps/MagmaHideout_3F_1R/map.json
+++ b/data/maps/MagmaHideout_3F_1R/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAGMA_HIDEOUT_3F_1R",
   "name": "MagmaHideout_3F_1R",
   "layout": "LAYOUT_MAGMA_HIDEOUT_3F_1R",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json
index 3bf22b2e0..70c6bfb97 100644
--- a/data/maps/MagmaHideout_3F_2R/map.json
+++ b/data/maps/MagmaHideout_3F_2R/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAGMA_HIDEOUT_3F_2R",
   "name": "MagmaHideout_3F_2R",
   "layout": "LAYOUT_MAGMA_HIDEOUT_3F_2R",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json
index 38a5342c3..824f5cb74 100644
--- a/data/maps/MagmaHideout_3F_3R/map.json
+++ b/data/maps/MagmaHideout_3F_3R/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAGMA_HIDEOUT_3F_3R",
   "name": "MagmaHideout_3F_3R",
   "layout": "LAYOUT_MAGMA_HIDEOUT_3F_3R",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json
index 0dec87a13..d38e85fdf 100644
--- a/data/maps/MagmaHideout_4F/map.json
+++ b/data/maps/MagmaHideout_4F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAGMA_HIDEOUT_4F",
   "name": "MagmaHideout_4F",
   "layout": "LAYOUT_MAGMA_HIDEOUT_4F",
-  "music": "MUS_AJITO",
+  "music": "MUS_AQUA_MAGMA_HIDEOUT",
   "region_map_section": "MAPSEC_MAGMA_HIDEOUT",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc
index ffca9c75f..50382f44e 100644
--- a/data/maps/MagmaHideout_4F/scripts.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
@@ -11,17 +11,17 @@ MagmaHideout_4F_MapScripts:: @ 823A55F
 
 MagmaHideout_4F_EventScript_Maxie:: @ 823A560
 	lockall
-	playbgm MUS_MGM0, 0
+	playbgm MUS_ENCOUNTER_MAGMA, 0
 	msgbox MagmaHideout_4F_Text_MaxieAwakenGroudon, MSGBOX_DEFAULT
 	closemessage
 	delay 20
 	setvar VAR_RESULT, 1
-	playse SE_W197
+	playse SE_M_DETECT
 	dofieldeffectsparkle 18, 42, 0
 	waitfieldeffect FLDEFF_SPARKLE
 	setvar VAR_RESULT, 1
-	playfanfare MUS_ME_TAMA
-	playse SE_TAMA
+	playfanfare MUS_AWAKEN_LEGEND
+	playse SE_ORB
 	special DoOrbEffect
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json
index 7f382b088..d2e506a14 100644
--- a/data/maps/MarineCave_End/map.json
+++ b/data/maps/MarineCave_End/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MARINE_CAVE_END",
   "name": "MarineCave_End",
   "layout": "LAYOUT_MARINE_CAVE_END",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_MARINE_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
diff --git a/data/maps/MarineCave_Entrance/map.json b/data/maps/MarineCave_Entrance/map.json
index 541ccddc6..f815ca069 100644
--- a/data/maps/MarineCave_Entrance/map.json
+++ b/data/maps/MarineCave_Entrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MARINE_CAVE_ENTRANCE",
   "name": "MarineCave_Entrance",
   "layout": "LAYOUT_MARINE_CAVE_ENTRANCE",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_MARINE_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json
index 096edafe3..cf3d5f8a1 100644
--- a/data/maps/MauvilleCity/map.json
+++ b/data/maps/MauvilleCity/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAUVILLE_CITY",
   "name": "MauvilleCity",
   "layout": "LAYOUT_MAUVILLE_CITY",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MAUVILLE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc
index 701c36159..7107f4754 100644
--- a/data/maps/MauvilleCity/scripts.inc
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -460,7 +460,7 @@ MauvilleCity_EventScript_RegisterWallyCall:: @ 81DF7BA
 	pokenavcall MauvilleCity_Text_WallyPokenavCall
 	waitmessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox MauvilleCity_Text_RegisteredWally, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json
index 44d09d883..217d3be26 100644
--- a/data/maps/MauvilleCity_BikeShop/map.json
+++ b/data/maps/MauvilleCity_BikeShop/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAUVILLE_CITY_BIKE_SHOP",
   "name": "MauvilleCity_BikeShop",
   "layout": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MAUVILLE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json
index 1493cda23..2564596ba 100644
--- a/data/maps/MauvilleCity_GameCorner/map.json
+++ b/data/maps/MauvilleCity_GameCorner/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAUVILLE_CITY_GAME_CORNER",
   "name": "MauvilleCity_GameCorner",
   "layout": "LAYOUT_MAUVILLE_CITY_GAME_CORNER",
-  "music": "MUS_CASINO",
+  "music": "MUS_GAME_CORNER",
   "region_map_section": "MAPSEC_MAUVILLE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index 46c61a017..ad3f7a407 100644
--- a/data/maps/MauvilleCity_GameCorner/scripts.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
@@ -53,7 +53,7 @@ MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 820FC33
 	removemoney COINS_PRICE_50, 0
 	updatemoneybox 0, 0
 	updatecoinsbox 1, 6
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT
 	hidemoneybox
 	hidecoinsbox 0, 5
@@ -71,7 +71,7 @@ MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 820FC75
 	removemoney COINS_PRICE_500, 0
 	updatemoneybox 0, 0
 	updatecoinsbox 1, 6
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT
 	hidemoneybox
 	hidecoinsbox 0, 5
@@ -172,7 +172,7 @@ MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll:: @ 820FDCB
 	removecoins DOLL_COINS
 	adddecoration DECOR_TREECKO_DOLL
 	updatecoinsbox 1, 1
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
@@ -188,7 +188,7 @@ MauvilleCity_GameCorner_EventScript_BuyTorchicDoll:: @ 820FE05
 	removecoins DOLL_COINS
 	adddecoration DECOR_TORCHIC_DOLL
 	updatecoinsbox 1, 1
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
@@ -204,7 +204,7 @@ MauvilleCity_GameCorner_EventScript_BuyMudkipDoll:: @ 820FE3F
 	removecoins DOLL_COINS
 	adddecoration DECOR_MUDKIP_DOLL
 	updatecoinsbox 1, 1
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox MauvilleCity_GameCorner_Text_SendToYourHomePC, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
@@ -312,7 +312,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM32:: @ 820FFDD
 	removecoins TM32_COINS
 	additem ITEM_TM32
 	updatecoinsbox 1, 1
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
@@ -327,7 +327,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM29:: @ 8210017
 	removecoins TM29_COINS
 	additem ITEM_TM29
 	updatecoinsbox 1, 1
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
@@ -342,7 +342,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM35:: @ 8210051
 	removecoins TM35_COINS
 	additem ITEM_TM35
 	updatecoinsbox 1, 1
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
@@ -357,7 +357,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM24:: @ 821008B
 	removecoins TM24_COINS
 	additem ITEM_TM24
 	updatecoinsbox 1, 1
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
@@ -372,7 +372,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM13:: @ 82100C5
 	removecoins TM13_COINS
 	additem ITEM_TM13
 	updatecoinsbox 1, 1
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox MauvilleCity_GameCorner_Text_HereYouGo, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
@@ -481,7 +481,7 @@ MauvilleCity_GameCorner_EventScript_TryGive20Coins:: @ 821023D
 	setflag FLAG_RECEIVED_20_COINS
 	addcoins 20
 	msgbox MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins, MSGBOX_DEFAULT
-	playse SE_REGI
+	playse SE_SHOP
 	goto MauvilleCity_GameCorner_EventScript_PokefanMNormal
 	end
 
diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json
index 50122e216..2451c6cd6 100644
--- a/data/maps/MauvilleCity_Gym/map.json
+++ b/data/maps/MauvilleCity_Gym/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAUVILLE_CITY_GYM",
   "name": "MauvilleCity_Gym",
   "layout": "LAYOUT_MAUVILLE_CITY_GYM",
-  "music": "MUS_GIM",
+  "music": "MUS_GYM",
   "region_map_section": "MAPSEC_MAUVILLE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index edf0a3129..3fa7dc8c9 100644
--- a/data/maps/MauvilleCity_Gym/scripts.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
@@ -101,11 +101,11 @@ MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 820DF2B
 	call Common_EventScript_SetGymTrainers
 	special MauvilleGymDeactivatePuzzle
 	special DrawWholeMapView
-	playse SE_KI_GASYAN
+	playse SE_UNLOCK
 	call MauvilleCity_Gym_EventScript_GiveShockWave
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox MauvilleCity_Gym_Text_RegisteredWattson, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
@@ -185,7 +185,7 @@ MauvilleCity_Gym_EventScript_PressFloorSwitch:: @ 820E08D
 	special MauvilleGymSetDefaultBarriers
 	special MauvilleGymPressSwitch
 	special DrawWholeMapView
-	playse SE_KI_GASYAN
+	playse SE_UNLOCK
 	goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_ClearBarriersAltState
 	goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_SetBarriersAltState
 	releaseall
diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json
index 4f203bce6..019ae6f09 100644
--- a/data/maps/MauvilleCity_House1/map.json
+++ b/data/maps/MauvilleCity_House1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAUVILLE_CITY_HOUSE1",
   "name": "MauvilleCity_House1",
   "layout": "LAYOUT_HOUSE2",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MAUVILLE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json
index 5c092f1c7..009befbab 100644
--- a/data/maps/MauvilleCity_House2/map.json
+++ b/data/maps/MauvilleCity_House2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAUVILLE_CITY_HOUSE2",
   "name": "MauvilleCity_House2",
   "layout": "LAYOUT_HOUSE1",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MAUVILLE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json
index 2dcdd906e..ee4091ee1 100644
--- a/data/maps/MauvilleCity_Mart/map.json
+++ b/data/maps/MauvilleCity_Mart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAUVILLE_CITY_MART",
   "name": "MauvilleCity_Mart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_MAUVILLE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json
index 50e5d3c9f..9feb04be9 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F",
   "name": "MauvilleCity_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_MAUVILLE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json
index da8f19255..3f616938b 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F",
   "name": "MauvilleCity_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_MAUVILLE_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json
index 45cf5803e..f177410e2 100644
--- a/data/maps/MeteorFalls_1F_1R/map.json
+++ b/data/maps/MeteorFalls_1F_1R/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_METEOR_FALLS_1F_1R",
   "name": "MeteorFalls_1F_1R",
   "layout": "LAYOUT_METEOR_FALLS_1F_1R",
-  "music": "MUS_DAN03",
+  "music": "MUS_CAVE_OF_ORIGIN",
   "region_map_section": "MAPSEC_METEOR_FALLS",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
index 56deaa353..c942e230e 100644
--- a/data/maps/MeteorFalls_1F_1R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
@@ -21,7 +21,7 @@ MeteorFalls_1F_1R_EventScript_OpenStevensCave:: @ 822BD3A
 
 MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F
 	lockall
-	playbgm MUS_MGM0, 0
+	playbgm MUS_ENCOUNTER_MAGMA, 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceDown
 	waitmovement 0
 	delay 30
@@ -50,7 +50,7 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F
 	addobject LOCALID_ARCHIE
 	addobject LOCALID_AQUA_GRUNT_1
 	addobject LOCALID_AQUA_GRUNT_2
-	playbgm MUS_AQA_0, 0
+	playbgm MUS_ENCOUNTER_AQUA, 0
 	applymovement LOCALID_ARCHIE, MeteorFalls_1F_1R_Movement_ArchieArrive
 	applymovement LOCALID_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive
 	applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive
diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json
index ea585829f..49e001c88 100644
--- a/data/maps/MeteorFalls_1F_2R/map.json
+++ b/data/maps/MeteorFalls_1F_2R/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_METEOR_FALLS_1F_2R",
   "name": "MeteorFalls_1F_2R",
   "layout": "LAYOUT_METEOR_FALLS_1F_2R",
-  "music": "MUS_DAN03",
+  "music": "MUS_CAVE_OF_ORIGIN",
   "region_map_section": "MAPSEC_METEOR_FALLS",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json
index 2db212dfa..6cba2ec48 100644
--- a/data/maps/MeteorFalls_B1F_1R/map.json
+++ b/data/maps/MeteorFalls_B1F_1R/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_METEOR_FALLS_B1F_1R",
   "name": "MeteorFalls_B1F_1R",
   "layout": "LAYOUT_METEOR_FALLS_B1F_1R",
-  "music": "MUS_DAN03",
+  "music": "MUS_CAVE_OF_ORIGIN",
   "region_map_section": "MAPSEC_METEOR_FALLS",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json
index e318acfbc..57276d86d 100644
--- a/data/maps/MeteorFalls_B1F_2R/map.json
+++ b/data/maps/MeteorFalls_B1F_2R/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_METEOR_FALLS_B1F_2R",
   "name": "MeteorFalls_B1F_2R",
   "layout": "LAYOUT_METEOR_FALLS_B1F_2R",
-  "music": "MUS_DAN03",
+  "music": "MUS_CAVE_OF_ORIGIN",
   "region_map_section": "MAPSEC_METEOR_FALLS",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json
index 7b1f7439e..01b05d308 100644
--- a/data/maps/MeteorFalls_StevensCave/map.json
+++ b/data/maps/MeteorFalls_StevensCave/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_METEOR_FALLS_STEVENS_CAVE",
   "name": "MeteorFalls_StevensCave",
   "layout": "LAYOUT_METEOR_FALLS_STEVENS_CAVE",
-  "music": "MUS_DAN03",
+  "music": "MUS_CAVE_OF_ORIGIN",
   "region_map_section": "MAPSEC_METEOR_FALLS",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MirageTower_1F/map.json b/data/maps/MirageTower_1F/map.json
index 91e15cc39..bb7930006 100644
--- a/data/maps/MirageTower_1F/map.json
+++ b/data/maps/MirageTower_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MIRAGE_TOWER_1F",
   "name": "MirageTower_1F",
   "layout": "LAYOUT_MIRAGE_TOWER_1F",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_MIRAGE_TOWER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MirageTower_2F/map.json b/data/maps/MirageTower_2F/map.json
index 5e9769db6..bf4561675 100644
--- a/data/maps/MirageTower_2F/map.json
+++ b/data/maps/MirageTower_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MIRAGE_TOWER_2F",
   "name": "MirageTower_2F",
   "layout": "LAYOUT_MIRAGE_TOWER_2F",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_MIRAGE_TOWER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json
index 2692de62a..6ccbf4678 100644
--- a/data/maps/MirageTower_3F/map.json
+++ b/data/maps/MirageTower_3F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MIRAGE_TOWER_3F",
   "name": "MirageTower_3F",
   "layout": "LAYOUT_MIRAGE_TOWER_3F",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_MIRAGE_TOWER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json
index 03ecc0647..a153fbb2a 100644
--- a/data/maps/MirageTower_4F/map.json
+++ b/data/maps/MirageTower_4F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MIRAGE_TOWER_4F",
   "name": "MirageTower_4F",
   "layout": "LAYOUT_MIRAGE_TOWER_4F",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_MIRAGE_TOWER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json
index d360959a1..ff8ae1b61 100644
--- a/data/maps/MossdeepCity/map.json
+++ b/data/maps/MossdeepCity/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY",
   "name": "MossdeepCity",
   "layout": "LAYOUT_MOSSDEEP_CITY",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json
index 6188b4f37..14b89fe42 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/map.json
+++ b/data/maps/MossdeepCity_GameCorner_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F",
   "name": "MossdeepCity_GameCorner_1F",
   "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json
index 7ea92448c..180bd703a 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/map.json
+++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F",
   "name": "MossdeepCity_GameCorner_B1F",
   "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json
index fa4099565..9b63a0c08 100644
--- a/data/maps/MossdeepCity_Gym/map.json
+++ b/data/maps/MossdeepCity_Gym/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_GYM",
   "name": "MossdeepCity_Gym",
   "layout": "LAYOUT_MOSSDEEP_CITY_GYM",
-  "music": "MUS_GIM",
+  "music": "MUS_GYM",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc
index d8bff6dd1..0e6487e16 100644
--- a/data/maps/MossdeepCity_Gym/scripts.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -81,7 +81,7 @@ MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1
 	call MossdeepCity_Gym_EventScript_GiveCalmMind
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox MossdeepCity_Gym_Text_RegisteredTateAndLiza, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
@@ -126,7 +126,7 @@ MossdeepCity_Gym_EventScript_Switch1:: @ 8220999
 
 MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed:: @ 82209C8
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	releaseall
 	end
 
@@ -308,9 +308,9 @@ MossdeepCity_Gym_EventScript_GymStatue:: @ 8220C5D
 	end
 
 MossdeepCity_Gym_EventScript_YellowFloorSwitch:: @ 8220C67
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	waitse
-	playse SE_TU_SAA
+	playse SE_REPEL
 	initrotatingtilepuzzle FALSE
 	moverotatingtileobjects 0
 	waitmovement 0
@@ -320,9 +320,9 @@ MossdeepCity_Gym_EventScript_YellowFloorSwitch:: @ 8220C67
 	end
 
 MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	waitse
-	playse SE_TU_SAA
+	playse SE_REPEL
 	initrotatingtilepuzzle FALSE
 	moverotatingtileobjects 1
 	waitmovement 0
@@ -332,9 +332,9 @@ MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D
 	end
 
 MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	waitse
-	playse SE_TU_SAA
+	playse SE_REPEL
 	initrotatingtilepuzzle FALSE
 	moverotatingtileobjects 2
 	waitmovement 0
@@ -344,9 +344,9 @@ MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93
 	end
 
 MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	waitse
-	playse SE_TU_SAA
+	playse SE_REPEL
 	initrotatingtilepuzzle FALSE
 	moverotatingtileobjects 3
 	waitmovement 0
@@ -356,9 +356,9 @@ MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9
 	end
 
 MossdeepCity_Gym_EventScript_RedFloorSwitch:: @ 8220CBF
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	waitse
-	playse SE_TU_SAA
+	playse SE_REPEL
 	initrotatingtilepuzzle FALSE
 	moverotatingtileobjects 4
 	waitmovement 0
diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json
index f57f4df18..f4338078e 100644
--- a/data/maps/MossdeepCity_House1/map.json
+++ b/data/maps/MossdeepCity_House1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_HOUSE1",
   "name": "MossdeepCity_House1",
   "layout": "LAYOUT_HOUSE2",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json
index 9a9a08173..e7990bad9 100644
--- a/data/maps/MossdeepCity_House2/map.json
+++ b/data/maps/MossdeepCity_House2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_HOUSE2",
   "name": "MossdeepCity_House2",
   "layout": "LAYOUT_HOUSE1",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json
index c6cfaf097..a0587ca0a 100644
--- a/data/maps/MossdeepCity_House3/map.json
+++ b/data/maps/MossdeepCity_House3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_HOUSE3",
   "name": "MossdeepCity_House3",
   "layout": "LAYOUT_HOUSE2",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json
index b4b77372d..0c7e0a112 100644
--- a/data/maps/MossdeepCity_House4/map.json
+++ b/data/maps/MossdeepCity_House4/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_HOUSE4",
   "name": "MossdeepCity_House4",
   "layout": "LAYOUT_HOUSE_WITH_BED",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json
index 83218e7e1..37885b752 100644
--- a/data/maps/MossdeepCity_Mart/map.json
+++ b/data/maps/MossdeepCity_Mart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_MART",
   "name": "MossdeepCity_Mart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json
index 751632462..ac3b51e8f 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F",
   "name": "MossdeepCity_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json
index 9206cf844..7fa656697 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F",
   "name": "MossdeepCity_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json
index 32b5ff489..0f5069665 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F",
   "name": "MossdeepCity_SpaceCenter_1F",
   "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json
index 7e01d7f1a..8990aa075 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F",
   "name": "MossdeepCity_SpaceCenter_2F",
   "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 6c9d4a905..62550d7c6 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -204,7 +204,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_Steven:: @ 8223F7A
 	msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieUseFuelToEruptVolcano, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	playse SE_KOUKA_L
+	playse SE_NOT_EFFECTIVE
 	switch VAR_FACING
 	case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth
 	applymovement LOCALID_STEVEN, MossdeepCity_SpaceCenter_2F_Movement_StevenFight
diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json
index 81eefbd94..cad7609d3 100644
--- a/data/maps/MossdeepCity_StevensHouse/map.json
+++ b/data/maps/MossdeepCity_StevensHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE",
   "name": "MossdeepCity_StevensHouse",
   "layout": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_MOSSDEEP_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 0017f553d..1d384efe1 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -123,7 +123,7 @@ MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC:: @ 82228E0
 MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare:: @ 82228EB
 	bufferspeciesname 1, SPECIES_BELDUM
 	removeobject LOCALID_BELDUM_BALL
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message MossdeepCity_StevensHouse_Text_ObtainedBeldum
 	waitmessage
 	waitfanfare
diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json
index 7e95b291c..7083ff7de 100644
--- a/data/maps/MtChimney/map.json
+++ b/data/maps/MtChimney/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MT_CHIMNEY",
   "name": "MtChimney",
   "layout": "LAYOUT_MT_CHIMNEY",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_MT_CHIMNEY",
   "requires_flash": false,
   "weather": "WEATHER_VOLCANIC_ASH",
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index 42ebce0f9..c633d9313 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -40,7 +40,7 @@ MtChimney_EventScript_ArchieBusyFighting:: @ 822EE02
 
 MtChimney_EventScript_Maxie:: @ 822EE0B
 	lockall
-	playbgm MUS_MGM0, 0
+	playbgm MUS_ENCOUNTER_MAGMA, 0
 	msgbox MtChimney_Text_MeteoriteWillActivateVolcano, MSGBOX_DEFAULT
 	applymovement LOCALID_MAXIE, Common_Movement_FacePlayer
 	waitmovement 0
diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json
index 3926f2444..410bc0c2e 100644
--- a/data/maps/MtChimney_CableCarStation/map.json
+++ b/data/maps/MtChimney_CableCarStation/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MT_CHIMNEY_CABLE_CAR_STATION",
   "name": "MtChimney_CableCarStation",
   "layout": "LAYOUT_CABLE_CAR_STATION",
-  "music": "MUS_DOORO_X1",
+  "music": "MUS_ROUTE110",
   "region_map_section": "MAPSEC_MT_CHIMNEY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json
index 153a14a92..248bd6530 100644
--- a/data/maps/MtPyre_1F/map.json
+++ b/data/maps/MtPyre_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MT_PYRE_1F",
   "name": "MtPyre_1F",
   "layout": "LAYOUT_MT_PYRE_1F",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_MT_PYRE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json
index 69e7b1e18..0668bcf78 100644
--- a/data/maps/MtPyre_2F/map.json
+++ b/data/maps/MtPyre_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MT_PYRE_2F",
   "name": "MtPyre_2F",
   "layout": "LAYOUT_MT_PYRE_2F",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_MT_PYRE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json
index 08c594514..35c6c1b04 100644
--- a/data/maps/MtPyre_3F/map.json
+++ b/data/maps/MtPyre_3F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MT_PYRE_3F",
   "name": "MtPyre_3F",
   "layout": "LAYOUT_MT_PYRE_3F",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_MT_PYRE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json
index f9658c6cf..d326bff72 100644
--- a/data/maps/MtPyre_4F/map.json
+++ b/data/maps/MtPyre_4F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MT_PYRE_4F",
   "name": "MtPyre_4F",
   "layout": "LAYOUT_MT_PYRE_4F",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_MT_PYRE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json
index 93cc0013e..fb7c3f2f8 100644
--- a/data/maps/MtPyre_5F/map.json
+++ b/data/maps/MtPyre_5F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MT_PYRE_5F",
   "name": "MtPyre_5F",
   "layout": "LAYOUT_MT_PYRE_5F",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_MT_PYRE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json
index 1291d6356..dc2e7f9b0 100644
--- a/data/maps/MtPyre_6F/map.json
+++ b/data/maps/MtPyre_6F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MT_PYRE_6F",
   "name": "MtPyre_6F",
   "layout": "LAYOUT_MT_PYRE_6F",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_MT_PYRE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json
index 67a0dac6e..58c865305 100644
--- a/data/maps/MtPyre_Exterior/map.json
+++ b/data/maps/MtPyre_Exterior/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MT_PYRE_EXTERIOR",
   "name": "MtPyre_Exterior",
   "layout": "LAYOUT_MT_PYRE_EXTERIOR",
-  "music": "MUS_MACHUPI",
+  "music": "MUS_MT_PYRE_EXTERIOR",
   "region_map_section": "MAPSEC_MT_PYRE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json
index 87a1ad977..aa3341f8a 100644
--- a/data/maps/MtPyre_Summit/map.json
+++ b/data/maps/MtPyre_Summit/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_MT_PYRE_SUMMIT",
   "name": "MtPyre_Summit",
   "layout": "LAYOUT_MT_PYRE_SUMMIT",
-  "music": "MUS_MACHUPI",
+  "music": "MUS_MT_PYRE_EXTERIOR",
   "region_map_section": "MAPSEC_MT_PYRE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index 9daf02f5b..c2692ff20 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -39,7 +39,7 @@ MtPyre_Summit_EventScript_TeamAquaTrigger2:: @ 8232030
 	end
 
 MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C
-	playbgm MUS_AQA_0, 0
+	playbgm MUS_ENCOUNTER_AQUA, 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
 	applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFastestDown
diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json
index f7d969e21..8e366fc16 100644
--- a/data/maps/NavelRock_B1F/map.json
+++ b/data/maps/NavelRock_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_B1F",
   "name": "NavelRock_B1F",
   "layout": "LAYOUT_NAVEL_ROCK_B1F",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json
index 1db5649bc..13d676200 100644
--- a/data/maps/NavelRock_Bottom/map.json
+++ b/data/maps/NavelRock_Bottom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_BOTTOM",
   "name": "NavelRock_Bottom",
   "layout": "LAYOUT_NAVEL_ROCK_BOTTOM",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc
index f0c73b1f8..9c438fc5c 100644
--- a/data/maps/NavelRock_Bottom/scripts.inc
+++ b/data/maps/NavelRock_Bottom/scripts.inc
@@ -35,14 +35,14 @@ NavelRock_Bottom_EventScript_Lugia:: @ 82692A2
 	faceplayer
 	waitse
 	delay 20
-	playse SE_T_AME_E
+	playse SE_THUNDERSTORM_STOP
 	setvar VAR_0x8004, 0  @ vertical pan
 	setvar VAR_0x8005, 3  @ horizontal pan
 	setvar VAR_0x8006, 4  @ num shakes
 	setvar VAR_0x8007, 2  @ shake delay
 	special ShakeCamera
 	delay 30
-	playse SE_T_AME_E
+	playse SE_THUNDERSTORM_STOP
 	setvar VAR_0x8004, 0  @ vertical pan
 	setvar VAR_0x8005, 3  @ horizontal pan
 	setvar VAR_0x8006, 4  @ num shakes
diff --git a/data/maps/NavelRock_Down01/map.json b/data/maps/NavelRock_Down01/map.json
index 1c47e450e..674996920 100644
--- a/data/maps/NavelRock_Down01/map.json
+++ b/data/maps/NavelRock_Down01/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_DOWN01",
   "name": "NavelRock_Down01",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Down02/map.json b/data/maps/NavelRock_Down02/map.json
index aaae333c3..7c75a1b03 100644
--- a/data/maps/NavelRock_Down02/map.json
+++ b/data/maps/NavelRock_Down02/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_DOWN02",
   "name": "NavelRock_Down02",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Down03/map.json b/data/maps/NavelRock_Down03/map.json
index 60acdc668..936ebab77 100644
--- a/data/maps/NavelRock_Down03/map.json
+++ b/data/maps/NavelRock_Down03/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_DOWN03",
   "name": "NavelRock_Down03",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Down04/map.json b/data/maps/NavelRock_Down04/map.json
index edfc400e7..585ee7538 100644
--- a/data/maps/NavelRock_Down04/map.json
+++ b/data/maps/NavelRock_Down04/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_DOWN04",
   "name": "NavelRock_Down04",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Down05/map.json b/data/maps/NavelRock_Down05/map.json
index f4d31fdff..1099d9caa 100644
--- a/data/maps/NavelRock_Down05/map.json
+++ b/data/maps/NavelRock_Down05/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_DOWN05",
   "name": "NavelRock_Down05",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Down06/map.json b/data/maps/NavelRock_Down06/map.json
index ef20800f3..7fb26f293 100644
--- a/data/maps/NavelRock_Down06/map.json
+++ b/data/maps/NavelRock_Down06/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_DOWN06",
   "name": "NavelRock_Down06",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Down07/map.json b/data/maps/NavelRock_Down07/map.json
index 0019d726f..36896f306 100644
--- a/data/maps/NavelRock_Down07/map.json
+++ b/data/maps/NavelRock_Down07/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_DOWN07",
   "name": "NavelRock_Down07",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Down08/map.json b/data/maps/NavelRock_Down08/map.json
index 17d50c0ed..f9945f49f 100644
--- a/data/maps/NavelRock_Down08/map.json
+++ b/data/maps/NavelRock_Down08/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_DOWN08",
   "name": "NavelRock_Down08",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Down09/map.json b/data/maps/NavelRock_Down09/map.json
index 49713ffc3..38b2fdae8 100644
--- a/data/maps/NavelRock_Down09/map.json
+++ b/data/maps/NavelRock_Down09/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_DOWN09",
   "name": "NavelRock_Down09",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Down10/map.json b/data/maps/NavelRock_Down10/map.json
index d736db5d9..7ea3bfa3b 100644
--- a/data/maps/NavelRock_Down10/map.json
+++ b/data/maps/NavelRock_Down10/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_DOWN10",
   "name": "NavelRock_Down10",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Down11/map.json b/data/maps/NavelRock_Down11/map.json
index ac45da8a2..da05c7e6b 100644
--- a/data/maps/NavelRock_Down11/map.json
+++ b/data/maps/NavelRock_Down11/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_DOWN11",
   "name": "NavelRock_Down11",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Entrance/map.json b/data/maps/NavelRock_Entrance/map.json
index 66d462f5f..ab14b2da1 100644
--- a/data/maps/NavelRock_Entrance/map.json
+++ b/data/maps/NavelRock_Entrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_ENTRANCE",
   "name": "NavelRock_Entrance",
   "layout": "LAYOUT_NAVEL_ROCK_ENTRANCE",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json
index 8527705c1..13927b6b6 100644
--- a/data/maps/NavelRock_Exterior/map.json
+++ b/data/maps/NavelRock_Exterior/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_EXTERIOR",
   "name": "NavelRock_Exterior",
   "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR",
-  "music": "MUS_RG_NANASHIMA",
+  "music": "MUS_RG_SEVII_ROUTE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json
index a5301bd6b..a8929208f 100644
--- a/data/maps/NavelRock_Fork/map.json
+++ b/data/maps/NavelRock_Fork/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_FORK",
   "name": "NavelRock_Fork",
   "layout": "LAYOUT_NAVEL_ROCK_FORK",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json
index 62308d149..34e139108 100644
--- a/data/maps/NavelRock_Harbor/map.json
+++ b/data/maps/NavelRock_Harbor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_HARBOR",
   "name": "NavelRock_Harbor",
   "layout": "LAYOUT_ISLAND_HARBOR",
-  "music": "MUS_RG_NANASHIMA",
+  "music": "MUS_RG_SEVII_ROUTE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json
index 8669e746f..c06202726 100644
--- a/data/maps/NavelRock_Top/map.json
+++ b/data/maps/NavelRock_Top/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_TOP",
   "name": "NavelRock_Top",
   "layout": "LAYOUT_NAVEL_ROCK_TOP",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/NavelRock_Up1/map.json b/data/maps/NavelRock_Up1/map.json
index 01dfcaffa..ee744ff4b 100644
--- a/data/maps/NavelRock_Up1/map.json
+++ b/data/maps/NavelRock_Up1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_UP1",
   "name": "NavelRock_Up1",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Up2/map.json b/data/maps/NavelRock_Up2/map.json
index 0233edb78..aa2470329 100644
--- a/data/maps/NavelRock_Up2/map.json
+++ b/data/maps/NavelRock_Up2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_UP2",
   "name": "NavelRock_Up2",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Up3/map.json b/data/maps/NavelRock_Up3/map.json
index c12438fc9..2629eafb1 100644
--- a/data/maps/NavelRock_Up3/map.json
+++ b/data/maps/NavelRock_Up3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_UP3",
   "name": "NavelRock_Up3",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NavelRock_Up4/map.json b/data/maps/NavelRock_Up4/map.json
index 4cdcba842..4060a52a7 100644
--- a/data/maps/NavelRock_Up4/map.json
+++ b/data/maps/NavelRock_Up4/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NAVEL_ROCK_UP4",
   "name": "NavelRock_Up4",
   "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2",
-  "music": "MUS_RG_NANADUNGEON",
+  "music": "MUS_RG_SEVII_CAVE",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json
index 71650200b..d66c5b13b 100644
--- a/data/maps/NewMauville_Entrance/map.json
+++ b/data/maps/NewMauville_Entrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NEW_MAUVILLE_ENTRANCE",
   "name": "NewMauville_Entrance",
   "layout": "LAYOUT_NEW_MAUVILLE_ENTRANCE",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_NEW_MAUVILLE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc
index 6d7d731de..d398a03ea 100644
--- a/data/maps/NewMauville_Entrance/scripts.inc
+++ b/data/maps/NewMauville_Entrance/scripts.inc
@@ -40,7 +40,7 @@ NewMauville_Entrance_EventScript_Door:: @ 82372FF
 	setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile4, 0
 	setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile5, 1
 	special DrawWholeMapView
-	playse SE_BAN
+	playse SE_BANG
 	setvar VAR_NEW_MAUVILLE_STATE, 1
 	releaseall
 	end
diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json
index 16127d699..eea119068 100644
--- a/data/maps/NewMauville_Inside/map.json
+++ b/data/maps/NewMauville_Inside/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_NEW_MAUVILLE_INSIDE",
   "name": "NewMauville_Inside",
   "layout": "LAYOUT_NEW_MAUVILLE_INSIDE",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_NEW_MAUVILLE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json
index b16fb4044..ee6101ff6 100644
--- a/data/maps/OldaleTown/map.json
+++ b/data/maps/OldaleTown/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_OLDALE_TOWN",
   "name": "OldaleTown",
   "layout": "LAYOUT_OLDALE_TOWN",
-  "music": "MUS_MACHI_S4",
+  "music": "MUS_OLDALE",
   "region_map_section": "MAPSEC_OLDALE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
index aeb0c3dbd..f99c65d2c 100644
--- a/data/maps/OldaleTown/scripts.inc
+++ b/data/maps/OldaleTown/scripts.inc
@@ -43,7 +43,7 @@ OldaleTown_EventScript_MartEmployee:: @ 81E8EFC
 	goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_ExplainPotion
 	goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_ExplainPotion
 	setflag FLAG_TEMP_1
-	playbgm MUS_TSURETEK, 0
+	playbgm MUS_FOLLOW_ME, 0
 	msgbox OldaleTown_Text_IWorkAtPokemonMart, MSGBOX_DEFAULT
 	closemessage
 	switch VAR_FACING
diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json
index 970294926..cd64357dc 100644
--- a/data/maps/OldaleTown_House1/map.json
+++ b/data/maps/OldaleTown_House1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_OLDALE_TOWN_HOUSE1",
   "name": "OldaleTown_House1",
   "layout": "LAYOUT_HOUSE1",
-  "music": "MUS_MACHI_S4",
+  "music": "MUS_OLDALE",
   "region_map_section": "MAPSEC_OLDALE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json
index 52c775f15..2347fc29a 100644
--- a/data/maps/OldaleTown_House2/map.json
+++ b/data/maps/OldaleTown_House2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_OLDALE_TOWN_HOUSE2",
   "name": "OldaleTown_House2",
   "layout": "LAYOUT_HOUSE2",
-  "music": "MUS_MACHI_S4",
+  "music": "MUS_OLDALE",
   "region_map_section": "MAPSEC_OLDALE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json
index cba6b012c..692223541 100644
--- a/data/maps/OldaleTown_Mart/map.json
+++ b/data/maps/OldaleTown_Mart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_OLDALE_TOWN_MART",
   "name": "OldaleTown_Mart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_OLDALE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json
index 1c979098e..46ee3f9bd 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/map.json
+++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F",
   "name": "OldaleTown_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_OLDALE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json
index de1b0a771..fdeb28c06 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/map.json
+++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F",
   "name": "OldaleTown_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_OLDALE_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json
index fdf43d1ac..51fc772a9 100644
--- a/data/maps/PacifidlogTown/map.json
+++ b/data/maps/PacifidlogTown/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PACIFIDLOG_TOWN",
   "name": "PacifidlogTown",
   "layout": "LAYOUT_PACIFIDLOG_TOWN",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json
index b6db1c923..a494819a5 100644
--- a/data/maps/PacifidlogTown_House1/map.json
+++ b/data/maps/PacifidlogTown_House1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PACIFIDLOG_TOWN_HOUSE1",
   "name": "PacifidlogTown_House1",
   "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json
index ceeadd9a6..027442b4b 100644
--- a/data/maps/PacifidlogTown_House2/map.json
+++ b/data/maps/PacifidlogTown_House2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PACIFIDLOG_TOWN_HOUSE2",
   "name": "PacifidlogTown_House2",
   "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json
index 34d9ddad2..17f99cea1 100644
--- a/data/maps/PacifidlogTown_House3/map.json
+++ b/data/maps/PacifidlogTown_House3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PACIFIDLOG_TOWN_HOUSE3",
   "name": "PacifidlogTown_House3",
   "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json
index cd8dfc52f..4c4cdb15b 100644
--- a/data/maps/PacifidlogTown_House4/map.json
+++ b/data/maps/PacifidlogTown_House4/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PACIFIDLOG_TOWN_HOUSE4",
   "name": "PacifidlogTown_House4",
   "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json
index e1d6f4289..ac9384502 100644
--- a/data/maps/PacifidlogTown_House5/map.json
+++ b/data/maps/PacifidlogTown_House5/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PACIFIDLOG_TOWN_HOUSE5",
   "name": "PacifidlogTown_House5",
   "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
index 20d00fecb..50baa2b7c 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F",
   "name": "PacifidlogTown_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json
index 97b48ef2e..1837ab55c 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F",
   "name": "PacifidlogTown_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_PACIFIDLOG_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json
index faec3eea1..d9587cdbb 100644
--- a/data/maps/PetalburgCity/map.json
+++ b/data/maps/PetalburgCity/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PETALBURG_CITY",
   "name": "PetalburgCity",
   "layout": "LAYOUT_PETALBURG_CITY",
-  "music": "MUS_MACHI_S2",
+  "music": "MUS_PETALBURG",
   "region_map_section": "MAPSEC_PETALBURG_CITY",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
index 558eac64e..ab77e18e0 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -27,7 +27,7 @@ PetalburgCity_EventScript_MoveGymBoyToWestEntrance:: @ 81DC307
 
 PetalburgCity_EventScript_DisableMapNameAndMusic:: @ 81DC30F
 	setflag FLAG_HIDE_MAP_NAME_POPUP
-	savebgm MUS_TSURETEK
+	savebgm MUS_FOLLOW_ME
 	return
 
 PetalburgCity_EventScript_SetGymDoorsUnlocked:: @ 81DC316
@@ -271,7 +271,7 @@ PetalburgCity_EventScript_ShowGymToPlayer3:: @ 81DC4BE
 PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA
 	applymovement LOCALID_GYM_BOY, Common_Movement_FacePlayer
 	waitmovement 0
-	playbgm MUS_TSURETEK, 0
+	playbgm MUS_FOLLOW_ME, 0
 	playse SE_PIN
 	applymovement LOCALID_GYM_BOY, Common_Movement_ExclamationMark
 	waitmovement 0
diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json
index f38463a19..307708fc1 100644
--- a/data/maps/PetalburgCity_Gym/map.json
+++ b/data/maps/PetalburgCity_Gym/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PETALBURG_CITY_GYM",
   "name": "PetalburgCity_Gym",
   "layout": "LAYOUT_PETALBURG_CITY_GYM",
-  "music": "MUS_GIM",
+  "music": "MUS_GYM",
   "region_map_section": "MAPSEC_PETALBURG_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index c8e14a13f..2bdd5320f 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -91,7 +91,7 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 82049A4
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitGym
 	waitmovement 0
-	playse SE_KAIDAN
+	playse SE_EXIT
 	removeobject LOCALID_WALLY
 	setflag FLAG_HIDE_PETALBURG_CITY_WALLY
 	delay 30
@@ -203,7 +203,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC
 	msgbox PetalburgCity_Gym_Text_WouldYouReallyComeWithMe, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_DONT_TRANSITION_MUSIC
-	playbgm MUS_TSURETEK, 0
+	playbgm MUS_FOLLOW_ME, 0
 	compare VAR_0x8008, 0
 	call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallySouth
 	compare VAR_0x8008, 1
@@ -487,7 +487,7 @@ PetalburgCity_Gym_EventScript_WallysDadArrives:: @ 8204F13
 	msgbox PetalburgCity_Gym_Text_LetMeBorrowPlayer, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_DONT_TRANSITION_MUSIC
-	playbgm MUS_TSURETEK, 0
+	playbgm MUS_FOLLOW_ME, 0
 	compare VAR_0x8008, 1
 	call_if_eq PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth
 	compare VAR_0x8008, 2
diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json
index 46121f67c..54bd3303f 100644
--- a/data/maps/PetalburgCity_House1/map.json
+++ b/data/maps/PetalburgCity_House1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PETALBURG_CITY_HOUSE1",
   "name": "PetalburgCity_House1",
   "layout": "LAYOUT_HOUSE1",
-  "music": "MUS_MACHI_S2",
+  "music": "MUS_PETALBURG",
   "region_map_section": "MAPSEC_PETALBURG_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json
index 8f40ec3e4..4a5436b97 100644
--- a/data/maps/PetalburgCity_House2/map.json
+++ b/data/maps/PetalburgCity_House2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PETALBURG_CITY_HOUSE2",
   "name": "PetalburgCity_House2",
   "layout": "LAYOUT_HOUSE_WITH_BED",
-  "music": "MUS_MACHI_S2",
+  "music": "MUS_PETALBURG",
   "region_map_section": "MAPSEC_PETALBURG_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json
index a263e3036..a55e27293 100644
--- a/data/maps/PetalburgCity_Mart/map.json
+++ b/data/maps/PetalburgCity_Mart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PETALBURG_CITY_MART",
   "name": "PetalburgCity_Mart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_PETALBURG_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json
index 29ba086f2..1fd6e972b 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F",
   "name": "PetalburgCity_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_PETALBURG_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json
index 2fd4bf21a..8eb89d208 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F",
   "name": "PetalburgCity_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_PETALBURG_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json
index c0efbeb67..0b8007a91 100644
--- a/data/maps/PetalburgCity_WallysHouse/map.json
+++ b/data/maps/PetalburgCity_WallysHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PETALBURG_CITY_WALLYS_HOUSE",
   "name": "PetalburgCity_WallysHouse",
   "layout": "LAYOUT_HOUSE2",
-  "music": "MUS_MACHI_S2",
+  "music": "MUS_PETALBURG",
   "region_map_section": "MAPSEC_PETALBURG_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json
index cc9004737..fa97b5dd1 100644
--- a/data/maps/PetalburgWoods/map.json
+++ b/data/maps/PetalburgWoods/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_PETALBURG_WOODS",
   "name": "PetalburgWoods",
   "layout": "LAYOUT_PETALBURG_WOODS",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_PETALBURG_WOODS",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc
index 292c2dfac..dbdb66b0b 100644
--- a/data/maps/PetalburgWoods/scripts.inc
+++ b/data/maps/PetalburgWoods/scripts.inc
@@ -11,7 +11,7 @@ PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7
 	waitmovement 0
 	msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT
 	closemessage
-	playbgm MUS_AQA_0, 0
+	playbgm MUS_ENCOUNTER_AQUA, 0
 	applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaEntrance
 	waitmovement 0
 	msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT
@@ -48,7 +48,7 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079
 	waitmovement 0
 	msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT
 	closemessage
-	playbgm MUS_AQA_0, 0
+	playbgm MUS_ENCOUNTER_AQUA, 0
 	applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaEntrance
 	waitmovement 0
 	msgbox PetalburgWoods_Text_IWasGoingToAmbushYou, MSGBOX_DEFAULT
diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json
index f3466eea8..083f44445 100644
--- a/data/maps/RecordCorner/map.json
+++ b/data/maps/RecordCorner/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RECORD_CORNER",
   "name": "RecordCorner",
   "layout": "LAYOUT_RECORD_CORNER",
-  "music": "MUS_RAINBOW",
+  "music": "MUS_EVER_GRANDE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json
index e08c4fe5a..34dc92841 100644
--- a/data/maps/Route101/map.json
+++ b/data/maps/Route101/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE101",
   "name": "Route101",
   "layout": "LAYOUT_ROUTE101",
-  "music": "MUS_DOORO1",
+  "music": "MUS_ROUTE101",
   "region_map_section": "MAPSEC_ROUTE_101",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index 647c9ee16..66ce4abc8 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -21,7 +21,7 @@ Route101_EventScript_HideMapNamePopup:: @ 81EBCD5
 
 Route101_EventScript_StartBirchRescue:: @ 81EBCDE
 	lockall
-	playbgm MUS_EVENT0, 1
+	playbgm MUS_HELP, 1
 	msgbox Route101_Text_HelpMe, MSGBOX_DEFAULT
 	closemessage
 	setobjectxy LOCALID_BIRCH, 0, 15
diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json
index 43e327d01..fc9adee3b 100644
--- a/data/maps/Route102/map.json
+++ b/data/maps/Route102/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE102",
   "name": "Route102",
   "layout": "LAYOUT_ROUTE102",
-  "music": "MUS_DOORO1",
+  "music": "MUS_ROUTE101",
   "region_map_section": "MAPSEC_ROUTE_102",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index 599d0447f..4b91f913b 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE103",
   "name": "Route103",
   "layout": "LAYOUT_ROUTE103",
-  "music": "MUS_DOORO1",
+  "music": "MUS_ROUTE101",
   "region_map_section": "MAPSEC_ROUTE_103",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index df8c3b628..965b5ff5c 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -31,7 +31,7 @@ Route103_EventScript_Rival:: @ 81EC3C1
 Route103_EventScript_RivalMay:: @ 81EC3DA
 	msgbox Route103_Text_MayRoute103Pokemon, MSGBOX_DEFAULT
 	closemessage
-	playbgm MUS_GIRL_SUP, 1
+	playbgm MUS_ENCOUNTER_MAY, 1
 	applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
 	waitmovement 0
 	applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
@@ -48,7 +48,7 @@ Route103_EventScript_RivalMay:: @ 81EC3DA
 Route103_EventScript_RivalBrendan:: @ 81EC434
 	msgbox Route103_Text_BrendanRoute103Pokemon, MSGBOX_DEFAULT
 	closemessage
-	playbgm MUS_BOY_SUP, 1
+	playbgm MUS_ENCOUNTER_BRENDAN, 1
 	applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
 	waitmovement 0
 	applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
@@ -115,7 +115,7 @@ Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D
 	applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingNorth
 	applymovement LOCALID_RIVAL, Route103_Movement_RivalExitFacingNorth1
 	waitmovement 0
-	playse SE_DANSA
+	playse SE_LEDGE
 	applymovement LOCALID_RIVAL, Route103_EventScript_RivalExitFacingNorth2
 	waitmovement 0
 	goto Route103_EventScript_RivalEnd
@@ -125,7 +125,7 @@ Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561
 	applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingEastOrWest
 	applymovement LOCALID_RIVAL, Route103_Movement_RivalExit1
 	waitmovement 0
-	playse SE_DANSA
+	playse SE_LEDGE
 	applymovement LOCALID_RIVAL, Route103_Movement_RivalExit2
 	waitmovement 0
 	goto Route103_EventScript_RivalEnd
@@ -134,7 +134,7 @@ Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561
 Route103_EventScript_RivalExitFacingSouth:: @ 81EC585
 	applymovement LOCALID_RIVAL, Route103_Movement_RivalExit1
 	waitmovement 0
-	playse SE_DANSA
+	playse SE_LEDGE
 	applymovement LOCALID_RIVAL, Route103_Movement_RivalExit2
 	waitmovement 0
 	goto Route103_EventScript_RivalEnd
diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json
index 99b8ffeb3..69e5faf27 100644
--- a/data/maps/Route104/map.json
+++ b/data/maps/Route104/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE104",
   "name": "Route104",
   "layout": "LAYOUT_ROUTE104",
-  "music": "MUS_NEXTROAD",
+  "music": "MUS_ROUTE104",
   "region_map_section": "MAPSEC_ROUTE_104",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index ff9003887..d1faca53a 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -84,11 +84,11 @@ Route104_EventScript_PlayRivalMusic:: @ 81ECD11
 	return
 
 Route104_EventScript_PlayMayMusic:: @ 81ECD29
-	playbgm MUS_GIRL_SUP, 1
+	playbgm MUS_ENCOUNTER_MAY, 1
 	return
 
 Route104_EventScript_PlayBrendanMusic:: @ 81ECD2E
-	playbgm MUS_BOY_SUP, 1
+	playbgm MUS_ENCOUNTER_BRENDAN, 1
 	return
 
 Route104_EventScript_RivalEncounter:: @ 81ECD33
@@ -106,7 +106,7 @@ Route104_EventScript_MayEncounter:: @ 81ECD4B
 	msgbox Route104_Text_MayWeShouldRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox Route104_Text_RegisteredMay, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
@@ -195,7 +195,7 @@ Route104_EventScript_BrendanEncounter:: @ 81ECE6F
 	msgbox Route104_Text_BrendanWeShouldRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox Route104_Text_RegisteredBrendan, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
@@ -387,7 +387,7 @@ Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF
 	pokenavcall Route104_Text_DadPokenavCall
 	waitmessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox Route104_Text_RegisteredDadInPokenav, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json
index e027c520e..ae4ffc791 100644
--- a/data/maps/Route104_MrBrineysHouse/map.json
+++ b/data/maps/Route104_MrBrineysHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE104_MR_BRINEYS_HOUSE",
   "name": "Route104_MrBrineysHouse",
   "layout": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE",
-  "music": "MUS_MACHI_S2",
+  "music": "MUS_PETALBURG",
   "region_map_section": "MAPSEC_ROUTE_104",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json
index 511f1cf7c..ec18b1ded 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/map.json
+++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP",
   "name": "Route104_PrettyPetalFlowerShop",
   "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP",
-  "music": "MUS_MACHI_S2",
+  "music": "MUS_PETALBURG",
   "region_map_section": "MAPSEC_ROUTE_104",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json
index d1210f4f1..a15458bf6 100644
--- a/data/maps/Route104_Prototype/map.json
+++ b/data/maps/Route104_Prototype/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE104_PROTOTYPE",
   "name": "Route104_Prototype",
   "layout": "LAYOUT_ROUTE104_PROTOTYPE",
-  "music": "MUS_NEXTROAD",
+  "music": "MUS_ROUTE104",
   "region_map_section": "MAPSEC_ROUTE_104",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json
index e65913f30..7abd76e3d 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP",
   "name": "Route104_PrototypePrettyPetalFlowerShop",
   "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP",
-  "music": "MUS_NEXTROAD",
+  "music": "MUS_ROUTE104",
   "region_map_section": "MAPSEC_ROUTE_104",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json
index 76f11b3bd..bb6c7a653 100644
--- a/data/maps/Route105/map.json
+++ b/data/maps/Route105/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE105",
   "name": "Route105",
   "layout": "LAYOUT_ROUTE105",
-  "music": "MUS_NEXTROAD",
+  "music": "MUS_ROUTE104",
   "region_map_section": "MAPSEC_ROUTE_105",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json
index 307608812..c28d593a7 100644
--- a/data/maps/Route106/map.json
+++ b/data/maps/Route106/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE106",
   "name": "Route106",
   "layout": "LAYOUT_ROUTE106",
-  "music": "MUS_NEXTROAD",
+  "music": "MUS_ROUTE104",
   "region_map_section": "MAPSEC_ROUTE_106",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json
index 3768551a3..ddc0f1459 100644
--- a/data/maps/Route107/map.json
+++ b/data/maps/Route107/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE107",
   "name": "Route107",
   "layout": "LAYOUT_ROUTE107",
-  "music": "MUS_NEXTROAD",
+  "music": "MUS_ROUTE104",
   "region_map_section": "MAPSEC_ROUTE_107",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json
index 36b200964..21acfd6ca 100644
--- a/data/maps/Route108/map.json
+++ b/data/maps/Route108/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE108",
   "name": "Route108",
   "layout": "LAYOUT_ROUTE108",
-  "music": "MUS_NEXTROAD",
+  "music": "MUS_ROUTE104",
   "region_map_section": "MAPSEC_ROUTE_108",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json
index f6b1a46cd..2ddcc4530 100644
--- a/data/maps/Route109/map.json
+++ b/data/maps/Route109/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE109",
   "name": "Route109",
   "layout": "LAYOUT_ROUTE109",
-  "music": "MUS_NEXTROAD",
+  "music": "MUS_ROUTE104",
   "region_map_section": "MAPSEC_ROUTE_109",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json
index 6a86e8c24..0a8164ba7 100644
--- a/data/maps/Route109_SeashoreHouse/map.json
+++ b/data/maps/Route109_SeashoreHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE109_SEASHORE_HOUSE",
   "name": "Route109_SeashoreHouse",
   "layout": "LAYOUT_ROUTE109_SEASHORE_HOUSE",
-  "music": "MUS_HIGHTOWN",
+  "music": "MUS_DEWFORD",
   "region_map_section": "MAPSEC_ROUTE_109",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json
index 5e15be18c..bb5df5eb4 100644
--- a/data/maps/Route110/map.json
+++ b/data/maps/Route110/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110",
   "name": "Route110",
   "layout": "LAYOUT_ROUTE110",
-  "music": "MUS_DOORO_X1",
+  "music": "MUS_ROUTE110",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
index 7cdb547ed..50f3d1f48 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -410,11 +410,11 @@ Route110_EventScript_RivalScene:: @ 81EF76E
 	end
 
 Route110_EventScript_PlayMayMusic:: @ 81EF7E1
-	playbgm MUS_GIRL_SUP, 1
+	playbgm MUS_ENCOUNTER_MAY, 1
 	return
 
 Route110_EventScript_PlayBrendanMusic:: @ 81EF7E6
-	playbgm MUS_BOY_SUP, 1
+	playbgm MUS_ENCOUNTER_BRENDAN, 1
 	return
 
 Route110_EventScript_MayBattle:: @ 81EF7EB
@@ -648,7 +648,7 @@ Route110_EventScript_BirchScene:: @ 81EF9F7
 	msgbox Route110_Text_HeardYouInstallMatchCall, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox Route110_Text_RegisteredBirchInPokenav, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
index cd9fd8060..0d382f275 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
   "name": "Route110_SeasideCyclingRoadNorthEntrance",
   "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE",
-  "music": "MUS_FINECITY",
+  "music": "MUS_SLATEPORT",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
index 01c200b02..12cd26ada 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
   "name": "Route110_SeasideCyclingRoadSouthEntrance",
   "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE",
-  "music": "MUS_FINECITY",
+  "music": "MUS_SLATEPORT",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json
index fb9c25c08..5d6ddb556 100644
--- a/data/maps/Route110_TrickHouseCorridor/map.json
+++ b/data/maps/Route110_TrickHouseCorridor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR",
   "name": "Route110_TrickHouseCorridor",
   "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR",
-  "music": "MUS_KARAKURI",
+  "music": "MUS_TRICK_HOUSE",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json
index 6f6f3fcc7..c82d871fb 100644
--- a/data/maps/Route110_TrickHouseEnd/map.json
+++ b/data/maps/Route110_TrickHouseEnd/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_TRICK_HOUSE_END",
   "name": "Route110_TrickHouseEnd",
   "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_END",
-  "music": "MUS_KARAKURI",
+  "music": "MUS_TRICK_HOUSE",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index 7e6f6a5bf..0852b4e33 100644
--- a/data/maps/Route110_TrickHouseEnd/scripts.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -194,7 +194,7 @@ Route110_TrickHouseEnd_EventScript_GiveBlueTent:: @ 826AFC7
 Route110_TrickHouseEnd_EventScript_TrickMasterExit:: @ 826AFCF
 	applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin
 	waitmovement 0
-	playse SE_W153
+	playse SE_M_EXPLOSION
 	applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway
 	waitmovement 0
 	removeobject LOCALID_TRICK_MASTER
@@ -242,7 +242,7 @@ Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: @ 826B041
 	delay 20
 	applymovement LOCALID_TRICK_MASTER, Route110_TrickHouseEnd_Movement_TrickMasterSurprise
 	waitmovement 0
-	playse SE_W153
+	playse SE_M_EXPLOSION
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT
diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json
index 499cf26e0..5895ae788 100644
--- a/data/maps/Route110_TrickHouseEntrance/map.json
+++ b/data/maps/Route110_TrickHouseEntrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE",
   "name": "Route110_TrickHouseEntrance",
   "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE",
-  "music": "MUS_KARAKURI",
+  "music": "MUS_TRICK_HOUSE",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index 98b06a94f..adfcf6bbc 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -223,7 +223,7 @@ Route110_TrickHouseEntrance_EventScript_BeginChallenge:: @ 8269CF8
 	delay 20
 	applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin
 	waitmovement 0
-	playse SE_W153
+	playse SE_M_EXPLOSION
 	applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway
 	waitmovement 0
 	removeobject LOCALID_TRICK_MASTER
@@ -480,7 +480,7 @@ Route110_TrickHouseEntrance_EventScript_ReceivedTent:: @ 826A09A
 	waitmovement 0
 	applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin
 	waitmovement 0
-	playse SE_W153
+	playse SE_M_EXPLOSION
 	applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterJumpAway
 	waitmovement 0
 	removeobject LOCALID_TRICK_MASTER
@@ -711,7 +711,7 @@ Route110_TrickHousePuzzle_EventScript_ReadScrollAgain:: @ 826A3DB
 	end
 
 Route110_TrickHousePuzzle_EventScript_FoundScroll:: @ 826A3E5
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message Route110_TrickHousePuzzle_Text_FoundAScroll
 	waitfanfare
 	msgbox Route110_TrickHousePuzzle_Text_MemorizedSecretCode, MSGBOX_DEFAULT
diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json
index 087057163..42a416b51 100644
--- a/data/maps/Route110_TrickHousePuzzle1/map.json
+++ b/data/maps/Route110_TrickHousePuzzle1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1",
   "name": "Route110_TrickHousePuzzle1",
   "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1",
-  "music": "MUS_KARAKURI",
+  "music": "MUS_TRICK_HOUSE",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json
index f2c96756b..2b3ca9b2e 100644
--- a/data/maps/Route110_TrickHousePuzzle2/map.json
+++ b/data/maps/Route110_TrickHousePuzzle2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2",
   "name": "Route110_TrickHousePuzzle2",
   "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2",
-  "music": "MUS_KARAKURI",
+  "music": "MUS_TRICK_HOUSE",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json
index 389391b87..ba01c6b33 100644
--- a/data/maps/Route110_TrickHousePuzzle3/map.json
+++ b/data/maps/Route110_TrickHousePuzzle3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3",
   "name": "Route110_TrickHousePuzzle3",
   "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3",
-  "music": "MUS_KARAKURI",
+  "music": "MUS_TRICK_HOUSE",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json
index ad00f12ac..8e8348c95 100644
--- a/data/maps/Route110_TrickHousePuzzle4/map.json
+++ b/data/maps/Route110_TrickHousePuzzle4/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4",
   "name": "Route110_TrickHousePuzzle4",
   "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4",
-  "music": "MUS_KARAKURI",
+  "music": "MUS_TRICK_HOUSE",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json
index ee074b37d..9eba5d7f8 100644
--- a/data/maps/Route110_TrickHousePuzzle5/map.json
+++ b/data/maps/Route110_TrickHousePuzzle5/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5",
   "name": "Route110_TrickHousePuzzle5",
   "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5",
-  "music": "MUS_KARAKURI",
+  "music": "MUS_TRICK_HOUSE",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
index 419fa2831..36162f42f 100644
--- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
@@ -454,7 +454,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3:: @ 826D12F
 
 Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer:: @ 826D152
 	waitse
-	playse SE_HAZURE
+	playse SE_FAILURE
 	msgbox Route110_TrickHousePuzzle5_Text_DisappointmentError, MSGBOX_DEFAULT
 	applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_MechadollShake
 	applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_MechadollShake
@@ -472,7 +472,7 @@ Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer:: @ 826D152
 
 Route110_TrickHousePuzzle5_EventScript_CorrectAnswer:: @ 826D1A0
 	waitse
-	playse SE_SEIKAI
+	playse SE_SUCCESS
 	goto Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	end
 
diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json
index bec9d12b3..ff6e3e7f3 100644
--- a/data/maps/Route110_TrickHousePuzzle6/map.json
+++ b/data/maps/Route110_TrickHousePuzzle6/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6",
   "name": "Route110_TrickHousePuzzle6",
   "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6",
-  "music": "MUS_KARAKURI",
+  "music": "MUS_TRICK_HOUSE",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json
index 12afd07ec..f5976bdef 100644
--- a/data/maps/Route110_TrickHousePuzzle7/map.json
+++ b/data/maps/Route110_TrickHousePuzzle7/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7",
   "name": "Route110_TrickHousePuzzle7",
   "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7",
-  "music": "MUS_KARAKURI",
+  "music": "MUS_TRICK_HOUSE",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
index 6b7559389..b0cbd3813 100644
--- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
@@ -125,7 +125,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch1:: @ 826E1FE
 	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn
 	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1On
 	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off
 	end
@@ -136,7 +136,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch2:: @ 826E22D
 	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn
 	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2On
 	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off
 	end
@@ -147,7 +147,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch3:: @ 826E25C
 	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn
 	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3On
 	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off
 	end
@@ -158,7 +158,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch4:: @ 826E28B
 	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn
 	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4On
 	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off
 	end
@@ -169,7 +169,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch5:: @ 826E2BA
 	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn
 	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5On
 	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off
 	end
@@ -227,9 +227,9 @@ Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off:: @ 826E316
 
 @ From here is where the new, actually used puzzle scripts begin
 Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	waitse
-	playse SE_TU_SAA
+	playse SE_REPEL
 	initrotatingtilepuzzle TRUE
 	moverotatingtileobjects 0
 	waitmovement 0
@@ -239,9 +239,9 @@ Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B
 	end
 
 Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	waitse
-	playse SE_TU_SAA
+	playse SE_REPEL
 	initrotatingtilepuzzle TRUE
 	moverotatingtileobjects 1
 	waitmovement 0
@@ -251,9 +251,9 @@ Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331
 	end
 
 Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	waitse
-	playse SE_TU_SAA
+	playse SE_REPEL
 	initrotatingtilepuzzle TRUE
 	moverotatingtileobjects 2
 	waitmovement 0
@@ -263,9 +263,9 @@ Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347
 	end
 
 Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	waitse
-	playse SE_TU_SAA
+	playse SE_REPEL
 	initrotatingtilepuzzle TRUE
 	moverotatingtileobjects 3
 	waitmovement 0
@@ -276,9 +276,9 @@ Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D
 
 @ Unused
 Route110_TrickHousePuzzle7_EventScript_RedButton:: @ 826E373
-	playse SE_MU_PACHI
+	playse SE_SWITCH
 	waitse
-	playse SE_TU_SAA
+	playse SE_REPEL
 	initrotatingtilepuzzle TRUE
 	moverotatingtileobjects 4
 	waitmovement 0
diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json
index 3a1bc8caf..bfb106eb6 100644
--- a/data/maps/Route110_TrickHousePuzzle8/map.json
+++ b/data/maps/Route110_TrickHousePuzzle8/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8",
   "name": "Route110_TrickHousePuzzle8",
   "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8",
-  "music": "MUS_KARAKURI",
+  "music": "MUS_TRICK_HOUSE",
   "region_map_section": "MAPSEC_ROUTE_110",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json
index 938dbcff1..014ac084c 100644
--- a/data/maps/Route111/map.json
+++ b/data/maps/Route111/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE111",
   "name": "Route111",
   "layout": "LAYOUT_ROUTE111",
-  "music": "MUS_DOORO_X1",
+  "music": "MUS_ROUTE110",
   "region_map_section": "MAPSEC_ROUTE_111",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index 281dddf0c..322c9a2b7 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -126,7 +126,7 @@ Route111_EventScript_MirageTowerDisappear:: @ 81F0E60
 	special StartMirageTowerShake
 	waitstate
 	delay 24
-	playse SE_RU_HYUU
+	playse SE_FALL
 	addobject LOCALID_PLAYER_FALLING
 	special StartPlayerDescendMirageTower
 	waitstate
@@ -268,14 +268,14 @@ Route111_Movement_PushRightFromRoute: @ 81F0FAE
 
 Route111_EventScript_SunTrigger:: @ 81F0FB0
 	setweather WEATHER_SUNNY
-	fadenewbgm MUS_DOORO_X1
+	fadenewbgm MUS_ROUTE110
 	doweather
 	setvar VAR_TEMP_3, 0
 	end
 
 Route111_EventScript_SandstormTrigger:: @ 81F0FBD
 	setweather WEATHER_SANDSTORM
-	fadenewbgm MUS_ASHROAD
+	fadenewbgm MUS_ROUTE111
 	doweather
 	end
 
diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json
index 679b53522..419e4c2ee 100644
--- a/data/maps/Route111_OldLadysRestStop/map.json
+++ b/data/maps/Route111_OldLadysRestStop/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE111_OLD_LADYS_REST_STOP",
   "name": "Route111_OldLadysRestStop",
   "layout": "LAYOUT_HOUSE3",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_ROUTE_111",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json
index ec5afd93a..f88935971 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/map.json
+++ b/data/maps/Route111_WinstrateFamilysHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE",
   "name": "Route111_WinstrateFamilysHouse",
   "layout": "LAYOUT_HOUSE2",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_ROUTE_111",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json
index 37f0a38df..d4d650857 100644
--- a/data/maps/Route112/map.json
+++ b/data/maps/Route112/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE112",
   "name": "Route112",
   "layout": "LAYOUT_ROUTE112",
-  "music": "MUS_DOORO_X1",
+  "music": "MUS_ROUTE110",
   "region_map_section": "MAPSEC_ROUTE_112",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json
index a59df37cb..7adae98f7 100644
--- a/data/maps/Route112_CableCarStation/map.json
+++ b/data/maps/Route112_CableCarStation/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE112_CABLE_CAR_STATION",
   "name": "Route112_CableCarStation",
   "layout": "LAYOUT_CABLE_CAR_STATION",
-  "music": "MUS_DOORO_X1",
+  "music": "MUS_ROUTE110",
   "region_map_section": "MAPSEC_ROUTE_112",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json
index df1b35223..8d9d74028 100644
--- a/data/maps/Route113/map.json
+++ b/data/maps/Route113/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE113",
   "name": "Route113",
   "layout": "LAYOUT_ROUTE113",
-  "music": "MUS_KAZANBAI",
+  "music": "MUS_ROUTE113",
   "region_map_section": "MAPSEC_ROUTE_113",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json
index 1d5deabd0..924fbd85d 100644
--- a/data/maps/Route113_GlassWorkshop/map.json
+++ b/data/maps/Route113_GlassWorkshop/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE113_GLASS_WORKSHOP",
   "name": "Route113_GlassWorkshop",
   "layout": "LAYOUT_HOUSE4",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_ROUTE_113",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json
index 48bafee08..37edf509d 100644
--- a/data/maps/Route114/map.json
+++ b/data/maps/Route114/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE114",
   "name": "Route114",
   "layout": "LAYOUT_ROUTE114",
-  "music": "MUS_DOORO_X1",
+  "music": "MUS_ROUTE110",
   "region_map_section": "MAPSEC_ROUTE_114",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json
index 19d87c353..dd21ff77f 100644
--- a/data/maps/Route114_FossilManiacsHouse/map.json
+++ b/data/maps/Route114_FossilManiacsHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE",
   "name": "Route114_FossilManiacsHouse",
   "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE",
-  "music": "MUS_TONEKUSA",
+  "music": "MUS_FALLARBOR",
   "region_map_section": "MAPSEC_ROUTE_114",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json
index 3384df523..9a8ac70c9 100644
--- a/data/maps/Route114_FossilManiacsTunnel/map.json
+++ b/data/maps/Route114_FossilManiacsTunnel/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL",
   "name": "Route114_FossilManiacsTunnel",
   "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL",
-  "music": "MUS_TONEKUSA",
+  "music": "MUS_FALLARBOR",
   "region_map_section": "MAPSEC_ROUTE_114",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json
index 2a444d06a..fcb8edfc9 100644
--- a/data/maps/Route114_LanettesHouse/map.json
+++ b/data/maps/Route114_LanettesHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE114_LANETTES_HOUSE",
   "name": "Route114_LanettesHouse",
   "layout": "LAYOUT_ROUTE114_LANETTES_HOUSE",
-  "music": "MUS_TONEKUSA",
+  "music": "MUS_FALLARBOR",
   "region_map_section": "MAPSEC_ROUTE_114",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json
index 0be264375..2d0dbdbaa 100644
--- a/data/maps/Route115/map.json
+++ b/data/maps/Route115/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE115",
   "name": "Route115",
   "layout": "LAYOUT_ROUTE115",
-  "music": "MUS_NEXTROAD",
+  "music": "MUS_ROUTE104",
   "region_map_section": "MAPSEC_ROUTE_115",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json
index 6c2be7980..247a4b7b1 100644
--- a/data/maps/Route116/map.json
+++ b/data/maps/Route116/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE116",
   "name": "Route116",
   "layout": "LAYOUT_ROUTE116",
-  "music": "MUS_NEXTROAD",
+  "music": "MUS_ROUTE104",
   "region_map_section": "MAPSEC_ROUTE_116",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json
index 8ced24aa7..b83971532 100644
--- a/data/maps/Route116_TunnelersRestHouse/map.json
+++ b/data/maps/Route116_TunnelersRestHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE116_TUNNELERS_REST_HOUSE",
   "name": "Route116_TunnelersRestHouse",
   "layout": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_ROUTE_116",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
index 655c43048..d2f45e256 100644
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE117",
   "name": "Route117",
   "layout": "LAYOUT_ROUTE117",
-  "music": "MUS_DOORO_X1",
+  "music": "MUS_ROUTE110",
   "region_map_section": "MAPSEC_ROUTE_117",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json
index 141dd44ca..5b51aa958 100644
--- a/data/maps/Route117_PokemonDayCare/map.json
+++ b/data/maps/Route117_PokemonDayCare/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE117_POKEMON_DAY_CARE",
   "name": "Route117_PokemonDayCare",
   "layout": "LAYOUT_ROUTE117_POKEMON_DAY_CARE",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_ROUTE_117",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json
index 09df9a05a..7b541e629 100644
--- a/data/maps/Route118/map.json
+++ b/data/maps/Route118/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE118",
   "name": "Route118",
   "layout": "LAYOUT_ROUTE118",
-  "music": "MUS_ROUTE_118",
+  "music": "MUS_ROUTE118",
   "region_map_section": "MAPSEC_ROUTE_118",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index 1a34ad96c..0197508bb 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -97,7 +97,7 @@ Route118_EventScript_StevenTrigger2:: @ 81F3EC4
 	end
 
 Route118_EventScript_StevenTrigger:: @ 81F3EE4
-	playse SE_DANSA
+	playse SE_LEDGE
 	applymovement LOCALID_STEVEN, Route118_Movement_StevenJumpLedge
 	waitmovement 0
 	delay 30
diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json
index 1ad1ca45a..fa6391a34 100644
--- a/data/maps/Route119/map.json
+++ b/data/maps/Route119/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE119",
   "name": "Route119",
   "layout": "LAYOUT_ROUTE119",
-  "music": "MUS_GRANROAD",
+  "music": "MUS_ROUTE119",
   "region_map_section": "MAPSEC_ROUTE_119",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
index 2800126f6..734934d17 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -74,11 +74,11 @@ Route119_EventScript_RivalEncounter:: @ 81F4488
 	end
 
 Route119_EventScript_PlayMayMusic:: @ 81F4501
-	playbgm MUS_GIRL_SUP, 1
+	playbgm MUS_ENCOUNTER_MAY, 1
 	return
 
 Route119_EventScript_PlayBrendanMusic:: @ 81F4506
-	playbgm MUS_BOY_SUP, 1
+	playbgm MUS_ENCOUNTER_BRENDAN, 1
 	return
 
 Route119_EventScript_BattleMay:: @ 81F450B
diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json
index 6478404e2..0225f1cd3 100644
--- a/data/maps/Route119_House/map.json
+++ b/data/maps/Route119_House/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE119_HOUSE",
   "name": "Route119_House",
   "layout": "LAYOUT_HOUSE1",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_ROUTE_119",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json
index f1a3b0f99..9a9e23882 100644
--- a/data/maps/Route119_WeatherInstitute_1F/map.json
+++ b/data/maps/Route119_WeatherInstitute_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE119_WEATHER_INSTITUTE_1F",
   "name": "Route119_WeatherInstitute_1F",
   "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_ROUTE_119",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json
index a6dc3dfee..e2e5ebb8a 100644
--- a/data/maps/Route119_WeatherInstitute_2F/map.json
+++ b/data/maps/Route119_WeatherInstitute_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE119_WEATHER_INSTITUTE_2F",
   "name": "Route119_WeatherInstitute_2F",
   "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_ROUTE_119",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index 7e2c15606..85d9d928f 100644
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -124,7 +124,7 @@ Route119_WeatherInstitute_2F_EventScript_SendCastformToPC:: @ 82700D0
 	end
 
 Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare:: @ 82700DB
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform
 	waitmessage
 	waitfanfare
diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json
index 2f0f736a2..8a7e56ddc 100644
--- a/data/maps/Route120/map.json
+++ b/data/maps/Route120/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE120",
   "name": "Route120",
   "layout": "LAYOUT_ROUTE120",
-  "music": "MUS_DOORO_X3",
+  "music": "MUS_ROUTE120",
   "region_map_section": "MAPSEC_ROUTE_120",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json
index f4b4f5e84..e956f6251 100644
--- a/data/maps/Route121/map.json
+++ b/data/maps/Route121/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE121",
   "name": "Route121",
   "layout": "LAYOUT_ROUTE121",
-  "music": "MUS_DOORO_X3",
+  "music": "MUS_ROUTE120",
   "region_map_section": "MAPSEC_ROUTE_121",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc
index 1a7591a93..fdc191ea8 100644
--- a/data/maps/Route121/scripts.inc
+++ b/data/maps/Route121/scripts.inc
@@ -19,7 +19,7 @@ Route121_EventScript_SafariZoneSign:: @ 81F5E0F
 
 Route121_EventScript_AquaGruntsMoveOut:: @ 81F5E18
 	lockall
-	playbgm MUS_AQA_0, 0
+	playbgm MUS_ENCOUNTER_AQUA, 0
 	applymovement LOCALID_GRUNT_2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	msgbox Route121_Text_OkayMoveOutToMtPyre, MSGBOX_DEFAULT
diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json
index 35516142e..231d3b4a7 100644
--- a/data/maps/Route121_SafariZoneEntrance/map.json
+++ b/data/maps/Route121_SafariZoneEntrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE",
   "name": "Route121_SafariZoneEntrance",
   "layout": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_ROUTE_121",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc
index 549f22772..a87a374d2 100644
--- a/data/maps/Route121_SafariZoneEntrance/scripts.inc
+++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc
@@ -64,12 +64,12 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48
 	checkmoney 500, 0
 	compare VAR_RESULT, 0
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_NotEnoughMoney
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox Route121_SafariZoneEntrance_Text_ThatWillBe500Please, MSGBOX_DEFAULT
 	removemoney 500, 0
 	updatemoneybox 0, 0
 	msgbox Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls, MSGBOX_DEFAULT
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message Route121_SafariZoneEntrance_Text_Received30SafariBalls
 	waitfanfare
 	msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT
diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json
index 39481f9d7..8c9213347 100644
--- a/data/maps/Route122/map.json
+++ b/data/maps/Route122/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE122",
   "name": "Route122",
   "layout": "LAYOUT_ROUTE122",
-  "music": "MUS_DOORO_X4",
+  "music": "MUS_ROUTE122",
   "region_map_section": "MAPSEC_ROUTE_122",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json
index 4a1863532..1bd25310a 100644
--- a/data/maps/Route123/map.json
+++ b/data/maps/Route123/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE123",
   "name": "Route123",
   "layout": "LAYOUT_ROUTE123",
-  "music": "MUS_DOORO_X4",
+  "music": "MUS_ROUTE122",
   "region_map_section": "MAPSEC_ROUTE_123",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json
index ef72c04ab..488ee97b5 100644
--- a/data/maps/Route123_BerryMastersHouse/map.json
+++ b/data/maps/Route123_BerryMastersHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE123_BERRY_MASTERS_HOUSE",
   "name": "Route123_BerryMastersHouse",
   "layout": "LAYOUT_HOUSE2",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_ROUTE_123",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json
index 80d44f155..cb075d29a 100644
--- a/data/maps/Route124/map.json
+++ b/data/maps/Route124/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE124",
   "name": "Route124",
   "layout": "LAYOUT_ROUTE124",
-  "music": "MUS_DOORO_X3",
+  "music": "MUS_ROUTE120",
   "region_map_section": "MAPSEC_ROUTE_124",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json
index fc6890729..a9c16cd22 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE",
   "name": "Route124_DivingTreasureHuntersHouse",
   "layout": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE",
-  "music": "MUS_MINAMO",
+  "music": "MUS_LILYCOVE",
   "region_map_section": "MAPSEC_ROUTE_124",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json
index c83abccd2..984a554e4 100644
--- a/data/maps/Route125/map.json
+++ b/data/maps/Route125/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE125",
   "name": "Route125",
   "layout": "LAYOUT_ROUTE125",
-  "music": "MUS_DOORO_X3",
+  "music": "MUS_ROUTE120",
   "region_map_section": "MAPSEC_ROUTE_125",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json
index 3f1aa7dc7..60b439066 100644
--- a/data/maps/Route126/map.json
+++ b/data/maps/Route126/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE126",
   "name": "Route126",
   "layout": "LAYOUT_ROUTE126",
-  "music": "MUS_DOORO_X3",
+  "music": "MUS_ROUTE120",
   "region_map_section": "MAPSEC_ROUTE_126",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json
index 7908f94b0..0e6d78da7 100644
--- a/data/maps/Route127/map.json
+++ b/data/maps/Route127/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE127",
   "name": "Route127",
   "layout": "LAYOUT_ROUTE127",
-  "music": "MUS_DOORO_X3",
+  "music": "MUS_ROUTE120",
   "region_map_section": "MAPSEC_ROUTE_127",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json
index 9d9b003ba..d8fbb249a 100644
--- a/data/maps/Route128/map.json
+++ b/data/maps/Route128/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE128",
   "name": "Route128",
   "layout": "LAYOUT_ROUTE128",
-  "music": "MUS_DOORO_X3",
+  "music": "MUS_ROUTE120",
   "region_map_section": "MAPSEC_ROUTE_128",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json
index 0c47261cf..ca814b465 100644
--- a/data/maps/Route129/map.json
+++ b/data/maps/Route129/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE129",
   "name": "Route129",
   "layout": "LAYOUT_ROUTE129",
-  "music": "MUS_GRANROAD",
+  "music": "MUS_ROUTE119",
   "region_map_section": "MAPSEC_ROUTE_129",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json
index 91fcc7755..7b4cf047c 100644
--- a/data/maps/Route130/map.json
+++ b/data/maps/Route130/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE130",
   "name": "Route130",
   "layout": "LAYOUT_ROUTE130",
-  "music": "MUS_GRANROAD",
+  "music": "MUS_ROUTE119",
   "region_map_section": "MAPSEC_ROUTE_130",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json
index 03922e25e..3599ae556 100644
--- a/data/maps/Route131/map.json
+++ b/data/maps/Route131/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE131",
   "name": "Route131",
   "layout": "LAYOUT_ROUTE131",
-  "music": "MUS_GRANROAD",
+  "music": "MUS_ROUTE119",
   "region_map_section": "MAPSEC_ROUTE_131",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json
index 0f2d76d10..1d3d9efd0 100644
--- a/data/maps/Route132/map.json
+++ b/data/maps/Route132/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE132",
   "name": "Route132",
   "layout": "LAYOUT_ROUTE132",
-  "music": "MUS_GRANROAD",
+  "music": "MUS_ROUTE119",
   "region_map_section": "MAPSEC_ROUTE_132",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json
index 66047152c..80e64638b 100644
--- a/data/maps/Route133/map.json
+++ b/data/maps/Route133/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE133",
   "name": "Route133",
   "layout": "LAYOUT_ROUTE133",
-  "music": "MUS_GRANROAD",
+  "music": "MUS_ROUTE119",
   "region_map_section": "MAPSEC_ROUTE_133",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json
index 9960b3c14..dd642a8e1 100644
--- a/data/maps/Route134/map.json
+++ b/data/maps/Route134/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_ROUTE134",
   "name": "Route134",
   "layout": "LAYOUT_ROUTE134",
-  "music": "MUS_GRANROAD",
+  "music": "MUS_ROUTE119",
   "region_map_section": "MAPSEC_ROUTE_134",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json
index 3d2232b9a..445bc5189 100644
--- a/data/maps/RustboroCity/map.json
+++ b/data/maps/RustboroCity/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY",
   "name": "RustboroCity",
   "layout": "LAYOUT_RUSTBORO_CITY",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index 477b0d658..7b1f4a3d8 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -43,7 +43,7 @@ RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715
 	setvar VAR_ROUTE104_STATE, 1
 	applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown
 	waitmovement 0
-	playse SE_KAIDAN
+	playse SE_EXIT
 	delay 10
 	addobject LOCALID_SCIENTIST
 	applymovement LOCALID_SCIENTIST, RustboroCity_Movement_ScientistApproachPlayer
@@ -62,13 +62,13 @@ RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715
 	setflag FLAG_HAS_MATCH_CALL
 	applymovement LOCALID_SCIENTIST, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 10
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 10
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 10
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 20
 	applymovement LOCALID_SCIENTIST, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
@@ -103,7 +103,7 @@ RustboroCity_EventScript_MatchCallTutorial:: @ 81E07BD
 	closemessage
 	applymovement LOCALID_SCIENTIST, RustboroCity_Movement_ScientistLeave
 	waitmovement 0
-	playse SE_KAIDAN
+	playse SE_EXIT
 	removeobject LOCALID_SCIENTIST
 	setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
 	setvar VAR_RUSTBORO_CITY_STATE, 7
@@ -294,7 +294,7 @@ RustboroCity_EventScript_StolenGoodsTrigger4:: @ 81E09B6
 RustboroCity_EventScript_StolenGoodsScene:: @ 81E09CD
 	msgbox RustboroCity_Text_OutOfTheWay, MSGBOX_DEFAULT
 	closemessage
-	playbgm MUS_AQA_0, 0
+	playbgm MUS_ENCOUNTER_AQUA, 0
 	addobject LOCALID_GRUNT
 	addobject LOCALID_DEVON_EMPLOYEE
 	applymovement LOCALID_GRUNT, RustboroCity_Movement_GruntEscape
@@ -706,11 +706,11 @@ RustboroCity_EventScript_PlayRivalMusic:: @ 81E0DD1
 	return
 
 RustboroCity_EventScript_PlayMayMusic:: @ 81E0DE9
-	playbgm MUS_GIRL_SUP, 1
+	playbgm MUS_ENCOUNTER_MAY, 1
 	return
 
 RustboroCity_EventScript_PlayBrendanMusic:: @ 81E0DEE
-	playbgm MUS_BOY_SUP, 1
+	playbgm MUS_ENCOUNTER_BRENDAN, 1
 	return
 
 RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3
@@ -856,7 +856,7 @@ RustboroCity_EventScript_MayEncounter:: @ 81E100B
 	msgbox RustboroCity_Text_MayHiLetsRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox RustboroCity_Text_RegisteredMay, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
@@ -927,7 +927,7 @@ RustboroCity_EventScript_BrendanEncounter:: @ 81E1114
 	msgbox RustboroCity_Text_BrendanHiLetsRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox RustboroCity_Text_RegisteredBrendan, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json
index cc19403ea..081799cd1 100644
--- a/data/maps/RustboroCity_CuttersHouse/map.json
+++ b/data/maps/RustboroCity_CuttersHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE",
   "name": "RustboroCity_CuttersHouse",
   "layout": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json
index 3cf7152c9..714f15506 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/map.json
+++ b/data/maps/RustboroCity_DevonCorp_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_DEVON_CORP_1F",
   "name": "RustboroCity_DevonCorp_1F",
   "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json
index 9bc987949..95a931e94 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/map.json
+++ b/data/maps/RustboroCity_DevonCorp_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_DEVON_CORP_2F",
   "name": "RustboroCity_DevonCorp_2F",
   "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
index e33fb2d0f..eb22fcc43 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
@@ -194,7 +194,7 @@ RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC:: @ 8211AB9
 
 RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare:: @ 8211AC4
 	bufferspeciesname 1, SPECIES_LILEEP
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher
 	waitmessage
 	waitfanfare
@@ -243,7 +243,7 @@ RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC:: @ 8211B5C
 
 RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare:: @ 8211B67
 	bufferspeciesname 1, SPECIES_ANORITH
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher
 	waitmessage
 	waitfanfare
diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json
index d92e4272e..a31a49dd3 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/map.json
+++ b/data/maps/RustboroCity_DevonCorp_3F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_DEVON_CORP_3F",
   "name": "RustboroCity_DevonCorp_3F",
   "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
index d24b4e902..34a31c692 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -39,7 +39,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
 	waitmovement 0
 	msgbox RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe, MSGBOX_DEFAULT
 	closemessage
-	playbgm MUS_TSURETEK, 0
+	playbgm MUS_FOLLOW_ME, 0
 	applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident
 	applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident
 	waitmovement 0
@@ -52,7 +52,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
 	msgbox RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor, MSGBOX_DEFAULT
 	giveitem ITEM_LETTER
 	msgbox RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis, MSGBOX_DEFAULT
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message RustboroCity_DevonCorp_3F_Text_ReceivedPokenav
 	waitfanfare
 	setflag FLAG_SYS_POKENAV_GET
diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json
index 31341e0b7..d4ddfb2f6 100644
--- a/data/maps/RustboroCity_Flat1_1F/map.json
+++ b/data/maps/RustboroCity_Flat1_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_FLAT1_1F",
   "name": "RustboroCity_Flat1_1F",
   "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_1F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json
index 454a0f1b5..3756411d7 100644
--- a/data/maps/RustboroCity_Flat1_2F/map.json
+++ b/data/maps/RustboroCity_Flat1_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_FLAT1_2F",
   "name": "RustboroCity_Flat1_2F",
   "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_2F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json
index 29494765c..5379567ff 100644
--- a/data/maps/RustboroCity_Flat2_1F/map.json
+++ b/data/maps/RustboroCity_Flat2_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_FLAT2_1F",
   "name": "RustboroCity_Flat2_1F",
   "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_1F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json
index 8f3e659cd..1ba0bbbba 100644
--- a/data/maps/RustboroCity_Flat2_2F/map.json
+++ b/data/maps/RustboroCity_Flat2_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_FLAT2_2F",
   "name": "RustboroCity_Flat2_2F",
   "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_2F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json
index 927ff6c34..da911f004 100644
--- a/data/maps/RustboroCity_Flat2_3F/map.json
+++ b/data/maps/RustboroCity_Flat2_3F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_FLAT2_3F",
   "name": "RustboroCity_Flat2_3F",
   "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_3F",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json
index e473c3e1b..36ae306ab 100644
--- a/data/maps/RustboroCity_Gym/map.json
+++ b/data/maps/RustboroCity_Gym/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_GYM",
   "name": "RustboroCity_Gym",
   "layout": "LAYOUT_RUSTBORO_CITY_GYM",
-  "music": "MUS_GIM",
+  "music": "MUS_GYM",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc
index ce6fdb127..6d9895fe5 100644
--- a/data/maps/RustboroCity_Gym/scripts.inc
+++ b/data/maps/RustboroCity_Gym/scripts.inc
@@ -96,7 +96,7 @@ RustboroCity_Gym_EventScript_RegisterRoxanne:: @ 821307B
 	pokenavcall RustboroCity_Gym_Text_RoxanneRegisterCall
 	waitmessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox RustboroCity_Gym_Text_RegisteredRoxanne, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json
index 85b4ee2b1..a57b1a693 100644
--- a/data/maps/RustboroCity_House1/map.json
+++ b/data/maps/RustboroCity_House1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_HOUSE1",
   "name": "RustboroCity_House1",
   "layout": "LAYOUT_RUSTBORO_CITY_HOUSE1",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json
index dd30ff71c..fdaed84fc 100644
--- a/data/maps/RustboroCity_House2/map.json
+++ b/data/maps/RustboroCity_House2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_HOUSE2",
   "name": "RustboroCity_House2",
   "layout": "LAYOUT_RUSTBORO_CITY_HOUSE",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json
index 3a757de8b..491550a2c 100644
--- a/data/maps/RustboroCity_House3/map.json
+++ b/data/maps/RustboroCity_House3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_HOUSE3",
   "name": "RustboroCity_House3",
   "layout": "LAYOUT_RUSTBORO_CITY_HOUSE",
-  "music": "MUS_GOTOWN",
+  "music": "MUS_RUSTBORO",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json
index 423fbb4e7..1a5b4549f 100644
--- a/data/maps/RustboroCity_Mart/map.json
+++ b/data/maps/RustboroCity_Mart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_MART",
   "name": "RustboroCity_Mart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json
index e6c332678..633626c4c 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/map.json
+++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F",
   "name": "RustboroCity_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json
index dbdaddfc6..912e4b263 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/map.json
+++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F",
   "name": "RustboroCity_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json
index af9b02d98..e299248a0 100644
--- a/data/maps/RustboroCity_PokemonSchool/map.json
+++ b/data/maps/RustboroCity_PokemonSchool/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL",
   "name": "RustboroCity_PokemonSchool",
   "layout": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL",
-  "music": "MUS_P_SCHOOL",
+  "music": "MUS_SCHOOL",
   "region_map_section": "MAPSEC_RUSTBORO_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json
index 0d6ae7d9b..d8531c879 100644
--- a/data/maps/RusturfTunnel/map.json
+++ b/data/maps/RusturfTunnel/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_RUSTURF_TUNNEL",
   "name": "RusturfTunnel",
   "layout": "LAYOUT_RUSTURF_TUNNEL",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_RUSTURF_TUNNEL",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index a342135bf..17a229ab5 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -316,7 +316,7 @@ RusturfTunnel_EventScript_Peeko:: @ 822D0AF
 RusturfTunnel_EventScript_Grunt:: @ 822D0C2
 	lock
 	faceplayer
-	playbgm MUS_AQA_0, 0
+	playbgm MUS_ENCOUNTER_AQUA, 0
 	msgbox RusturfTunnel_Text_GruntIntro, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_GruntDefeat
 	msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT
diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json
index dc65b2443..7356e1fe0 100644
--- a/data/maps/SSTidalCorridor/map.json
+++ b/data/maps/SSTidalCorridor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SS_TIDAL_CORRIDOR",
   "name": "SSTidalCorridor",
   "layout": "LAYOUT_SS_TIDAL_CORRIDOR",
-  "music": "MUS_M_BOAT",
+  "music": "MUS_SAILING",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index a055c6548..b6fa7428e 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -17,7 +17,7 @@ SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF
 	special SetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
 	lockall
-	playse SE_PINPON
+	playse SE_DING_DONG
 	msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -25,7 +25,7 @@ SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF
 SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_LILYCOVE
 	lockall
-	playse SE_PINPON
+	playse SE_DING_DONG
 	msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -33,14 +33,14 @@ SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015
 SSTidalRooms_EventScript_HalfwayToSlateport:: @ 823C028
 	special SetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
-	playse SE_PINPON
+	playse SE_DING_DONG
 	msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	return
 
 SSTidalRooms_EventScript_ArrivedInLilycove:: @ 823C03C
 	special ResetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
-	playse SE_PINPON
+	playse SE_DING_DONG
 	msgbox SSTidal_Text_MadeLandInLilycove, MSGBOX_DEFAULT
 	return
 
@@ -55,7 +55,7 @@ SSTidalCorridor_EventScript_HalfwayToLilycove:: @ 823C067
 	special ResetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_LILYCOVE
 	lockall
-	playse SE_PINPON
+	playse SE_DING_DONG
 	msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -64,7 +64,7 @@ SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D
 	special ResetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
 	lockall
-	playse SE_PINPON
+	playse SE_DING_DONG
 	msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -72,7 +72,7 @@ SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D
 SSTidalRooms_EventScript_ArrivedInSlateport:: @ 823C093
 	special ResetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
-	playse SE_PINPON
+	playse SE_DING_DONG
 	msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT
 	return
 
@@ -204,7 +204,7 @@ SSTidalCorridor_EventScript_ScottScene:: @ 823C219
 	applymovement LOCALID_SAILOR, SSTidalCorridor_Movement_SailorMoveForScott
 	applymovement LOCALID_SCOTT, SSTidalCorridor_Movement_ScottExit
 	waitmovement 0
-	playse SE_KAIDAN
+	playse SE_EXIT
 	waitse
 	removeobject LOCALID_SCOTT
 	applymovement LOCALID_SAILOR, SSTidalCorridor_Movement_SailorReturn
diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json
index 25a24c1b9..79331001a 100644
--- a/data/maps/SSTidalLowerDeck/map.json
+++ b/data/maps/SSTidalLowerDeck/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SS_TIDAL_LOWER_DECK",
   "name": "SSTidalLowerDeck",
   "layout": "LAYOUT_SS_TIDAL_LOWER_DECK",
-  "music": "MUS_M_BOAT",
+  "music": "MUS_SAILING",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json
index 32fe40245..fd65d5ce2 100644
--- a/data/maps/SSTidalRooms/map.json
+++ b/data/maps/SSTidalRooms/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SS_TIDAL_ROOMS",
   "name": "SSTidalRooms",
   "layout": "LAYOUT_SS_TIDAL_ROOMS",
-  "music": "MUS_M_BOAT",
+  "music": "MUS_SAILING",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json
index baccf0465..2419587d8 100644
--- a/data/maps/SafariZone_North/map.json
+++ b/data/maps/SafariZone_North/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SAFARI_ZONE_NORTH",
   "name": "SafariZone_North",
   "layout": "LAYOUT_SAFARI_ZONE_NORTH",
-  "music": "MUS_SAFARI",
+  "music": "MUS_SAFARI_ZONE",
   "region_map_section": "MAPSEC_SAFARI_ZONE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json
index 7855417f1..910403107 100644
--- a/data/maps/SafariZone_Northeast/map.json
+++ b/data/maps/SafariZone_Northeast/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SAFARI_ZONE_NORTHEAST",
   "name": "SafariZone_Northeast",
   "layout": "LAYOUT_SAFARI_ZONE_NORTHEAST",
-  "music": "MUS_SAFARI",
+  "music": "MUS_SAFARI_ZONE",
   "region_map_section": "MAPSEC_SAFARI_ZONE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json
index 3974f00de..1e27def2c 100644
--- a/data/maps/SafariZone_Northwest/map.json
+++ b/data/maps/SafariZone_Northwest/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SAFARI_ZONE_NORTHWEST",
   "name": "SafariZone_Northwest",
   "layout": "LAYOUT_SAFARI_ZONE_NORTHWEST",
-  "music": "MUS_SAFARI",
+  "music": "MUS_SAFARI_ZONE",
   "region_map_section": "MAPSEC_SAFARI_ZONE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json
index cae90c79d..e03b024ae 100644
--- a/data/maps/SafariZone_RestHouse/map.json
+++ b/data/maps/SafariZone_RestHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SAFARI_ZONE_REST_HOUSE",
   "name": "SafariZone_RestHouse",
   "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE",
-  "music": "MUS_SAFARI",
+  "music": "MUS_SAFARI_ZONE",
   "region_map_section": "MAPSEC_SAFARI_ZONE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json
index 78ab47f72..562b85b9e 100644
--- a/data/maps/SafariZone_South/map.json
+++ b/data/maps/SafariZone_South/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SAFARI_ZONE_SOUTH",
   "name": "SafariZone_South",
   "layout": "LAYOUT_SAFARI_ZONE_SOUTH",
-  "music": "MUS_SAFARI",
+  "music": "MUS_SAFARI_ZONE",
   "region_map_section": "MAPSEC_SAFARI_ZONE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json
index 174014f3e..723e874cc 100644
--- a/data/maps/SafariZone_Southeast/map.json
+++ b/data/maps/SafariZone_Southeast/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SAFARI_ZONE_SOUTHEAST",
   "name": "SafariZone_Southeast",
   "layout": "LAYOUT_SAFARI_ZONE_SOUTHEAST",
-  "music": "MUS_SAFARI",
+  "music": "MUS_SAFARI_ZONE",
   "region_map_section": "MAPSEC_SAFARI_ZONE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json
index 95017668e..42faf1f50 100644
--- a/data/maps/SafariZone_Southwest/map.json
+++ b/data/maps/SafariZone_Southwest/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SAFARI_ZONE_SOUTHWEST",
   "name": "SafariZone_Southwest",
   "layout": "LAYOUT_SAFARI_ZONE_SOUTHWEST",
-  "music": "MUS_SAFARI",
+  "music": "MUS_SAFARI_ZONE",
   "region_map_section": "MAPSEC_SAFARI_ZONE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json
index 86e06c268..e90f1f5c1 100644
--- a/data/maps/ScorchedSlab/map.json
+++ b/data/maps/ScorchedSlab/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SCORCHED_SLAB",
   "name": "ScorchedSlab",
   "layout": "LAYOUT_SCORCHED_SLAB",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_SCORCHED_SLAB",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json
index bc79a5f01..a80fce6c1 100644
--- a/data/maps/SeafloorCavern_Entrance/map.json
+++ b/data/maps/SeafloorCavern_Entrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SEAFLOOR_CAVERN_ENTRANCE",
   "name": "SeafloorCavern_Entrance",
   "layout": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json
index 0e6bd1bad..2caa79414 100644
--- a/data/maps/SeafloorCavern_Room1/map.json
+++ b/data/maps/SeafloorCavern_Room1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SEAFLOOR_CAVERN_ROOM1",
   "name": "SeafloorCavern_Room1",
   "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM1",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json
index 1391cc395..bfdd30499 100644
--- a/data/maps/SeafloorCavern_Room2/map.json
+++ b/data/maps/SeafloorCavern_Room2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SEAFLOOR_CAVERN_ROOM2",
   "name": "SeafloorCavern_Room2",
   "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM2",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json
index e40bcbcf5..478e108be 100644
--- a/data/maps/SeafloorCavern_Room3/map.json
+++ b/data/maps/SeafloorCavern_Room3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SEAFLOOR_CAVERN_ROOM3",
   "name": "SeafloorCavern_Room3",
   "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM3",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json
index 80de38537..9ea3528a3 100644
--- a/data/maps/SeafloorCavern_Room4/map.json
+++ b/data/maps/SeafloorCavern_Room4/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SEAFLOOR_CAVERN_ROOM4",
   "name": "SeafloorCavern_Room4",
   "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM4",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json
index 9d6ca9e6a..415e2a718 100644
--- a/data/maps/SeafloorCavern_Room5/map.json
+++ b/data/maps/SeafloorCavern_Room5/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SEAFLOOR_CAVERN_ROOM5",
   "name": "SeafloorCavern_Room5",
   "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM5",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json
index eb4c7f9d9..598f4a042 100644
--- a/data/maps/SeafloorCavern_Room6/map.json
+++ b/data/maps/SeafloorCavern_Room6/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SEAFLOOR_CAVERN_ROOM6",
   "name": "SeafloorCavern_Room6",
   "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM6",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json
index 0f135d36a..243a1f9d1 100644
--- a/data/maps/SeafloorCavern_Room7/map.json
+++ b/data/maps/SeafloorCavern_Room7/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SEAFLOOR_CAVERN_ROOM7",
   "name": "SeafloorCavern_Room7",
   "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM7",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json
index 90cd3ae7a..7c5d5c820 100644
--- a/data/maps/SeafloorCavern_Room8/map.json
+++ b/data/maps/SeafloorCavern_Room8/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SEAFLOOR_CAVERN_ROOM8",
   "name": "SeafloorCavern_Room8",
   "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM8",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json
index cd5263488..94ef88e84 100644
--- a/data/maps/SeafloorCavern_Room9/map.json
+++ b/data/maps/SeafloorCavern_Room9/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SEAFLOOR_CAVERN_ROOM9",
   "name": "SeafloorCavern_Room9",
   "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM9",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SEAFLOOR_CAVERN",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index 667251936..63c5853c3 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -18,7 +18,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, SeafloorCavern_Room9_Movement_Delay32
 	waitmovement 0
-	playbgm MUS_AQA_0, 0
+	playbgm MUS_ENCOUNTER_AQUA, 0
 	msgbox SeafloorCavern_Room9_Text_ArchieHoldItRightThere, MSGBOX_DEFAULT
 	closemessage
 	addobject VAR_0x8004
@@ -43,13 +43,13 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9
 	special WaitWeather
 	waitstate
 	setvar VAR_RESULT, 1
-	playse SE_W197
+	playse SE_M_DETECT
 	dofieldeffectsparkle 16, 42, 0
 	waitfieldeffect FLDEFF_SPARKLE
 	closemessage
 	setvar VAR_RESULT, 0
-	playfanfare MUS_ME_TAMA
-	playse SE_TAMA
+	playfanfare MUS_AWAKEN_LEGEND
+	playse SE_ORB
 	special DoOrbEffect
 	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json
index febf5defa..1f8e741d8 100644
--- a/data/maps/SealedChamber_InnerRoom/map.json
+++ b/data/maps/SealedChamber_InnerRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SEALED_CHAMBER_INNER_ROOM",
   "name": "SealedChamber_InnerRoom",
   "layout": "LAYOUT_SEALED_CHAMBER_INNER_ROOM",
-  "music": "MUS_MABOROSI",
+  "music": "MUS_SEALED_CHAMBER",
   "region_map_section": "MAPSEC_SEALED_CHAMBER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc
index 15c98e57e..c31bb7efc 100644
--- a/data/maps/SealedChamber_InnerRoom/scripts.inc
+++ b/data/maps/SealedChamber_InnerRoom/scripts.inc
@@ -11,7 +11,7 @@ SealedChamber_InnerRoom_EventScript_BrailleBackWall:: @ 82391F8
 	compare VAR_RESULT, FALSE
 	goto_if_eq SealedChamber_InnerRoom_EventScript_NoEffect
 	fadeoutbgm 0
-	playse SE_TRACK_MOVE
+	playse SE_TRUCK_MOVE
 	special DoSealedChamberShakingEffect1
 	waitstate
 	delay 40
diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json
index 88694940b..e16350d7e 100644
--- a/data/maps/SealedChamber_OuterRoom/map.json
+++ b/data/maps/SealedChamber_OuterRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SEALED_CHAMBER_OUTER_ROOM",
   "name": "SealedChamber_OuterRoom",
   "layout": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM",
-  "music": "MUS_MABOROSI",
+  "music": "MUS_SEALED_CHAMBER",
   "region_map_section": "MAPSEC_SEALED_CHAMBER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json
index 8690a8aad..3fb6157cc 100644
--- a/data/maps/SecretBase_BlueCave1/map.json
+++ b/data/maps/SecretBase_BlueCave1/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_BlueCave1",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json
index feee5c585..ca15e39f1 100644
--- a/data/maps/SecretBase_BlueCave2/map.json
+++ b/data/maps/SecretBase_BlueCave2/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_BlueCave2",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json
index c26af7cba..356b4894d 100644
--- a/data/maps/SecretBase_BlueCave3/map.json
+++ b/data/maps/SecretBase_BlueCave3/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_BlueCave3",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json
index 3dc34e188..078bada8e 100644
--- a/data/maps/SecretBase_BlueCave4/map.json
+++ b/data/maps/SecretBase_BlueCave4/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_BlueCave4",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json
index 0671d40a3..6f2dc92f2 100644
--- a/data/maps/SecretBase_BrownCave1/map.json
+++ b/data/maps/SecretBase_BrownCave1/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_BrownCave1",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json
index 5fc3df0e5..11559c12f 100644
--- a/data/maps/SecretBase_BrownCave2/map.json
+++ b/data/maps/SecretBase_BrownCave2/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_BrownCave2",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json
index 29a27ad39..c2dbb7fc4 100644
--- a/data/maps/SecretBase_BrownCave3/map.json
+++ b/data/maps/SecretBase_BrownCave3/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_BrownCave3",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json
index 05d9fff3e..e7147ae85 100644
--- a/data/maps/SecretBase_BrownCave4/map.json
+++ b/data/maps/SecretBase_BrownCave4/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_BrownCave4",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json
index 8a3be38be..fd264fc6c 100644
--- a/data/maps/SecretBase_RedCave1/map.json
+++ b/data/maps/SecretBase_RedCave1/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_RedCave1",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_RED_CAVE1",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json
index 71c64bb77..b60b3bbff 100644
--- a/data/maps/SecretBase_RedCave2/map.json
+++ b/data/maps/SecretBase_RedCave2/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_RedCave2",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_RED_CAVE2",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json
index e30c50b46..079837a62 100644
--- a/data/maps/SecretBase_RedCave3/map.json
+++ b/data/maps/SecretBase_RedCave3/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_RedCave3",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_RED_CAVE3",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json
index d1abb1a74..10fbbfeb0 100644
--- a/data/maps/SecretBase_RedCave4/map.json
+++ b/data/maps/SecretBase_RedCave4/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_RedCave4",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_RED_CAVE4",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json
index 5dba2b143..e0d1015cb 100644
--- a/data/maps/SecretBase_Shrub1/map.json
+++ b/data/maps/SecretBase_Shrub1/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_Shrub1",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_SHRUB1",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json
index cdd5b1e00..879b7464e 100644
--- a/data/maps/SecretBase_Shrub2/map.json
+++ b/data/maps/SecretBase_Shrub2/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_Shrub2",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_SHRUB2",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json
index cbdb08664..6751a7414 100644
--- a/data/maps/SecretBase_Shrub3/map.json
+++ b/data/maps/SecretBase_Shrub3/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_Shrub3",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_SHRUB3",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json
index 3a7caee6b..c193b8348 100644
--- a/data/maps/SecretBase_Shrub4/map.json
+++ b/data/maps/SecretBase_Shrub4/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_Shrub4",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_SHRUB4",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json
index f9430cf0d..cd0cad5f0 100644
--- a/data/maps/SecretBase_Tree1/map.json
+++ b/data/maps/SecretBase_Tree1/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_Tree1",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_TREE1",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json
index 79b1928b1..1ac393a15 100644
--- a/data/maps/SecretBase_Tree2/map.json
+++ b/data/maps/SecretBase_Tree2/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_Tree2",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_TREE2",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json
index 9454cea0b..b7eec2244 100644
--- a/data/maps/SecretBase_Tree3/map.json
+++ b/data/maps/SecretBase_Tree3/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_Tree3",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_TREE3",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json
index 8f9b0ebf7..0e068ec94 100644
--- a/data/maps/SecretBase_Tree4/map.json
+++ b/data/maps/SecretBase_Tree4/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_Tree4",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_TREE4",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json
index 2bdf097c9..1d873bfe2 100644
--- a/data/maps/SecretBase_YellowCave1/map.json
+++ b/data/maps/SecretBase_YellowCave1/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_YellowCave1",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json
index 79d4e6950..af2e957bc 100644
--- a/data/maps/SecretBase_YellowCave2/map.json
+++ b/data/maps/SecretBase_YellowCave2/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_YellowCave2",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json
index 29ea865ca..d78aa2862 100644
--- a/data/maps/SecretBase_YellowCave3/map.json
+++ b/data/maps/SecretBase_YellowCave3/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_YellowCave3",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json
index df2db85bd..0ca4bc4d3 100644
--- a/data/maps/SecretBase_YellowCave4/map.json
+++ b/data/maps/SecretBase_YellowCave4/map.json
@@ -3,7 +3,7 @@
   "name": "SecretBase_YellowCave4",
   "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4",
-  "music": "MUS_MACHI_S3",
+  "music": "MUS_FORTREE",
   "region_map_section": "MAPSEC_SECRET_BASE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json
index 8dec3b1e2..9d3c5156b 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM",
   "name": "ShoalCave_HighTideEntranceRoom",
   "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_SHOAL_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json
index 280397a93..2f183d3ae 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/map.json
+++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM",
   "name": "ShoalCave_HighTideInnerRoom",
   "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_SHOAL_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json
index c357ad5d7..ba71e1085 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
   "name": "ShoalCave_LowTideEntranceRoom",
   "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_SHOAL_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json
index d8ecab059..ea4f0cedf 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/map.json
+++ b/data/maps/ShoalCave_LowTideIceRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM",
   "name": "ShoalCave_LowTideIceRoom",
   "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_SHOAL_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json
index 1d0f44e0e..bf172e8b4 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/map.json
+++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
   "name": "ShoalCave_LowTideInnerRoom",
   "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_SHOAL_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json
index 40adf38cc..719841ec0 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/map.json
+++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
   "name": "ShoalCave_LowTideLowerRoom",
   "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_SHOAL_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json
index a2ea91b5b..4207c9584 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/map.json
+++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM",
   "name": "ShoalCave_LowTideStairsRoom",
   "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM",
-  "music": "MUS_M_DUNGON",
+  "music": "MUS_MT_PYRE",
   "region_map_section": "MAPSEC_SHOAL_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json
index 17528b619..6ce499be2 100644
--- a/data/maps/SkyPillar_1F/map.json
+++ b/data/maps/SkyPillar_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SKY_PILLAR_1F",
   "name": "SkyPillar_1F",
   "layout": "LAYOUT_SKY_PILLAR_1F",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SKY_PILLAR",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json
index 1430f9dc7..7b534c2f7 100644
--- a/data/maps/SkyPillar_2F/map.json
+++ b/data/maps/SkyPillar_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SKY_PILLAR_2F",
   "name": "SkyPillar_2F",
   "layout": "LAYOUT_SKY_PILLAR_2F",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SKY_PILLAR",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json
index ddec299b5..c05324f10 100644
--- a/data/maps/SkyPillar_3F/map.json
+++ b/data/maps/SkyPillar_3F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SKY_PILLAR_3F",
   "name": "SkyPillar_3F",
   "layout": "LAYOUT_SKY_PILLAR_3F",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SKY_PILLAR",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json
index 9c12a2071..7b5ad062e 100644
--- a/data/maps/SkyPillar_4F/map.json
+++ b/data/maps/SkyPillar_4F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SKY_PILLAR_4F",
   "name": "SkyPillar_4F",
   "layout": "LAYOUT_SKY_PILLAR_4F",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SKY_PILLAR",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json
index 2638cb92c..5be104fb0 100644
--- a/data/maps/SkyPillar_5F/map.json
+++ b/data/maps/SkyPillar_5F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SKY_PILLAR_5F",
   "name": "SkyPillar_5F",
   "layout": "LAYOUT_SKY_PILLAR_5F",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SKY_PILLAR",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json
index 709f0af8d..c880da6ea 100644
--- a/data/maps/SkyPillar_Entrance/map.json
+++ b/data/maps/SkyPillar_Entrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SKY_PILLAR_ENTRANCE",
   "name": "SkyPillar_Entrance",
   "layout": "LAYOUT_SKY_PILLAR_ENTRANCE",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SKY_PILLAR",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json
index 35721fd41..b0d4e198b 100644
--- a/data/maps/SkyPillar_Outside/map.json
+++ b/data/maps/SkyPillar_Outside/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SKY_PILLAR_OUTSIDE",
   "name": "SkyPillar_Outside",
   "layout": "LAYOUT_SKY_PILLAR_OUTSIDE",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SKY_PILLAR",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc
index 60a1702ab..2e0495bca 100644
--- a/data/maps/SkyPillar_Outside/scripts.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
@@ -81,7 +81,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
 	delay 30
 	msgbox SkyPillar_Outside_Text_GotToGoBackForSootopolis, MSGBOX_DEFAULT
 	closemessage
-	playse SE_KAIDAN
+	playse SE_EXIT
 	fadescreenswapbuffers FADE_TO_BLACK
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_SOOTOPOLIS_CITY_STATE, 4
diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json
index 8da3ca525..90301c53b 100644
--- a/data/maps/SkyPillar_Top/map.json
+++ b/data/maps/SkyPillar_Top/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SKY_PILLAR_TOP",
   "name": "SkyPillar_Top",
   "layout": "LAYOUT_SKY_PILLAR_TOP",
-  "music": "MUS_TOZAN",
+  "music": "MUS_MT_CHIMNEY",
   "region_map_section": "MAPSEC_SKY_PILLAR",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json
index 40ebfbc11..6ffed4b45 100644
--- a/data/maps/SlateportCity/map.json
+++ b/data/maps/SlateportCity/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY",
   "name": "SlateportCity",
   "layout": "LAYOUT_SLATEPORT_CITY",
-  "music": "MUS_FINECITY",
+  "music": "MUS_SLATEPORT",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index 055e13565..983ce9796 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -91,7 +91,7 @@ SlateportCity_EventScript_ScottScene:: @ 81DCD1C
 	msgbox SlateportCity_Text_LetsRegisterEachOther, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox SlateportCity_Text_RegisteredScott, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
@@ -170,7 +170,7 @@ SlateportCity_EventScript_EffortRibbonWoman:: @ 81DCDE4
 	compare VAR_RESULT, FALSE
 	call_if_eq SlateportCity_EventScript_MonEVsNotMaxed
 	msgbox SlateportCity_Text_PleaseGiveItThisEffortRibbon, MSGBOX_DEFAULT
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message SlateportCity_Text_ReceivedEffortRibbon
 	waitfanfare
 	msgbox SlateportCity_Text_PutEffortRibbonOnMon, MSGBOX_DEFAULT
@@ -603,7 +603,7 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8
 	applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox SlateportCity_Text_OhPlayerWeMadeDiscovery, MSGBOX_DEFAULT
-	playbgm MUS_AQA_0, 0
+	playbgm MUS_ENCOUNTER_AQUA, 0
 	msgbox SlateportCity_Text_AquaWillAssumeControlOfSubmarine, MSGBOX_DEFAULT
 	applymovement LOCALID_COOK, Common_Movement_WalkInPlaceFastestLeft
 	applymovement LOCALID_FAT_MAN, Common_Movement_WalkInPlaceFastestLeft
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json
index 4bc1ea9f1..27cce84b4 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/map.json
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM",
   "name": "SlateportCity_BattleTentBattleRoom",
   "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json
index e285ccdb1..c9cd4b1a7 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/map.json
+++ b/data/maps/SlateportCity_BattleTentCorridor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR",
   "name": "SlateportCity_BattleTentCorridor",
   "layout": "LAYOUT_BATTLE_TENT_CORRIDOR",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
index 85a95ded8..c018f54b9 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
@@ -60,7 +60,7 @@ SlateportCity_BattleTentCorridor_EventScript_ReturnToRoomFromBattle:: @ 8208EEE
 	factory_setopponentmons
 	factory_resethelditems
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent:: @ 8208F0D
diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json
index e2c439591..efd03e1e2 100644
--- a/data/maps/SlateportCity_BattleTentLobby/map.json
+++ b/data/maps/SlateportCity_BattleTentLobby/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY",
   "name": "SlateportCity_BattleTentLobby",
   "layout": "LAYOUT_BATTLE_TENT_LOBBY",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
index 20f3c3e07..bdc8eb05f 100644
--- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
@@ -53,7 +53,7 @@ SlateportCity_BattleTentLobby_EventScript_GivePrize:: @ 82087E9
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	message BattleFrontier_BattleTowerLobby_Text_ReceivedPrize  @ Odd that it uses Tower's instead of Factory's or its own
 	waitmessage
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	waitfanfare
 	goto SlateportCity_BattleTentLobby_EventScript_EndGivePrize
 
diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json
index 19bb83a06..17d3c8940 100644
--- a/data/maps/SlateportCity_Harbor/map.json
+++ b/data/maps/SlateportCity_Harbor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_HARBOR",
   "name": "SlateportCity_Harbor",
   "layout": "LAYOUT_HARBOR",
-  "music": "MUS_FINECITY",
+  "music": "MUS_SLATEPORT",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
index 5d8dad1db..644911ea6 100644
--- a/data/maps/SlateportCity_Harbor/scripts.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -21,7 +21,7 @@ SlateportCity_Harbor_EventScript_ShowSSTidal:: @ 820C9A5
 	return
 
 SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene:: @ 820C9A9
-	savebgm MUS_AQA_0
+	savebgm MUS_ENCOUNTER_AQUA
 	setobjectxyperm LOCALID_CAPT_STERN, 12, 13
 	setobjectmovementtype LOCALID_CAPT_STERN, MOVEMENT_TYPE_FACE_LEFT
 	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
diff --git a/data/maps/SlateportCity_House/map.json b/data/maps/SlateportCity_House/map.json
index d1bdfa1e3..5ccc92566 100644
--- a/data/maps/SlateportCity_House/map.json
+++ b/data/maps/SlateportCity_House/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_HOUSE",
   "name": "SlateportCity_House",
   "layout": "LAYOUT_HOUSE2",
-  "music": "MUS_FINECITY",
+  "music": "MUS_SLATEPORT",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json
index 8c5924ce8..45d322555 100644
--- a/data/maps/SlateportCity_Mart/map.json
+++ b/data/maps/SlateportCity_Mart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_MART",
   "name": "SlateportCity_Mart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_NameRatersHouse/map.json b/data/maps/SlateportCity_NameRatersHouse/map.json
index a1728f78a..c0a94fd69 100644
--- a/data/maps/SlateportCity_NameRatersHouse/map.json
+++ b/data/maps/SlateportCity_NameRatersHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE",
   "name": "SlateportCity_NameRatersHouse",
   "layout": "LAYOUT_HOUSE_WITH_BED",
-  "music": "MUS_FINECITY",
+  "music": "MUS_SLATEPORT",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json
index 00b2e8912..7748f5438 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F",
   "name": "SlateportCity_OceanicMuseum_1F",
   "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F",
-  "music": "MUS_FUNE_KAN",
+  "music": "MUS_OCEANIC_MUSEUM",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
index 8af4af40c..90c9b93b7 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
@@ -37,7 +37,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8
 	checkmoney 50, 0
 	compare VAR_RESULT, FALSE
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney
-	playse SE_REGI
+	playse SE_SHOP
 	removemoney 50, 0
 	updatemoneybox 0, 0
 	msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT
@@ -191,7 +191,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: @ 820AF93
 
 SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited:: @ 820AFAA
 	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT
-	playse SE_KAIDAN
+	playse SE_EXIT
 	removeobject LOCALID_FAMILIAR_GRUNT
 	release
 	end
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json
index af23dffef..7b78802e3 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F",
   "name": "SlateportCity_OceanicMuseum_2F",
   "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F",
-  "music": "MUS_FUNE_KAN",
+  "music": "MUS_OCEANIC_MUSEUM",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 8efd464c4..bba75dbd1 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -11,7 +11,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
 	faceplayer
 	msgbox SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts, MSGBOX_DEFAULT
 	closemessage
-	playbgm MUS_AQA_0, 1
+	playbgm MUS_ENCOUNTER_AQUA, 1
 	addobject LOCALID_GRUNT_1
 	applymovement LOCALID_GRUNT_1, SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter
 	waitmovement 0
@@ -81,7 +81,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
 	msgbox SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo, MSGBOX_DEFAULT
 	closemessage
 	fadescreen FADE_TO_BLACK
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 	removeobject LOCALID_CAPT_STERN
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json
index fe730efd7..91132909a 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/map.json
+++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F",
   "name": "SlateportCity_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json
index d2204dabc..74b5ee63c 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/map.json
+++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F",
   "name": "SlateportCity_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json
index ae27c318b..b1e4b0f8b 100644
--- a/data/maps/SlateportCity_PokemonFanClub/map.json
+++ b/data/maps/SlateportCity_PokemonFanClub/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB",
   "name": "SlateportCity_PokemonFanClub",
   "layout": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB",
-  "music": "MUS_FINECITY",
+  "music": "MUS_SLATEPORT",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json
index 45e5f5734..66cdd6a1d 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/map.json
+++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F",
   "name": "SlateportCity_SternsShipyard_1F",
   "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F",
-  "music": "MUS_FINECITY",
+  "music": "MUS_SLATEPORT",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json
index 452c3f47a..1b89b2bfa 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/map.json
+++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F",
   "name": "SlateportCity_SternsShipyard_2F",
   "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F",
-  "music": "MUS_FINECITY",
+  "music": "MUS_SLATEPORT",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json
index 41e5cf61a..d4c71db61 100644
--- a/data/maps/SootopolisCity/map.json
+++ b/data/maps/SootopolisCity/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY",
   "name": "SootopolisCity",
   "layout": "LAYOUT_SOOTOPOLIS_CITY",
-  "music": "MUS_RUNECITY",
+  "music": "MUS_SOOTOPOLIS",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index 2979f104d..6ef9c3d57 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -531,7 +531,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
 	setvar VAR_0x8004, 1
 	special Script_DoRayquazaScene
 	waitstate
-	playse SE_T_KAMI
+	playse SE_THUNDER
 	special SpawnCameraObject
 	applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanUp
 	waitmovement 0
@@ -562,7 +562,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
 	clearflag FLAG_SYS_WEATHER_CTRL
 	setvar VAR_SKY_PILLAR_STATE, 3
 	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
-	fadenewbgm MUS_RUNECITY
+	fadenewbgm MUS_SOOTOPOLIS
 	delay 120
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 43, 32
@@ -615,7 +615,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
 	clearflag FLAG_SYS_WEATHER_CTRL
 	setvar VAR_SKY_PILLAR_STATE, 2
 	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
-	fadenewbgm MUS_NAMINORI
+	fadenewbgm MUS_SURF
 	delay 120
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	warpsootopolislegend MAP_SOOTOPOLIS_CITY, 255, 29, 53
diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json
index 72d7c2d2b..46baea29d 100644
--- a/data/maps/SootopolisCity_Gym_1F/map.json
+++ b/data/maps/SootopolisCity_Gym_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_GYM_1F",
   "name": "SootopolisCity_Gym_1F",
   "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F",
-  "music": "MUS_GIM",
+  "music": "MUS_GYM",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc
index 66588ba08..ae5bfd108 100644
--- a/data/maps/SootopolisCity_Gym_1F/scripts.inc
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
@@ -46,7 +46,7 @@ SootopolisCity_Gym_1F_OnFrame: @ 8224ECB
 SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 8224EED
 	addvar VAR_ICE_STEP_COUNT, 1
 	delay 40
-	playse SE_RU_GASHIN
+	playse SE_ICE_STAIRS
 	call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles
 	special DrawWholeMapView
 	end
@@ -54,7 +54,7 @@ SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 8224EED
 SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 8224F01
 	addvar VAR_ICE_STEP_COUNT, 1
 	delay 40
-	playse SE_RU_GASHIN
+	playse SE_ICE_STAIRS
 	call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles
 	special DrawWholeMapView
 	end
@@ -62,7 +62,7 @@ SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 8224F01
 SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: @ 8224F15
 	addvar VAR_ICE_STEP_COUNT, 1
 	delay 40
-	playse SE_RU_GASHIN
+	playse SE_ICE_STAIRS
 	call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles
 	special DrawWholeMapView
 	end
@@ -72,7 +72,7 @@ SootopolisCity_Gym_1F_EventScript_FallThroughIce:: @ 8224F29
 	delay 20
 	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce
 	waitmovement 0
-	playse SE_RU_HYUU
+	playse SE_FALL
 	delay 60
 	warphole MAP_SOOTOPOLIS_CITY_GYM_B1F
 	waitstate
@@ -110,7 +110,7 @@ SootopolisCity_Gym_1F_EventScript_JuanDefeated:: @ 8224F82
 	call SootopolisCity_Gym_1F_EventScript_GiveWaterPulse
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox SootopolisCity_Gym_1F_Text_RegisteredJuan, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json
index 5706139f2..3badb1c52 100644
--- a/data/maps/SootopolisCity_Gym_B1F/map.json
+++ b/data/maps/SootopolisCity_Gym_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_GYM_B1F",
   "name": "SootopolisCity_Gym_B1F",
   "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F",
-  "music": "MUS_GIM",
+  "music": "MUS_GYM",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json
index 9db373ced..26c47c432 100644
--- a/data/maps/SootopolisCity_House1/map.json
+++ b/data/maps/SootopolisCity_House1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_HOUSE1",
   "name": "SootopolisCity_House1",
   "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1",
-  "music": "MUS_RUNECITY",
+  "music": "MUS_SOOTOPOLIS",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json
index 6ffeb11f8..3fe0baf48 100644
--- a/data/maps/SootopolisCity_House2/map.json
+++ b/data/maps/SootopolisCity_House2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_HOUSE2",
   "name": "SootopolisCity_House2",
   "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2",
-  "music": "MUS_RUNECITY",
+  "music": "MUS_SOOTOPOLIS",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json
index d6cb1f09b..00d82637e 100644
--- a/data/maps/SootopolisCity_House3/map.json
+++ b/data/maps/SootopolisCity_House3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_HOUSE3",
   "name": "SootopolisCity_House3",
   "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3",
-  "music": "MUS_RUNECITY",
+  "music": "MUS_SOOTOPOLIS",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json
index 7ff8d9182..e811785d0 100644
--- a/data/maps/SootopolisCity_House4/map.json
+++ b/data/maps/SootopolisCity_House4/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_HOUSE4",
   "name": "SootopolisCity_House4",
   "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1",
-  "music": "MUS_RUNECITY",
+  "music": "MUS_SOOTOPOLIS",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json
index 2a335e4bb..6b25c5af6 100644
--- a/data/maps/SootopolisCity_House5/map.json
+++ b/data/maps/SootopolisCity_House5/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_HOUSE5",
   "name": "SootopolisCity_House5",
   "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2",
-  "music": "MUS_RUNECITY",
+  "music": "MUS_SOOTOPOLIS",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json
index e6b37ca19..365503e8f 100644
--- a/data/maps/SootopolisCity_House6/map.json
+++ b/data/maps/SootopolisCity_House6/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_HOUSE6",
   "name": "SootopolisCity_House6",
   "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3",
-  "music": "MUS_RUNECITY",
+  "music": "MUS_SOOTOPOLIS",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json
index 5f66d082a..47d98c914 100644
--- a/data/maps/SootopolisCity_House7/map.json
+++ b/data/maps/SootopolisCity_House7/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_HOUSE7",
   "name": "SootopolisCity_House7",
   "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1",
-  "music": "MUS_RUNECITY",
+  "music": "MUS_SOOTOPOLIS",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json
index d02aec2bb..143fdf9f2 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE",
   "name": "SootopolisCity_LotadAndSeedotHouse",
   "layout": "LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE",
-  "music": "MUS_RUNECITY",
+  "music": "MUS_SOOTOPOLIS",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json
index e7433e717..55686a14f 100644
--- a/data/maps/SootopolisCity_Mart/map.json
+++ b/data/maps/SootopolisCity_Mart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_MART",
   "name": "SootopolisCity_Mart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json
index 9ccd91d9b..a7fa18760 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F",
   "name": "SootopolisCity_MysteryEventsHouse_1F",
   "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F",
-  "music": "MUS_RUNECITY",
+  "music": "MUS_SOOTOPOLIS",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json
index 3911f3e2b..82885ebcc 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F",
   "name": "SootopolisCity_MysteryEventsHouse_B1F",
   "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F",
-  "music": "MUS_RUNECITY",
+  "music": "MUS_SOOTOPOLIS",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json
index 2330f08ea..8dac70dea 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F",
   "name": "SootopolisCity_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json
index ca779dd4b..fd85b236b 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F",
   "name": "SootopolisCity_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_SOOTOPOLIS_CITY",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json
index 67ee0fd3c..8fe4bcf29 100644
--- a/data/maps/SouthernIsland_Exterior/map.json
+++ b/data/maps/SouthernIsland_Exterior/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOUTHERN_ISLAND_EXTERIOR",
   "name": "SouthernIsland_Exterior",
   "layout": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_SOUTHERN_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json
index 14530c995..179ab1997 100644
--- a/data/maps/SouthernIsland_Interior/map.json
+++ b/data/maps/SouthernIsland_Interior/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_SOUTHERN_ISLAND_INTERIOR",
   "name": "SouthernIsland_Interior",
   "layout": "LAYOUT_SOUTHERN_ISLAND_INTERIOR",
-  "music": "MUS_DAN02",
+  "music": "MUS_ABANDONED_SHIP",
   "region_map_section": "MAPSEC_SOUTHERN_ISLAND",
   "requires_flash": false,
   "weather": "WEATHER_SHADE",
diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json
index c7dfeeb3d..b186bddb2 100644
--- a/data/maps/TerraCave_End/map.json
+++ b/data/maps/TerraCave_End/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_TERRA_CAVE_END",
   "name": "TerraCave_End",
   "layout": "LAYOUT_TERRA_CAVE_END",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_TERRA_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_FOG_HORIZONTAL",
diff --git a/data/maps/TerraCave_Entrance/map.json b/data/maps/TerraCave_Entrance/map.json
index 9a9650487..1ddc768e2 100644
--- a/data/maps/TerraCave_Entrance/map.json
+++ b/data/maps/TerraCave_Entrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_TERRA_CAVE_ENTRANCE",
   "name": "TerraCave_Entrance",
   "layout": "LAYOUT_TERRA_CAVE_ENTRANCE",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_TERRA_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json
index d0ed8e524..0d3dd5477 100644
--- a/data/maps/TradeCenter/map.json
+++ b/data/maps/TradeCenter/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_TRADE_CENTER",
   "name": "TradeCenter",
   "layout": "LAYOUT_TRADE_CENTER",
-  "music": "MUS_RAINBOW",
+  "music": "MUS_EVER_GRANDE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/TrainerHill_1F/map.json b/data/maps/TrainerHill_1F/map.json
index 30f80b810..d14bbb293 100644
--- a/data/maps/TrainerHill_1F/map.json
+++ b/data/maps/TrainerHill_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_TRAINER_HILL_1F",
   "name": "TrainerHill_1F",
   "layout": "LAYOUT_TRAINER_HILL_1F",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_TRAINER_HILL",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/TrainerHill_2F/map.json b/data/maps/TrainerHill_2F/map.json
index e94948c33..a4c9bca7d 100644
--- a/data/maps/TrainerHill_2F/map.json
+++ b/data/maps/TrainerHill_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_TRAINER_HILL_2F",
   "name": "TrainerHill_2F",
   "layout": "LAYOUT_TRAINER_HILL_2F",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_TRAINER_HILL",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/TrainerHill_3F/map.json b/data/maps/TrainerHill_3F/map.json
index 6e3ef9c51..069ca83ac 100644
--- a/data/maps/TrainerHill_3F/map.json
+++ b/data/maps/TrainerHill_3F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_TRAINER_HILL_3F",
   "name": "TrainerHill_3F",
   "layout": "LAYOUT_TRAINER_HILL_3F",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_TRAINER_HILL",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/TrainerHill_4F/map.json b/data/maps/TrainerHill_4F/map.json
index 2b62322e9..f195d9e93 100644
--- a/data/maps/TrainerHill_4F/map.json
+++ b/data/maps/TrainerHill_4F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_TRAINER_HILL_4F",
   "name": "TrainerHill_4F",
   "layout": "LAYOUT_TRAINER_HILL_4F",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_TRAINER_HILL",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json
index dc259fde0..3d56ff476 100644
--- a/data/maps/TrainerHill_Elevator/map.json
+++ b/data/maps/TrainerHill_Elevator/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_TRAINER_HILL_ELEVATOR",
   "name": "TrainerHill_Elevator",
   "layout": "LAYOUT_BATTLE_ELEVATOR",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_TRAINER_HILL",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json
index ed85405c1..b2c20d050 100644
--- a/data/maps/TrainerHill_Entrance/map.json
+++ b/data/maps/TrainerHill_Entrance/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_TRAINER_HILL_ENTRANCE",
   "name": "TrainerHill_Entrance",
   "layout": "LAYOUT_TRAINER_HILL_ENTRANCE",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_TRAINER_HILL",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 077709053..b5b0f716c 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -69,7 +69,7 @@ TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160
 	waitmovement 0
 	setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, 1
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	waitse
 	setvar VAR_TEMP_D, 0
 	releaseall
diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json
index 244214ad3..16020a762 100644
--- a/data/maps/TrainerHill_Roof/map.json
+++ b/data/maps/TrainerHill_Roof/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_TRAINER_HILL_ROOF",
   "name": "TrainerHill_Roof",
   "layout": "LAYOUT_TRAINER_HILL_ROOF",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_TRAINER_HILL",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc
index e4e2cbb49..e239ed010 100644
--- a/data/maps/TrainerHill_Roof/scripts.inc
+++ b/data/maps/TrainerHill_Roof/scripts.inc
@@ -22,7 +22,7 @@ TrainerHill_Roof_EventScript_GivePrize:: @ 8268FF2
 	case 2, TrainerHill_Roof_EventScript_CheckFinalTime
 TrainerHill_Roof_EventScript_ReceivePrize:: @ 8269020
 	msgbox TrainerHill_Roof_Text_HaveTheMostMarvelousGift, MSGBOX_DEFAULT
-	playfanfare MUS_FANFA1
+	playfanfare MUS_LEVEL_UP
 	message gText_ObtainedTheItem
 	waitfanfare
 	waitmessage
diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json
index cc77e951d..71752745d 100644
--- a/data/maps/Underwater1/map.json
+++ b/data/maps/Underwater1/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNDERWATER1",
   "name": "Underwater1",
   "layout": "LAYOUT_UNDERWATER1",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_UNDERWATER_124",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json
index f402f8ea8..5ecdc402a 100644
--- a/data/maps/Underwater2/map.json
+++ b/data/maps/Underwater2/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNDERWATER2",
   "name": "Underwater2",
   "layout": "LAYOUT_UNDERWATER2",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_UNDERWATER_125",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json
index 69af7637f..43df933a0 100644
--- a/data/maps/Underwater3/map.json
+++ b/data/maps/Underwater3/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNDERWATER3",
   "name": "Underwater3",
   "layout": "LAYOUT_UNDERWATER3",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_UNDERWATER_126",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json
index 156923302..4b0fc6d3b 100644
--- a/data/maps/Underwater4/map.json
+++ b/data/maps/Underwater4/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNDERWATER4",
   "name": "Underwater4",
   "layout": "LAYOUT_UNDERWATER4",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_UNDERWATER_127",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json
index c50b8be53..909591f11 100644
--- a/data/maps/Underwater5/map.json
+++ b/data/maps/Underwater5/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNDERWATER5",
   "name": "Underwater5",
   "layout": "LAYOUT_UNDERWATER5",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_UNDERWATER_129",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json
index 971f2755c..2a021f77f 100644
--- a/data/maps/Underwater6/map.json
+++ b/data/maps/Underwater6/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNDERWATER6",
   "name": "Underwater6",
   "layout": "LAYOUT_UNDERWATER6",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json
index cf33280fe..5155fc6ba 100644
--- a/data/maps/Underwater7/map.json
+++ b/data/maps/Underwater7/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNDERWATER7",
   "name": "Underwater7",
   "layout": "LAYOUT_UNDERWATER7",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_UNDERWATER_UNK1",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/Underwater_MarineCave/map.json b/data/maps/Underwater_MarineCave/map.json
index c12531e48..c053fb121 100644
--- a/data/maps/Underwater_MarineCave/map.json
+++ b/data/maps/Underwater_MarineCave/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNDERWATER_MARINE_CAVE",
   "name": "Underwater_MarineCave",
   "layout": "LAYOUT_UNDERWATER_MARINE_CAVE",
-  "music": "MUS_DAN01",
+  "music": "MUS_PETALBURG_WOODS",
   "region_map_section": "MAPSEC_UNDERWATER_MARINE_CAVE",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json
index dd5117aa4..74526bc4d 100644
--- a/data/maps/Underwater_Route134/map.json
+++ b/data/maps/Underwater_Route134/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNDERWATER_ROUTE134",
   "name": "Underwater_Route134",
   "layout": "LAYOUT_UNDERWATER_ROUTE134",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json
index 90201d3b7..efcb3c291 100644
--- a/data/maps/Underwater_SeafloorCavern/map.json
+++ b/data/maps/Underwater_SeafloorCavern/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNDERWATER_SEAFLOOR_CAVERN",
   "name": "Underwater_SeafloorCavern",
   "layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_UNDERWATER_128",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json
index 98bbcc850..5f3b99055 100644
--- a/data/maps/Underwater_SealedChamber/map.json
+++ b/data/maps/Underwater_SealedChamber/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNDERWATER_SEALED_CHAMBER",
   "name": "Underwater_SealedChamber",
   "layout": "LAYOUT_UNDERWATER_SEALED_CHAMBER",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json
index cc2d66ff2..90e5e97fc 100644
--- a/data/maps/Underwater_SootopolisCity/map.json
+++ b/data/maps/Underwater_SootopolisCity/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNDERWATER_SOOTOPOLIS_CITY",
   "name": "Underwater_SootopolisCity",
   "layout": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY",
-  "music": "MUS_DEEPDEEP",
+  "music": "MUS_UNDERWATER",
   "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS",
   "requires_flash": false,
   "weather": "WEATHER_UNDERWATER_BUBBLES",
diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json
index 1ee204137..3d19cd55f 100644
--- a/data/maps/UnionRoom/map.json
+++ b/data/maps/UnionRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNION_ROOM",
   "name": "UnionRoom",
   "layout": "LAYOUT_UNION_ROOM",
-  "music": "MUS_RAINBOW",
+  "music": "MUS_EVER_GRANDE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json
index cf6077259..72ed407ee 100644
--- a/data/maps/UnknownLinkContestRoom_25_29/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_29/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29",
   "name": "UnknownLinkContestRoom_25_29",
   "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29",
-  "music": "MUS_NIBI",
+  "music": "MUS_GSC_PEWTER",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json
index c51109ee9..cd4d6fddd 100644
--- a/data/maps/UnknownLinkContestRoom_25_30/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_30/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30",
   "name": "UnknownLinkContestRoom_25_30",
   "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30",
-  "music": "MUS_NIBI",
+  "music": "MUS_GSC_PEWTER",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json
index 27b550382..975ec382d 100644
--- a/data/maps/UnknownLinkContestRoom_25_31/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_31/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31",
   "name": "UnknownLinkContestRoom_25_31",
   "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31",
-  "music": "MUS_NIBI",
+  "music": "MUS_GSC_PEWTER",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json
index 0c20ee1f8..d2d673adc 100644
--- a/data/maps/UnknownLinkContestRoom_25_32/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_32/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32",
   "name": "UnknownLinkContestRoom_25_32",
   "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32",
-  "music": "MUS_NIBI",
+  "music": "MUS_GSC_PEWTER",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json
index aee753f22..f73ffe22e 100644
--- a/data/maps/UnknownLinkContestRoom_25_33/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_33/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33",
   "name": "UnknownLinkContestRoom_25_33",
   "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33",
-  "music": "MUS_NIBI",
+  "music": "MUS_GSC_PEWTER",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json
index ebd07e9fa..f5ddbbe5a 100644
--- a/data/maps/UnknownLinkContestRoom_25_34/map.json
+++ b/data/maps/UnknownLinkContestRoom_25_34/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34",
   "name": "UnknownLinkContestRoom_25_34",
   "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34",
-  "music": "MUS_NIBI",
+  "music": "MUS_GSC_PEWTER",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json
index c4b736f80..94d140c05 100644
--- a/data/maps/VerdanturfTown/map.json
+++ b/data/maps/VerdanturfTown/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VERDANTURF_TOWN",
   "name": "VerdanturfTown",
   "layout": "LAYOUT_VERDANTURF_TOWN",
-  "music": "MUS_GOMACHI0",
+  "music": "MUS_VERDANTURF",
   "region_map_section": "MAPSEC_VERDANTURF_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_SUNNY",
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json
index 9ed2441dd..72eca1d95 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM",
   "name": "VerdanturfTown_BattleTentBattleRoom",
   "layout": "LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_VERDANTURF_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
index 86b5f3ec1..ad77cdf5f 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
@@ -78,7 +78,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 82023C8
 	special LoadPlayerParty
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
-	playfanfare MUS_ME_ASA
+	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
 
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json
index 0209c02d9..2b875b900 100644
--- a/data/maps/VerdanturfTown_BattleTentCorridor/map.json
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR",
   "name": "VerdanturfTown_BattleTentCorridor",
   "layout": "LAYOUT_BATTLE_TENT_CORRIDOR",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_VERDANTURF_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json
index cc294e47d..d4a8ccfa5 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/map.json
+++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY",
   "name": "VerdanturfTown_BattleTentLobby",
   "layout": "LAYOUT_BATTLE_TENT_LOBBY",
-  "music": "MUS_B_TOWER",
+  "music": "MUS_B_TOWER_RS",
   "region_map_section": "MAPSEC_VERDANTURF_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
index 7a3aa605c..f7a03b1ec 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
@@ -55,7 +55,7 @@ VerdanturfTown_BattleTentLobby_EventScript_GivePrize:: @ 8201791
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	message BattleFrontier_BattleDomeLobby_Text_ReceivedPrize  @ Odd that it used Dome's copy instead of Palace's
 	waitmessage
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	waitfanfare
 	msgbox VerdanturfTown_BattleTentLobby_Text_ReturnFortified, MSGBOX_DEFAULT
 	closemessage
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json
index 7aaedcd23..7fa310426 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE",
   "name": "VerdanturfTown_FriendshipRatersHouse",
   "layout": "LAYOUT_HOUSE2",
-  "music": "MUS_GOMACHI0",
+  "music": "MUS_VERDANTURF",
   "region_map_section": "MAPSEC_VERDANTURF_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json
index bcc51079f..d552e914a 100644
--- a/data/maps/VerdanturfTown_House/map.json
+++ b/data/maps/VerdanturfTown_House/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VERDANTURF_TOWN_HOUSE",
   "name": "VerdanturfTown_House",
   "layout": "LAYOUT_HOUSE1",
-  "music": "MUS_GOMACHI0",
+  "music": "MUS_VERDANTURF",
   "region_map_section": "MAPSEC_VERDANTURF_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json
index 96fa21366..b8183646c 100644
--- a/data/maps/VerdanturfTown_Mart/map.json
+++ b/data/maps/VerdanturfTown_Mart/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VERDANTURF_TOWN_MART",
   "name": "VerdanturfTown_Mart",
   "layout": "LAYOUT_MART",
-  "music": "MUS_FRIENDLY",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_VERDANTURF_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
index 74f3e342b..8e3fc3e28 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F",
   "name": "VerdanturfTown_PokemonCenter_1F",
   "layout": "LAYOUT_POKEMON_CENTER_1F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_VERDANTURF_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json
index d7a51eba7..2edb6602d 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F",
   "name": "VerdanturfTown_PokemonCenter_2F",
   "layout": "LAYOUT_POKEMON_CENTER_2F",
-  "music": "MUS_POKECEN",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_VERDANTURF_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json
index 08b5348c7..43a5b9c44 100644
--- a/data/maps/VerdanturfTown_WandasHouse/map.json
+++ b/data/maps/VerdanturfTown_WandasHouse/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE",
   "name": "VerdanturfTown_WandasHouse",
   "layout": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE",
-  "music": "MUS_GOMACHI0",
+  "music": "MUS_VERDANTURF",
   "region_map_section": "MAPSEC_VERDANTURF_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index d0ff9e440..5f3271c89 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VICTORY_ROAD_1F",
   "name": "VictoryRoad_1F",
   "layout": "LAYOUT_VICTORY_ROAD_1F",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_VICTORY_ROAD",
   "requires_flash": false,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json
index 9a387aa52..6e290ce6d 100644
--- a/data/maps/VictoryRoad_B1F/map.json
+++ b/data/maps/VictoryRoad_B1F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VICTORY_ROAD_B1F",
   "name": "VictoryRoad_B1F",
   "layout": "LAYOUT_VICTORY_ROAD_B1F",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_VICTORY_ROAD",
   "requires_flash": true,
   "weather": "WEATHER_NONE",
diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json
index 7e59f9f27..6ee56389f 100644
--- a/data/maps/VictoryRoad_B2F/map.json
+++ b/data/maps/VictoryRoad_B2F/map.json
@@ -2,7 +2,7 @@
   "id": "MAP_VICTORY_ROAD_B2F",
   "name": "VictoryRoad_B2F",
   "layout": "LAYOUT_VICTORY_ROAD_B2F",
-  "music": "MUS_C_ROAD",
+  "music": "MUS_VICTORY_ROAD",
   "region_map_section": "MAPSEC_VICTORY_ROAD",
   "requires_flash": true,
   "weather": "WEATHER_NONE",
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 1e121678e..fe10af4b3 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -122,7 +122,7 @@ BerryTree_EventScript_PickBerry:: @ 8274448
 	special IncrementDailyPickedBerries
 	special ObjectEventInteractionRemoveBerryTree
 	message BerryTree_Text_PickedTheBerry
-	playfanfare MUS_ME_KINOMI
+	playfanfare MUS_OBTAIN_BERRY
 	waitmessage
 	waitfanfare
 	waitbuttonpress
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 66cf74f0a..b81fbb4d5 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -132,7 +132,7 @@ CableClub_EventScript_ExitLinkRoom:: @ 8276C85
 	call CableClub_EventScript_CloseLinkAndExitLinkRoom
 	call CableClub_EventScript_CloseDirectCornerBarrier
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -142,7 +142,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 8276C9D
 	call CableClub_EventScript_CloseLinkAndExitLinkRoom
 	call EventScript_CloseMossdeepGameCornerBarrier
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -165,7 +165,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 8276CE7
 	call CableClub_EventScript_PlayerExitTradeCenter
 	call CableClub_EventScript_CloseDirectCornerBarrier
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -187,7 +187,7 @@ CableClub_EventScript_ExitRecordCorner:: @ 8276D2C
 	call CableClub_EventScript_PlayerExitRecordCorner
 	call CableClub_EventScript_CloseDirectCornerBarrier
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -209,7 +209,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 8276D6C
 	call CableClub_EventScript_PlayerExitUnionRoom
 	call CableClub_EventScript_CloseUnionRoomBarrier
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	erasebox 0, 0, 29, 19
 	releaseall
 	end
@@ -372,7 +372,7 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
 	waitmessage
 	call CableClub_EventScript_OpenDirectCornerBarrier
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 60
 	applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
 	waitmovement 0
@@ -477,7 +477,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A
 	waitmessage
 	call CableClub_EventScript_OpenDirectCornerBarrier
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 60
 	applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
 	waitmovement 0
@@ -552,7 +552,7 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C
 	waitmessage
 	call CableClub_EventScript_OpenDirectCornerBarrier
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 60
 	applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
 	waitmovement 0
@@ -955,7 +955,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F
 	copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
 	call CableClub_EventScript_OpenUnionRoomBarrier
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 60
 	applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
 	waitmovement 0
@@ -1285,7 +1285,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A
 	copyvar VAR_0x8007, VAR_LAST_TALKED
 	call CableClub_EventScript_OpenDirectCornerBarrier
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 60
 	applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
 	waitmovement 0
@@ -1481,7 +1481,7 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E
 	copyvar VAR_0x8007, VAR_LAST_TALKED
 	call EventScript_OpenMossdeepGameCornerBarrier
 	special DrawWholeMapView
-	playse SE_TK_KASYA
+	playse SE_CLICK
 	delay 60
 	applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft
 	waitmovement 0
diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc
index b55c932ee..1cc334004 100644
--- a/data/scripts/cave_hole.inc
+++ b/data/scripts/cave_hole.inc
@@ -11,7 +11,7 @@ EventScript_FallDownHole:: @ 82A8337
 	delay 20
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
 	waitmovement 0
-	playse SE_RU_HYUU
+	playse SE_FALL
 	delay 60
 	warphole MAP_UNDEFINED
 	waitstate
@@ -22,7 +22,7 @@ EventScript_FallDownHoleMtPyre:: @ 82A8350
 	delay 20
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
 	waitmovement 0
-	playse SE_RU_HYUU
+	playse SE_FALL
 	delay 60
 	special DoFallWarp
 	waitstate
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 984e1b93b..1ef723c37 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -401,13 +401,13 @@ ContestHall_EventScript_ShowContestMonPic:: @ 827A1D2
 	call ContestHall_EventScript_TryWaitForLink
 	call ContestHall_EventScript_CheckIfContestWithRSPlayer
 	addobject LOCALID_POKEBALL
-	playse SE_DANSA
+	playse SE_LEDGE
 	lockall
 	applymovement VAR_0x800B, ContestHall_Movement_ContestantDelay32
 	waitmovement 0
 	releaseall
 	addvar VAR_0x8006, -1
-	playse SE_BOWA2
+	playse SE_BALL_OPEN
 	special ShowContestEntryMonPic
 	call ContestHall_EventScript_EntryXTrainersMon
 	return
@@ -427,7 +427,7 @@ ContestHall_EventScript_EntryXTrainersMonLink:: @ 827A229
 ContestHall_EventScript_AudienceVote:: @ 827A230
 	call ContestHall_EventScript_AudienceWillVote
 	call ContestHall_EventScript_VotingUnderWay
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	waitmessage
 	call ContestHall_EventScript_AudienceLookAround
 	applymovement LOCALID_MC, ContestHall_Movement_MCFaceJudge2
@@ -481,7 +481,7 @@ ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5
 	call ContestHall_EventScript_TryWaitForLink
 	applymovement LOCALID_MC, ContestHall_Movement_AudienceMemberLookLeft
 	waitmovement 0
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	call ContestHall_EventScript_VObjectAudienceLookAround
 	applymovement LOCALID_AUDIENCE_5, ContestHall_Movement_AudienceMemberLookRight
 	applymovement LOCALID_AUDIENCE_2, ContestHall_Movement_AudienceMemberLookDown
@@ -916,7 +916,7 @@ ContestHall_EventScript_ContestResults:: @ 827A8A5
 	setvar VAR_TEMP_9, 1
 	showcontestresults
 	setvar VAR_TEMP_9, 0
-	playbgm MUS_CON_FAN, 0
+	playbgm MUS_CONTEST_WINNER, 0
 	return
 
 ContestHall_EventScript_ThatsItForJudging:: @ 827A8FB
@@ -1005,7 +1005,7 @@ ContestHall_EventScript_CongratulateWinner:: @ 827A9D4
 	call ContestHall_EventScript_CongratsWinner
 	applymovement VAR_TEMP_3, ContestHall_Movement_WinningPlayerWalkUp
 	waitmovement 0
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	setvar VAR_TEMP_1, 0
 	return
 
@@ -1117,7 +1117,7 @@ ContestHall_EventScript_GiveWinnerPrize:: @ 827AB36
 	releaseall
 	call ContestHall_EventScript_WinnerApproachForPrize
 	call ContestHall_EventScript_GivePrizeIfWinner
-	playse SE_W227B
+	playse SE_M_ENCORE2
 	setvar VAR_TEMP_1, 0
 	call ContestHall_EventScript_AudienceLookAround
 	delay 30
@@ -1266,7 +1266,7 @@ ContestHall_EventScript_ReceiveContestRibbon:: @ 827ACDF
 	setflag FLAG_SYS_RIBBON_GET
 	lockall
 	msgbox ContestHall_Text_ConferRibbonAsPrize, MSGBOX_DEFAULT
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	msgbox ContestHall_Text_ReceivedRibbon, MSGBOX_DEFAULT
 	waitfanfare
 	special BufferContestWinnerMonName
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 87995581f..ea8552510 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -38,7 +38,7 @@ Route117_EventScript_DaycareAcceptEgg:: @ 8291C83
 
 Route117_EventScript_DaycareReceiveEgg:: @ 8291C9D
 	message Route117_Text_ReceivedEgg
-	playfanfare MUS_FANFA1
+	playfanfare MUS_LEVEL_UP
 	waitfanfare
 	waitbuttonpress
 	msgbox Route117_Text_TakeGoodCareOfIt, MSGBOX_DEFAULT
@@ -217,7 +217,7 @@ Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2
 	waitmovement 0
 	specialvar VAR_RESULT, TakePokemonFromDaycare
 	special SubtractMoneyFromVar0x8005
-	playse SE_REGI
+	playse SE_SHOP
 	msgbox Route117_PokemonDayCare_Text_HeresYourMon, MSGBOX_DEFAULT
 	waitse
 	playmoncry VAR_RESULT, 0
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc
index 3b395de21..f4eb6393b 100644
--- a/data/scripts/elite_four.inc
+++ b/data/scripts/elite_four.inc
@@ -20,7 +20,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
 PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
 	waitmovement 0
-	playse SE_TRACK_DOOR
+	playse SE_TRUCK_DOOR
 	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
 	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
 	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc
index 7f629e5db..40ead8e58 100644
--- a/data/scripts/lilycove_lady.inc
+++ b/data/scripts/lilycove_lady.inc
@@ -259,9 +259,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse:: @ 82A8689
     end
 
 LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0
-    playse SE_SEIKAI
+    playse SE_SUCCESS
     delay 10
-    playse SE_SEIKAI
+    playse SE_SUCCESS
     msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRight, MSGBOX_DEFAULT
     goto LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize
     end
@@ -269,9 +269,9 @@ LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0
 LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse:: @ 82A86C7
     special BufferQuizCorrectAnswer
     special BufferQuizPrizeName
-    playse SE_HAZURE
+    playse SE_FAILURE
     delay 10
-    playse SE_HAZURE
+    playse SE_FAILURE
     msgbox LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs, MSGBOX_DEFAULT
     msgbox LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize, MSGBOX_DEFAULT
     goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz
diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc
index cc947e396..c51558e9e 100644
--- a/data/scripts/mevent_pichu.inc
+++ b/data/scripts/mevent_pichu.inc
@@ -14,7 +14,7 @@ SurfPichu_GiveIfPossible: @ 8674D4C
 	vmessage sText_MysteryGiftEgg
 	waitmessage
 	waitbuttonpress
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	waitfanfare
 	release
 	end
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
index 3afd92588..19f57d9d5 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -65,11 +65,11 @@ EventScript_NoRoomForItem:: @ 8271BA9
 	return
 
 EventScript_PlayFanfareObtainedItem:: @ 8271BAF
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	return
 
 EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3
-	playfanfare MUS_ME_WAZA
+	playfanfare MUS_OBTAIN_TMHM
 	return
 
 Std_ObtainDecoration:: @ 8271BB7
@@ -87,7 +87,7 @@ EventScript_ObtainDecorationMessage:: @ 8271BC5
 	return
 
 EventScript_ObtainedDecor:: @ 8271BE0
-	playfanfare MUS_FANFA4
+	playfanfare MUS_OBTAIN_ITEM
 	message gText_ObtainedTheDecor
 	waitfanfare
 	msgbox gText_TheDecorWasTransferredToThePC, MSGBOX_DEFAULT
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 440f47a6a..684b27e71 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -73,7 +73,7 @@ PlayersHouse_2F_EventScript_WallClock:: @ 8292799
 	call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsMale
 	compare VAR_RESULT, FEMALE
 	call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsFemale
-	playse SE_KAIDAN
+	playse SE_EXIT
 	removeobject VAR_0x8008
 	releaseall
 	end
@@ -159,7 +159,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D
 	call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
 	applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale
 	waitmovement 0
-	playbgm MUS_INTER_V, 0
+	playbgm MUS_ENCOUNTER_INTERVIEWER, 0
 	msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale
@@ -184,7 +184,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC
 	call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
 	applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale
 	waitmovement 0
-	playbgm MUS_INTER_V, 0
+	playbgm MUS_ENCOUNTER_INTERVIEWER, 0
 	msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale
@@ -334,7 +334,7 @@ PlayersHouse_1F_EventScript_TryRegisterMom:: @ 8292A19
 	msgbox PlayersHouse_1F_Text_IsThatAPokenav, MSGBOX_DEFAULT
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox PlayersHouse_1F_Text_RegisteredMom, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 6a811d935..d04a16b58 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -24,7 +24,7 @@ SafariZone_EventScript_Retire:: @ 82A4B85
 
 SafariZone_EventScript_TimesUp:: @ 82A4B8A
 	lockall
-	playse SE_PINPON
+	playse SE_DING_DONG
 	message SafariZone_Text_TimesUp
 	waitmessage
 	waitbuttonpress
@@ -33,7 +33,7 @@ SafariZone_EventScript_TimesUp:: @ 82A4B8A
 
 SafariZone_EventScript_OutOfBalls:: @ 82A4B9B
 	lockall
-	playse SE_PINPON
+	playse SE_DING_DONG
 	message SafariZone_Text_OutOfBalls
 	waitmessage
 	waitbuttonpress
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 0de890aa6..132bdd19c 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -144,7 +144,7 @@ SecretBase_EventScript_ShrubEnter:: @ 8275B4D
 
 SecretBase_EventScript_InitSecretBase:: @ 8275B5B
 	closemessage
-	playse SE_KAIDAN
+	playse SE_EXIT
 	setvar VAR_INIT_SECRET_BASE, 0
 	setflag FLAG_DECORATION_0
 	special SetPlayerSecretBase
@@ -164,7 +164,7 @@ SecretBase_EventScript_FirstEntrance:: @ 8275B81
 	compare VAR_RESULT, YES
 	goto_if_eq SecretBase_EventScript_SetAsBase
 	closemessage
-	playse SE_KAIDAN
+	playse SE_EXIT
 	special ClearAndLeaveSecretBase
 	end
 
@@ -183,7 +183,7 @@ SecretBase_Movement_275BB4: @ 8275BB4
 SecretBase_EventScript_Enter:: @ 8275BB7
 	lockall
 	setvar VAR_INIT_SECRET_BASE, 1
-	playse SE_KAIDAN
+	playse SE_EXIT
 	special IsCurSecretBaseOwnedByAnotherPlayer
 	compare VAR_RESULT, FALSE
 	goto_if_eq SecretBase_EventScript_EnterPlayersBase
diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc
index 1d82bb381..10b46700e 100644
--- a/data/scripts/std_msgbox.inc
+++ b/data/scripts/std_msgbox.inc
@@ -29,7 +29,7 @@ Std_MsgboxYesNo: @ 8271332
 
 Std_MsgboxGetPoints: @ 827133C
 	message 0x0
-	playfanfare MUS_ME_POINTGET
+	playfanfare MUS_OBTAIN_B_POINTS
 	waitfanfare
 	waitmessage
 	return
diff --git a/data/scripts/trainer_script.inc b/data/scripts/trainer_script.inc
index 59577e8a8..c77e628ee 100644
--- a/data/scripts/trainer_script.inc
+++ b/data/scripts/trainer_script.inc
@@ -3,7 +3,7 @@ Std_RegisteredInMatchCall:: @ 82742C9
 	buffertrainername 1, VAR_0x8000
 	closemessage
 	delay 30
-	playfanfare MUS_ME_TORE_EYE
+	playfanfare MUS_REGISTER_MATCH_CALL
 	msgbox gText_RegisteredTrainerinPokeNav, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
diff --git a/include/constants/songs.h b/include/constants/songs.h
index b44c9f7a8..a78ee6faf 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -1,543 +1,548 @@
 #ifndef GUARD_CONSTANTS_SONGS_H
 #define GUARD_CONSTANTS_SONGS_H
 
-#define MUS_DUMMY 0
-#define SE_KAIFUKU 1            // Healing Item
-#define SE_PC_LOGIN 2           // PC Logon
-#define SE_PC_OFF 3             // PC Shutdown
-#define SE_PC_ON 4              // PC Startup
-#define SE_SELECT 5             // Cursor Selection
-#define SE_WIN_OPEN 6           // Start Menu
-#define SE_WALL_HIT 7           // Wall Bump
-#define SE_DOOR 8               // Opening Door
-#define SE_KAIDAN 9             // Stairs
-#define SE_DANSA 10             // Ledge
-#define SE_JITENSYA 11          // Bicycle Bell
-#define SE_KOUKA_L 12           // Not Very Effective
-#define SE_KOUKA_M 13           // Normal Effectiveness
-#define SE_KOUKA_H 14           // Super Effective
-#define SE_BOWA2 15             // Pokémon Withdrawal
-#define SE_POKE_DEAD 16         // Pokémon Fainted
-#define SE_NIGERU 17            // Flee from Wild Battle
-#define SE_JIDO_DOA 18          // Pokémon Center Door
-#define SE_NAMINORI 19          // Briney's Ship
-#define SE_BAN 20               // Bang
-#define SE_PIN 21               // Exclamation Bubble
-#define SE_BOO 22               // Contest Jam
-#define SE_BOWA 23              // Giving Poké Ball to Nurse, Poké Ball Wiggle
-#define SE_JYUNI 24             // Places in Contest Appearing
-#define SE_A 25                 // Bard A
-#define SE_I 26                 // Bard I
-#define SE_U 27                 // Bard U
-#define SE_E 28                 // Bard E
-#define SE_O 29                 // Bard O
-#define SE_N 30                 // Bard N
-#define SE_SEIKAI 31            // Success
-#define SE_HAZURE 32            // Failure
-#define SE_EXP 33               // Exp. Bar
-#define SE_JITE_PYOKO 34        // Bunny Hop
-#define SE_MU_PACHI 35
-#define SE_TK_KASYA 36          // Mossdeep Gym/Trick House Switch
-#define SE_FU_ZAKU 37
-#define SE_FU_ZAKU2 38
-#define SE_FU_ZUZUZU 39         // Lavaridge Gym Warp
-#define SE_RU_GASHIN 40         // Sootopolis Gym - Stairs Appear
-#define SE_RU_GASYAN 41         // Sootopolis Gym - Ice Breaking
-#define SE_RU_BARI 42           // Sootopolis Gym - Walking on Ice
-#define SE_RU_HYUU 43           // Falling Down
-#define SE_KI_GASYAN 44
-#define SE_TK_WARPIN 45         // Warp In
-#define SE_TK_WARPOUT 46        // Warp Out
-#define SE_TU_SAA 47            // Repel
-#define SE_HI_TURUN 48          // Moving Obstacle in Fortree Gym
-#define SE_TRACK_MOVE 49        // Moving Truck
-#define SE_TRACK_STOP 50        // Moving Truck Stop
-#define SE_TRACK_HAIKI 51       // Moving Truck Unload
-#define SE_TRACK_DOOR 52        // Moving Truck Door
-#define SE_MOTER 53
-#define SE_CARD 54
-#define SE_SAVE 55              // Save
-#define SE_KON 56               // Poké Ball Bounce 1
-#define SE_KON2 57              // Poké Ball Bounce 2
-#define SE_KON3 58              // Poké Ball Bounce 3
-#define SE_KON4 59              // Poké Ball Bounce 4
-#define SE_SUIKOMU 60           // Poké Ball Trade
-#define SE_NAGERU 61            // Poké Ball Throw
-#define SE_TOY_C 62             // Note C
-#define SE_TOY_D 63             // Note D
-#define SE_TOY_E 64             // Note E
-#define SE_TOY_F 65             // Note F
-#define SE_TOY_G 66             // Note G
-#define SE_TOY_A 67             // Note A
-#define SE_TOY_B 68             // Note B
-#define SE_TOY_C1 69            // Note High C
-#define SE_MIZU 70              // Puddle
-#define SE_HASHI 71             // Boardwalk
-#define SE_DAUGI 72             // Slots Credits
-#define SE_PINPON 73            // Ding-dong!
-#define SE_FUUSEN1 74           // Red Balloon
-#define SE_FUUSEN2 75           // Blue Balloon
-#define SE_FUUSEN3 76           // Yellow Balloon
-#define SE_TOY_KABE 77          // Breakable Door
-#define SE_TOY_DANGO 78         // Mud Ball
-#define SE_DOKU 79              // Overworld Poison Damage
-#define SE_ESUKA 80             // Escalator
-#define SE_T_AME 81             // Rain
-#define SE_T_AME_E 82           // Rain Stop
-#define SE_T_OOAME 83           // Heavy Rain
-#define SE_T_OOAME_E 84         // Heavy Rain Stop
-#define SE_T_KOAME 85           // Light Rain
-#define SE_T_KOAME_E 86         // Light Rain Stop
-#define SE_T_KAMI 87            // Thunder
-#define SE_T_KAMI2 88           // Thunder 2
-#define SE_ELEBETA 89           // Elevator
-#define SE_HINSI 90             // Low Health
-#define SE_EXPMAX 91            // Exp. Max
-#define SE_TAMAKORO 92          // Roulette Ball
-#define SE_TAMAKORO_E 93        // Roulette Ball 2
-#define SE_BASABASA 94
-#define SE_REGI 95              // Cash Register
-#define SE_C_GAJI 96            // Contest Hearts
-#define SE_C_MAKU_U 97          // Contest Curtain rise
-#define SE_C_MAKU_D 98          // Contest Curtain fall
-#define SE_C_PASI 99
-#define SE_C_SYU 100
-#define SE_C_PIKON 101          // Pokémon Appears in Contest
-#define SE_REAPOKE 102          // Shiny Pokémon
-#define SE_OP_BASYU 103         // Opening Movie -> Title Screen whoosh
-#define SE_BT_START 104         // Battle Mugshot whoosh
-#define SE_DENDOU 105           // Audience Cheering
-#define SE_JIHANKI 106          // Vending Machine
-#define SE_TAMA 107             // Orb Used
-#define SE_Z_SCROLL 108         // Pokédex Scrolling
-#define SE_Z_PAGE 109           // Pokédex Page
-#define SE_PN_ON 110            // PokéNav On
-#define SE_PN_OFF 111           // PokéNav Off
-#define SE_Z_SEARCH 112         // Pokédex Search
-#define SE_TAMAGO 113           // Egg hatch
-#define SE_TB_START 114         // Battle - Poké Ball Tray slide in
-#define SE_TB_KON 115           // Battle - Poké Ball Tray ball sound
-#define SE_TB_KARA 116          // Battle - Poké Ball Tray slide out
-#define SE_BIDORO 117
-#define SE_W085 118             // Thunderbolt
-#define SE_W085B 119            // Thunderbolt 2
-#define SE_W231 120             // Harden
-#define SE_W171 121             // Nightmare
-#define SE_W233 122             // Vital Throw
-#define SE_W233B 123            // Vital Throw 2
-#define SE_W145 124             // Bubble
-#define SE_W145B 125            // Bubble 2
-#define SE_W145C 126            // Bubble 3
-#define SE_W240 127             // Rain Dance
-#define SE_W015 128             // Cut
-#define SE_W081 129             // String Shot
-#define SE_W081B 130            // String Shot 2
-#define SE_W088 131             // Rock Throw
-#define SE_W016 132             // Gust
-#define SE_W016B 133            // Gust 2
-#define SE_W003 134             // DoubleSlap
-#define SE_W104 135             // Double Team
-#define SE_W013 136             // Razor Wind
-#define SE_W196 137             // Icy Wind
-#define SE_W086 138             // Thunder Wave
-#define SE_W004 139             // Comet Punch
-#define SE_W025 140             // Mega Kick
-#define SE_W025B 141            // Mega Kick 2
-#define SE_W152 142             // Crabhammer
-#define SE_W026 143             // Jump Kick
-#define SE_W172 144             // Flame Wheel
-#define SE_W172B 145            // Flame Wheel 2
-#define SE_W053 146             // Flamethrower
-#define SE_W007 147             // Fire Punch
-#define SE_W092 148             // Toxic
-#define SE_W221 149             // Sacred Fire
-#define SE_W221B 150            // Sacred Fire 2
-#define SE_W052 151             // Ember
-#define SE_W036 152             // Take Down
-#define SE_W059 153             // Blizzard
-#define SE_W059B 154            // Blizzard 2
-#define SE_W010 155             // Scratch
-#define SE_W011 156             // Vicegrip
-#define SE_W017 157             // Wing Attack
-#define SE_W019 158             // Fly
-#define SE_W028 159             // Sand-Attack
-#define SE_W013B 160            // Razor Wind 2
-#define SE_W044 161             // Bite
-#define SE_W029 162             // Headbutt
-#define SE_W057 163             // Surf
-#define SE_W056 164             // Hydro Pump
-#define SE_W250 165             // Whirlpool
-#define SE_W030 166             // Horn Attack
-#define SE_W039 167             // Tail Whip
-#define SE_W054 168             // Mist
-#define SE_W077 169             // PoisonPowder
-#define SE_W020 170             // Bind
-#define SE_W082 171             // Dragon Rage
-#define SE_W047 172             // Sing
-#define SE_W195 173             // Perish Song
-#define SE_W006 174             // Pay Day
-#define SE_W091 175             // Dig
-#define SE_W146 176             // Dizzy Punch
-#define SE_W120 177             // Self-Destruct
-#define SE_W153 178             // Explosion
-#define SE_W071B 179            // Absorb 2
-#define SE_W071 180             // Absorb
-#define SE_W103 181             // Screech
-#define SE_W062 182             // BubbleBeam
-#define SE_W062B 183            // BubbleBeam 2
-#define SE_W048 184             // Supersonic
-#define SE_W187 185             // Belly Drum
-#define SE_W118 186             // Metronome
-#define SE_W155 187             // Bonemerang
-#define SE_W122 188             // Lick
-#define SE_W060 189             // Psybeam
-#define SE_W185 190             // Faint Attack
-#define SE_W014 191             // Swords Dance
-#define SE_W043 192             // Leer
-#define SE_W207 193             // Swagger
-#define SE_W207B 194            // Swagger 2
-#define SE_W215 195             // Heal Bell
-#define SE_W109 196             // Confuse Ray
-#define SE_W173 197             // Snore
-#define SE_W280 198             // Brick Break
-#define SE_W202 199             // Giga Drain
-#define SE_W060B 200            // Psybeam 2
-#define SE_W076 201             // SolarBeam
-#define SE_W080 202             // Petal Dance
-#define SE_W100 203             // Teleport
-#define SE_W107 204             // Minimize
-#define SE_W166 205             // Sketch
-#define SE_W129 206             // Swift
-#define SE_W115 207             // Reflect
-#define SE_W112 208             // Barrier
-#define SE_W197 209             // Detect
-#define SE_W199 210             // Lock-On
-#define SE_W236 211             // Moonlight
-#define SE_W204 212             // Charm
-#define SE_W268 213             // Charge
-#define SE_W070 214             // Strength
-#define SE_W063 215             // Hyper Beam
-#define SE_W127 216             // Waterfall
-#define SE_W179 217             // Reversal
-#define SE_W151 218             // Acid Armor
-#define SE_W201 219             // Sandstorm
-#define SE_W161 220             // Tri-Attack
-#define SE_W161B 221            // Tri-Attack 2
-#define SE_W227 222             // Encore
-#define SE_W227B 223            // Encore 2
-#define SE_W226 224             // Baton Pass
-#define SE_W208 225             // Milk Drink
-#define SE_W213 226             // Attract
-#define SE_W213B 227            // Attract 2
-#define SE_W234 228             // Morning Sun
-#define SE_W260 229             // Flatter
-#define SE_W328 230             // Sand Tomb
-#define SE_W320 231             // GrassWhistle
-#define SE_W255 232             // Spit Up
-#define SE_W291 233             // Dive
-#define SE_W089 234             // Earthquake
-#define SE_W239 235             // Twister
-#define SE_W230 236             // Sweet Scent
-#define SE_W281 237             // Yawn
-#define SE_W327 238             // Sky Uppercut
-#define SE_W287 239             // Stat Increased
-#define SE_W257 240             // Heat Wave
-#define SE_W253 241             // Uproar
-#define SE_W258 242             // Hail
-#define SE_W322 243             // Cosmic Power
-#define SE_W298 244             // Teeter Dance
-#define SE_W287B 245            // Stat Decreased
-#define SE_W114 246             // Haze
-#define SE_W063B 247            // Hyper Beam 2
-// FRLG SFX below
-#define SE_RG_W_DOOR 248        // Door
-#define SE_RG_CARD1 249         // Trainer Card 1
-#define SE_RG_CARD2 250         // Trainer Card 2
-#define SE_RG_CARD3 251         // Trainer Card 3
-#define SE_RG_BAG1 252          // Bag Scroll
-#define SE_RG_BAG2 253          // Bag Pocket Change
-#define SE_RG_GETTING 254
-#define SE_RG_SHOP 255          // Cash Register
-#define SE_RG_KITEKI 256        // S.S. Anne Horn
-#define SE_RG_HELP_OP 257       // Help Menu Open
-#define SE_RG_HELP_CL 258       // Help Menu Close
-#define SE_RG_HELP_NG 259       // Help Menu Error
-#define SE_RG_DEOMOV 260        // Deoxys Moves
-#define SE_RG_EXCELLENT 261
-#define SE_RG_NAWAMISS 262
-// end FRLG SFX
-#define SE_TOREEYE 263          // Trainer's Eye Call
-#define SE_TOREOFF 264          // Trainer's Eye Hang Up
-#define SE_HANTEI1 265          // Battle Arena Time's Up 1
-#define SE_HANTEI2 266          // Battle Arena Time's Up 2
-#define SE_CURTAIN 267          // Battle Pike Curtain Open
-#define SE_CURTAIN1 268         // Battle Pike Curtain Close
-#define SE_USSOKI 269           // Sudowoodo
+// Original JP names listed on right, along with any additional notes
 
-#define MUS_TETSUJI 350         // Littleroot Town Test 'TETSUJI'
-#define MUS_FIELD13 351         // GSC - Route 38
-#define MUS_KACHI22 352         // Wild Pokémon Defeated
-#define MUS_KACHI2 353          // Wild Pokémon Defeated with Intro
-#define MUS_KACHI3 354          // Gym Leader Defeated
-#define MUS_KACHI5 355          // Victory! Elite Four
-#define MUS_PCC 356             // Crystal - Pokémon Communication Center
-#define MUS_NIBI 357            // GSC - Viridian/Saffron/Pewter/etc
-#define MUS_SUIKUN 358          // Crystal - Battle! Legendary Beasts
-#define MUS_DOORO1 359          // Route 101
-#define MUS_DOORO_X1 360        // Route 110
-#define MUS_DOORO_X3 361        // Route 120
-#define MUS_MACHI_S2 362        // Petalburg City
-#define MUS_MACHI_S4 363        // Oldale/Lavaridge Town
-#define MUS_GIM 364             // Gym
-#define MUS_NAMINORI 365        // Surfing
-#define MUS_DAN01 366           // Caves and Darkness
-#define MUS_FANFA1 367          // Level Up!
-#define MUS_ME_ASA 368          // Pokémon Healed
-#define MUS_ME_BACHI 369        // Obtained a Badge!
-#define MUS_FANFA4 370          // Obtained an Item!
-#define MUS_FANFA5 371          // Your Pokémon Just Evolved!
-#define MUS_ME_WAZA 372         // Obtained a TM/HM!
-#define MUS_BIJYUTU 373         // Lilycove Museum
-#define MUS_DOORO_X4 374        // Route 122/Intro
-#define MUS_FUNE_KAN 375        // Slateport Museum
-#define MUS_ME_SHINKA 376       // Evolution Intro
-#define MUS_SHINKA 377          // Evolution
-#define MUS_ME_WASURE 378       // Move Deleted/Messed Up Appeal
-#define MUS_SYOUJOEYE 379       // Encounter! Tuber
-#define MUS_BOYEYE 380          // Encounter! Boy
-#define MUS_DAN02 381           // Abandoned Ship/Southern Island
-#define MUS_MACHI_S3 382        // Fortree City/Pacifidlog Town
-#define MUS_ODAMAKI 383         // Professor Birch's Lab
-#define MUS_B_TOWER 384         // Battle Tower (RS)
-#define MUS_SWIMEYE 385         // Encounter! Swimmer
-#define MUS_DAN03 386           // Meteor Falls/Cave of Origin
-#define MUS_ME_KINOMI 387       // Obtained a Berry!
-#define MUS_ME_TAMA 388         // Awakening the Super-Ancient Pokémon
-#define MUS_ME_B_BIG 389        // Slots Jackpot!
-#define MUS_ME_B_SMALL 390      // Slots Victory!
-#define MUS_ME_ZANNEN 391       // Too bad!
-#define MUS_BD_TIME 392         // Roulette!
-#define MUS_TEST1 393           // Contest Test 1
-#define MUS_TEST2 394           // Contest Test 2
-#define MUS_TEST3 395           // Contest Test 3
-#define MUS_TEST4 396           // Contest Test 4
-#define MUS_TEST 397            // Encounter! Gentleman
-#define MUS_GOMACHI0 398        // Verdanturf Town
-#define MUS_GOTOWN 399          // Rustboro/Mauville/Mossdeep City
-#define MUS_POKECEN 400         // Pokémon Center
-#define MUS_NEXTROAD 401        // Route 104
-#define MUS_GRANROAD 402        // Route 119
-#define MUS_CYCLING 403         // Cycling
-#define MUS_FRIENDLY 404        // Pokémart
-#define MUS_MISHIRO 405         // Littleroot Town
-#define MUS_TOZAN 406           // Sky Pillar
-#define MUS_GIRLEYE 407         // Encounter! Girl
-#define MUS_MINAMO 408          // Lilycove City
-#define MUS_ASHROAD 409         // Route 111
-#define MUS_EVENT0 410          // Help me!
-#define MUS_DEEPDEEP 411        // Underwater
-#define MUS_KACHI1 412          // Victory! Trainer
-#define MUS_TITLE3 413          // Title Screen
-#define MUS_DEMO1 414           // Opening Movie
-#define MUS_GIRL_SUP 415        // Encounter! May
-#define MUS_HAGESHII 416        // Encounter! Biker
-#define MUS_KAKKOII 417         // Encounter! Electric Trainer
-#define MUS_KAZANBAI 418        // Route 113
-#define MUS_AQA_0 419           // Encounter! Team Aqua
-#define MUS_TSURETEK 420        // Follow Me!
-#define MUS_BOY_SUP 421         // Encounter! Brendan
-#define MUS_RAINBOW 422         // Ever Grande City
-#define MUS_AYASII 423          // Encounter! Psychic
-#define MUS_KACHI4 424          // Victory! Aqua/Magma Grunt
-#define MUS_ROPEWAY 425         // Cable Car
-#define MUS_CASINO 426          // Game Corner
-#define MUS_HIGHTOWN 427        // Dewford Town
-#define MUS_SAFARI 428          // Safari Zone
-#define MUS_C_ROAD 429          // Victory Road
-#define MUS_AJITO 430           // Aqua/Magma Hideout
-#define MUS_M_BOAT 431          // Sailing
-#define MUS_M_DUNGON 432        // Mt. Pyre (Inside)
-#define MUS_FINECITY 433        // Slateport City
-#define MUS_MACHUPI 434         // Mt. Pyre (Outside)
-#define MUS_P_SCHOOL 435        // Pokémon Trainer's School
-#define MUS_DENDOU 436          // You're the Champion!
-#define MUS_TONEKUSA 437        // Fallarbor Town
-#define MUS_MABOROSI 438        // Sealed Chamber
-#define MUS_CON_FAN 439         // Obtained a Contest Ribbon!
-#define MUS_CONTEST0 440        // Pokémon Contest
-#define MUS_MGM0 441            // Encounter! Team Magma
-#define MUS_T_BATTLE 442        // Opening Battle
-#define MUS_OOAME 443           // The Flood
-#define MUS_HIDERI 444          // The Drought
-#define MUS_RUNECITY 445        // Sootopolis City
-#define MUS_CON_K 446           // Contest/Berry Blending Results
-#define MUS_EIKOU_R 447         // Hall of Fame
-#define MUS_KARAKURI 448        // Trick House
-#define MUS_HUTAGO 449          // Encounter! Kid
-#define MUS_SITENNOU 450        // Encounter! Elite Four
-#define MUS_YAMA_EYE 451        // Encounter! Hiker
-#define MUS_CONLOBBY 452        // Contest Lobby
-#define MUS_INTER_V 453         // Encounter! Gabby and Ty
-#define MUS_DAIGO 454           // Encounter! Wallace
-#define MUS_THANKFOR 455        // Credits
-#define MUS_END 456             // The End
-#define MUS_B_FRONTIER 457      // Battle Frontier
-#define MUS_B_ARENA 458         // Battle Arena
-#define MUS_ME_POINTGET 459     // Obtained Battle Points!
-#define MUS_ME_TORE_EYE 460     // Registered Trainer!
-#define MUS_PYRAMID 461         // Battle Pyramid
-#define MUS_PYRAMID_TOP 462     // Top of the Battle Pyramid
-#define MUS_B_PALACE 463        // Battle Palace
-#define MUS_REKKUU_KOURIN 464   // Rayquaza Enters
-#define MUS_SATTOWER 465        // Battle Tower (Emerald)
-#define MUS_ME_SYMBOLGET 466    // Obtained a Frontier Symbol!
-#define MUS_B_DOME 467          // Battle Dome
-#define MUS_B_TUBE 468          // Battle Pike
-#define MUS_B_FACTORY 469       // Battle Factory
-#define MUS_VS_REKKU 470        // Battle! Legendary Pokémon
-#define MUS_VS_FRONT 471        // Battle! Frontier Brain
-#define MUS_VS_MEW 472          // Battle! Mew
-#define MUS_B_DOME1 473         // Battle Dome Lobby
-#define MUS_BATTLE27 474        // Battle! Wild Pokémon
-#define MUS_BATTLE31 475        // Battle! Team Aqua/Magma
-#define MUS_BATTLE20 476        // Battle! Trainer
-#define MUS_BATTLE32 477        // Battle! Gym Leader
-#define MUS_BATTLE33 478        // Battle! Champion
-#define MUS_BATTLE36 479        // Battle! Regi Trio
-#define MUS_BATTLE34 480        // Battle! Legendary Pokémon (dupe)
-#define MUS_BATTLE35 481        // Battle! Rival
-#define MUS_BATTLE38 482        // Battle! Elite Four
-#define MUS_BATTLE30 483        // Battle! Archie/Maxie
-// FRLG Music Below
-#define MUS_RG_ANNAI 484        // Follow Me!
-#define MUS_RG_SLOT 485         // Game Corner
-#define MUS_RG_AJITO 486        // Rocket Hideout
-#define MUS_RG_GYM 487          // Gym
-#define MUS_RG_PURIN 488        // Jigglypuff's Song
-#define MUS_RG_DEMO 489         // Opening Movie
-#define MUS_RG_TITLE 490        // Title Screen
-#define MUS_RG_GUREN 491        // Cinnabar Island
-#define MUS_RG_SHION 492        // Lavender Town
-#define MUS_RG_KAIHUKU 493      // RBY Pokémon Center Healing
-#define MUS_RG_CYCLING 494      // Cycling
-#define MUS_RG_ROCKET 495       // Encounter! Team Rocket
-#define MUS_RG_SHOUJO 496       // Encounter! Girl
-#define MUS_RG_SHOUNEN 497      // Encounter! Boy
-#define MUS_RG_DENDOU 498       // You're the Champion!
-#define MUS_RG_T_MORI 499       // Viridian Forest
-#define MUS_RG_OTSUKIMI 500     // Mt. Moon
-#define MUS_RG_POKEYASHI 501    // Pokémon Mansion
-#define MUS_RG_ENDING 502       // Credits
-#define MUS_RG_LOAD01 503       // Route 1
-#define MUS_RG_OPENING 504      // Route 24/Intro
-#define MUS_RG_LOAD02 505       // Route 3
-#define MUS_RG_LOAD03 506       // Route 11
-#define MUS_RG_CHAMP_R 507      // Victory Road/Indigo Plateau
-#define MUS_RG_VS_GYM 508       // Battle! Gym Leader/Elite Four
-#define MUS_RG_VS_TORE 509      // Battle! Trainer
-#define MUS_RG_VS_YASEI 510     // Battle! Wild Pokémon
-#define MUS_RG_VS_LAST 511      // Battle! Champion
-#define MUS_RG_MASARA 512       // Pallet Town
-#define MUS_RG_KENKYU 513       // Professor Oak's Lab
-#define MUS_RG_OHKIDO 514       // Professor Oak's Theme
-#define MUS_RG_POKECEN 515      // Pokémon Center
-#define MUS_RG_SANTOAN 516      // S.S. Anne
-#define MUS_RG_NAMINORI 517     // Surfing
-#define MUS_RG_P_TOWER 518      // Pokémon Tower
-#define MUS_RG_SHIRUHU 519      // Silph Co.
-#define MUS_RG_HANADA 520       // Cerulean/Fuschia City
-#define MUS_RG_TAMAMUSI 521     // Celadon City
-#define MUS_RG_WIN_TRE 522      // Victory! Trainer
-#define MUS_RG_WIN_YASEI 523    // Victory! Wild Pokémon
-#define MUS_RG_WIN_GYM 524      // Victory! Gym Leader
-#define MUS_RG_KUCHIBA 525      // Vermillion City
-#define MUS_RG_NIBI 526         // Viridian/Saffron/Pewter City
-#define MUS_RG_RIVAL1 527       // Encounter! Rival
-#define MUS_RG_RIVAL2 528       // Rival's Exit
-#define MUS_RG_FAN2 529         // Fanfare 2
-#define MUS_RG_FAN5 530         // Obtained a Starter!
-#define MUS_RG_FAN6 531         // Pokémon Caught! (Used in Emerald)
-#define MUS_ME_RG_PHOTO 532     // Trainer Photo
-#define MUS_RG_TITLEROG 533     // Game Freak
-#define MUS_RG_GET_YASEI 534    // Pokémon Caught Victory Theme
-#define MUS_RG_SOUSA 535        // Starting Tutorial
-#define MUS_RG_SEKAIKAN 536     // Starting Tutorial 2
-#define MUS_RG_SEIBETU 537      // Starting Tutorial 3
-#define MUS_RG_JUMP 538         // Pokemon Jump Minigame
-#define MUS_RG_UNION 539        // Union Room
-#define MUS_RG_NETWORK 540      // Network Center
-#define MUS_RG_OKURIMONO 541    // Mystery Gift
-#define MUS_RG_KINOMIKUI 542    // Dodrio Berry Picking
-#define MUS_RG_NANADUNGEON 543  // Sevii Caves/Altering Cave (Mt. Moon)
-#define MUS_RG_OSHIE_TV 544     // Follow Me!
-#define MUS_RG_NANASHIMA 545    // Sevii Islands Routes (Lake of Rage)
-#define MUS_RG_NANAISEKI 546    // Sevii Forests (Viridian Forest)
-#define MUS_RG_NANA123 547      // Sevii Islands 1-3 (Viridian/Saffron/Pewter)
-#define MUS_RG_NANA45 548       // Sevii Islands 4-5 (Azalea Town)
-#define MUS_RG_NANA67 549       // Sevii Islands 6-7 (Violet City)
-#define MUS_RG_POKEFUE 550      // Poké Flute
-#define MUS_RG_VS_DEO 551       // Battle! Deoxys
-#define MUS_RG_VS_MYU2 552      // Battle! Mewtwo
-#define MUS_RG_VS_DEN 553       // Battle! Legendary Birds
-#define MUS_RG_EXEYE 554        // Encounter! Gym Leader
-#define MUS_RG_DEOEYE 555       // Encounter! Deoxys
-#define MUS_RG_T_TOWER 556      // Trainer Tower (Gym)
-#define MUS_RG_SLOWMASARA 557   // Pallet Town (Hall of Fame remix)
-#define MUS_RG_TVNOIZE 558      // Teachy TV
-#define PH_TRAP_BLEND 559
-#define PH_TRAP_HELD 560
-#define PH_TRAP_SOLO 561
-#define PH_FACE_BLEND 562
-#define PH_FACE_HELD 563
-#define PH_FACE_SOLO 564
-#define PH_CLOTH_BLEND 565
-#define PH_CLOTH_HELD 566
-#define PH_CLOTH_SOLO 567
-#define PH_DRESS_BLEND 568
-#define PH_DRESS_HELD 569
-#define PH_DRESS_SOLO 570
-#define PH_FLEECE_BLEND 571
-#define PH_FLEECE_HELD 572
-#define PH_FLEECE_SOLO 573
-#define PH_KIT_BLEND 574
-#define PH_KIT_HELD 575
-#define PH_KIT_SOLO 576
-#define PH_PRICE_BLEND 577
-#define PH_PRICE_HELD 578
-#define PH_PRICE_SOLO 579
-#define PH_LOT_BLEND 580
-#define PH_LOT_HELD 581
-#define PH_LOT_SOLO 582
-#define PH_GOAT_BLEND 583
-#define PH_GOAT_HELD 584
-#define PH_GOAT_SOLO 585
-#define PH_THOUGHT_BLEND 586
-#define PH_THOUGHT_HELD 587
-#define PH_THOUGHT_SOLO 588
-#define PH_CHOICE_BLEND 589
-#define PH_CHOICE_HELD 590
-#define PH_CHOICE_SOLO 591
-#define PH_MOUTH_BLEND 592
-#define PH_MOUTH_HELD 593
-#define PH_MOUTH_SOLO 594
-#define PH_FOOT_BLEND 595
-#define PH_FOOT_HELD 596
-#define PH_FOOT_SOLO 597
-#define PH_GOOSE_BLEND 598
-#define PH_GOOSE_HELD 599
-#define PH_GOOSE_SOLO 600
-#define PH_STRUT_BLEND 601
-#define PH_STRUT_HELD 602
-#define PH_STRUT_SOLO 603
-#define PH_CURE_BLEND 604
-#define PH_CURE_HELD 605
-#define PH_CURE_SOLO 606
-#define PH_NURSE_BLEND 607
-#define PH_NURSE_HELD 608
-#define PH_NURSE_SOLO 609
+#define MUS_DUMMY                   0 // MUS_DUMMY
+#define SE_USE_ITEM                 1 // SE_KAIFUKU
+#define SE_PC_LOGIN                 2 // SE_PC_LOGIN
+#define SE_PC_OFF                   3 // SE_PC_OFF
+#define SE_PC_ON                    4 // SE_PC_ON
+#define SE_SELECT                   5 // SE_SELECT
+#define SE_WIN_OPEN                 6 // SE_WIN_OPEN
+#define SE_WALL_HIT                 7 // SE_WALL_HIT
+#define SE_DOOR                     8 // SE_DOOR
+#define SE_EXIT                     9 // SE_KAIDAN
+#define SE_LEDGE                    10 // SE_DANSA
+#define SE_BIKE_BELL                11 // SE_JITENSYA
+#define SE_NOT_EFFECTIVE            12 // SE_KOUKA_L
+#define SE_EFFECTIVE                13 // SE_KOUKA_M
+#define SE_SUPER_EFFECTIVE          14 // SE_KOUKA_H
+#define SE_BALL_OPEN                15 // SE_BOWA2
+#define SE_FAINT                    16 // SE_POKE_DEAD
+#define SE_FLEE                     17 // SE_NIGERU
+#define SE_SLIDING_DOOR             18 // SE_JIDO_DOA
+#define SE_SHIP                     19 // SE_NAMINORI
+#define SE_BANG                     20 // SE_BAN
+#define SE_PIN                      21 // SE_PIN (General "good", commonly for "!")
+#define SE_BOO                      22 // SE_BOO (General "bad")
+#define SE_BALL                     23 // SE_BOWA (Giving Poké Ball to nurse, Poké Ball shake, etc)
+#define SE_CONTEST_PLACE            24 // SE_JYUNI
+#define SE_A                        25 // SE_A (Bard sounds)
+#define SE_I                        26 // SE_I
+#define SE_U                        27 // SE_U
+#define SE_E                        28 // SE_E
+#define SE_O                        29 // SE_O
+#define SE_N                        30 // SE_N
+#define SE_SUCCESS                  31 // SE_SEIKAI
+#define SE_FAILURE                  32 // SE_HAZURE
+#define SE_EXP                      33 // SE_EXP
+#define SE_BIKE_HOP                 34 // SE_JITE_PYOKO
+#define SE_SWITCH                   35 // SE_MU_PACHI
+#define SE_CLICK                    36 // SE_TK_KASYA
+#define SE_FU_ZAKU                  37 // SE_FU_ZAKU (Unknown purpose, unused)
+#define SE_CONTEST_CONDITION_LOSE   38 // SE_FU_ZAKU2
+#define SE_LAVARIDGE_FALL_WARP      39 // SE_FU_ZUZUZU
+#define SE_ICE_STAIRS               40 // SE_RU_GASHIN
+#define SE_ICE_BREAK                41 // SE_RU_GASYAN
+#define SE_ICE_CRACK                42 // SE_RU_BARI
+#define SE_FALL                     43 // SE_RU_HYUU
+#define SE_UNLOCK                   44 // SE_KI_GASYAN
+#define SE_WARP_IN                  45 // SE_TK_WARPIN
+#define SE_WARP_OUT                 46 // SE_TK_WARPOUT
+#define SE_REPEL                    47 // SE_TU_SAA
+#define SE_ROTATING_GATE            48 // SE_HI_TURUN
+#define SE_TRUCK_MOVE               49 // SE_TRACK_MOVE
+#define SE_TRUCK_STOP               50 // SE_TRACK_STOP
+#define SE_TRUCK_UNLOAD             51 // SE_TRACK_HAIKI
+#define SE_TRUCK_DOOR               52 // SE_TRACK_DOOR
+#define SE_BERRY_BLENDER            53 // SE_MOTER
+#define SE_CARD                     54 // SE_CARD (Unused, different from the RS card SE)
+#define SE_SAVE                     55 // SE_SAVE
+#define SE_BALL_BOUNCE_1            56 // SE_KON
+#define SE_BALL_BOUNCE_2            57 // SE_KON2
+#define SE_BALL_BOUNCE_3            58 // SE_KON3
+#define SE_BALL_BOUNCE_4            59 // SE_KON4
+#define SE_BALL_TRADE               60 // SE_SUIKOMU
+#define SE_BALL_THROW               61 // SE_NAGERU
+#define SE_NOTE_C                   62 // SE_TOY_C
+#define SE_NOTE_D                   63 // SE_TOY_D
+#define SE_NOTE_E                   64 // SE_TOY_E
+#define SE_NOTE_F                   65 // SE_TOY_F
+#define SE_NOTE_G                   66 // SE_TOY_G
+#define SE_NOTE_A                   67 // SE_TOY_A
+#define SE_NOTE_B                   68 // SE_TOY_B
+#define SE_NOTE_C_HIGH              69 // SE_TOY_C1
+#define SE_PUDDLE                   70 // SE_MIZU
+#define SE_BRIDGE_WALK              71 // SE_HASHI
+#define SE_ITEMFINDER               72 // SE_DAUGI
+#define SE_DING_DONG                73 // SE_PINPON
+#define SE_BALLOON_RED              74 // SE_FUUSEN1
+#define SE_BALLOON_BLUE             75 // SE_FUUSEN2
+#define SE_BALLOON_YELLOW           76 // SE_FUUSEN3
+#define SE_BREAKABLE_DOOR           77 // SE_TOY_KABE
+#define SE_MUD_BALL                 78 // SE_TOY_DANGO
+#define SE_FIELD_POISON             79 // SE_DOKU
+#define SE_ESCALATOR                80 // SE_ESUKA
+#define SE_THUNDERSTORM             81 // SE_T_AME
+#define SE_THUNDERSTORM_STOP        82 // SE_T_AME_E
+#define SE_DOWNPOUR                 83 // SE_T_OOAME
+#define SE_DOWNPOUR_STOP            84 // SE_T_OOAME_E
+#define SE_RAIN                     85 // SE_T_KOAME
+#define SE_RAIN_STOP                86 // SE_T_KOAME_E
+#define SE_THUNDER                  87 // SE_T_KAMI
+#define SE_THUNDER2                 88 // SE_T_KAMI2
+#define SE_ELEVATOR                 89 // SE_ELEBETA
+#define SE_LOW_HEALTH               90 // SE_HINSI
+#define SE_EXP_MAX                  91 // SE_EXPMAX
+#define SE_ROULETTE_BALL            92 // SE_TAMAKORO
+#define SE_ROULETTE_BALL2           93 // SE_TAMAKORO_E
+#define SE_TAILLOW_WING_FLAP        94 // SE_BASABASA
+#define SE_SHOP                     95 // SE_REGI
+#define SE_CONTEST_HEART            96 // SE_C_GAJI
+#define SE_CONTEST_CURTAIN_RISE     97 // SE_C_MAKU_U
+#define SE_CONTEST_CURTAIN_FALL     98 // SE_C_MAKU_D
+#define SE_CONTEST_ICON_CHANGE      99 // SE_C_PASI
+#define SE_CONTEST_ICON_CLEAR       100 // SE_C_SYU
+#define SE_CONTEST_MONS_TURN        101 // SE_C_PIKON
+#define SE_SHINY                    102 // SE_REAPOKE
+#define SE_INTRO_BLAST              103 // SE_OP_BASYU
+#define SE_MUGSHOT                  104 // SE_BT_START
+#define SE_APPLAUSE                 105 // SE_DENDOU
+#define SE_VEND                     106 // SE_JIHANKI
+#define SE_ORB                      107 // SE_TAMA
+#define SE_DEX_SCROLL               108 // SE_Z_SCROLL
+#define SE_DEX_PAGE                 109 // SE_Z_PAGE
+#define SE_POKENAV_ON               110 // SE_PN_ON
+#define SE_POKENAV_OFF              111 // SE_PN_OFF
+#define SE_DEX_SEARCH               112 // SE_Z_SEARCH
+#define SE_EGG_HATCH                113 // SE_TAMAGO
+#define SE_BALL_TRAY_ENTER          114 // SE_TB_START
+#define SE_BALL_TRAY_BALL           115 // SE_TB_KON
+#define SE_BALL_TRAY_EXIT           116 // SE_TB_KARA
+#define SE_GLASS_FLUTE              117 // SE_BIDORO
+// Move SFX
+#define SE_M_THUNDERBOLT            118 // SE_W085
+#define SE_M_THUNDERBOLT2           119 // SE_W085B
+#define SE_M_HARDEN                 120 // SE_W231
+#define SE_M_NIGHTMARE              121 // SE_W171
+#define SE_M_VITAL_THROW            122 // SE_W233
+#define SE_M_VITAL_THROW2           123 // SE_W233B
+#define SE_M_BUBBLE                 124 // SE_W145
+#define SE_M_BUBBLE2                125 // SE_W145B
+#define SE_M_BUBBLE3                126 // SE_W145C
+#define SE_M_RAIN_DANCE             127 // SE_W240
+#define SE_M_CUT                    128 // SE_W015
+#define SE_M_STRING_SHOT            129 // SE_W081
+#define SE_M_STRING_SHOT2           130 // SE_W081B
+#define SE_M_ROCK_THROW             131 // SE_W088
+#define SE_M_GUST                   132 // SE_W016
+#define SE_M_GUST2                  133 // SE_W016B
+#define SE_M_DOUBLE_SLAP            134 // SE_W003
+#define SE_M_DOUBLE_TEAM            135 // SE_W104
+#define SE_M_RAZOR_WIND             136 // SE_W013
+#define SE_M_ICY_WIND               137 // SE_W196
+#define SE_M_THUNDER_WAVE           138 // SE_W086
+#define SE_M_COMET_PUNCH            139 // SE_W004
+#define SE_M_MEGA_KICK              140 // SE_W025
+#define SE_M_MEGA_KICK2             141 // SE_W025B
+#define SE_M_CRABHAMMER             142 // SE_W152
+#define SE_M_JUMP_KICK              143 // SE_W026
+#define SE_M_FLAME_WHEEL            144 // SE_W172
+#define SE_M_FLAME_WHEEL2           145 // SE_W172B
+#define SE_M_FLAMETHROWER           146 // SE_W053
+#define SE_M_FIRE_PUNCH             147 // SE_W007
+#define SE_M_TOXIC                  148 // SE_W092
+#define SE_M_SACRED_FIRE            149 // SE_W221
+#define SE_M_SACRED_FIRE2           150 // SE_W221B
+#define SE_M_EMBER                  151 // SE_W052
+#define SE_M_TAKE_DOWN              152 // SE_W036
+#define SE_M_BLIZZARD               153 // SE_W059
+#define SE_M_BLIZZARD2              154 // SE_W059B
+#define SE_M_SCRATCH                155 // SE_W010
+#define SE_M_VICEGRIP               156 // SE_W011
+#define SE_M_WING_ATTACK            157 // SE_W017
+#define SE_M_FLY                    158 // SE_W019
+#define SE_M_SAND_ATTACK            159 // SE_W028
+#define SE_M_RAZOR_WIND2            160 // SE_W013B
+#define SE_M_BITE                   161 // SE_W044
+#define SE_M_HEADBUTT               162 // SE_W029
+#define SE_M_SURF                   163 // SE_W057
+#define SE_M_HYDRO_PUMP             164 // SE_W056
+#define SE_M_WHIRLPOOL              165 // SE_W250
+#define SE_M_HORN_ATTACK            166 // SE_W030
+#define SE_M_TAIL_WHIP              167 // SE_W039
+#define SE_M_MIST                   168 // SE_W054
+#define SE_M_POISON_POWDER          169 // SE_W077
+#define SE_M_BIND                   170 // SE_W020
+#define SE_M_DRAGON_RAGE            171 // SE_W082
+#define SE_M_SING                   172 // SE_W047
+#define SE_M_PERISH_SONG            173 // SE_W195
+#define SE_M_PAY_DAY                174 // SE_W006
+#define SE_M_DIG                    175 // SE_W091
+#define SE_M_DIZZY_PUNCH            176 // SE_W146
+#define SE_M_SELF_DESTRUCT          177 // SE_W120
+#define SE_M_EXPLOSION              178 // SE_W153
+#define SE_M_ABSORB_2               179 // SE_W071B
+#define SE_M_ABSORB                 180 // SE_W071
+#define SE_M_SCREECH                181 // SE_W103
+#define SE_M_BUBBLE_BEAM            182 // SE_W062
+#define SE_M_BUBBLE_BEAM2           183 // SE_W062B
+#define SE_M_SUPERSONIC             184 // SE_W048
+#define SE_M_BELLY_DRUM             185 // SE_W187
+#define SE_M_METRONOME              186 // SE_W118
+#define SE_M_BONEMERANG             187 // SE_W155
+#define SE_M_LICK                   188 // SE_W122
+#define SE_M_PSYBEAM                189 // SE_W060
+#define SE_M_FAINT_ATTACK           190 // SE_W185
+#define SE_M_SWORDS_DANCE           191 // SE_W014
+#define SE_M_LEER                   192 // SE_W043
+#define SE_M_SWAGGER                193 // SE_W207
+#define SE_M_SWAGGER2               194 // SE_W207B
+#define SE_M_HEAL_BELL              195 // SE_W215
+#define SE_M_CONFUSE_RAY            196 // SE_W109
+#define SE_M_SNORE                  197 // SE_W173
+#define SE_M_BRICK_BREAK            198 // SE_W280
+#define SE_M_GIGA_DRAIN             199 // SE_W202
+#define SE_M_PSYBEAM2               200 // SE_W060B
+#define SE_M_SOLAR_BEAM             201 // SE_W076
+#define SE_M_PETAL_DANCE            202 // SE_W080
+#define SE_M_TELEPORT               203 // SE_W100
+#define SE_M_MINIMIZE               204 // SE_W107
+#define SE_M_SKETCH                 205 // SE_W166
+#define SE_M_SWIFT                  206 // SE_W129
+#define SE_M_REFLECT                207 // SE_W115
+#define SE_M_BARRIER                208 // SE_W112
+#define SE_M_DETECT                 209 // SE_W197
+#define SE_M_LOCK_ON                210 // SE_W199
+#define SE_M_MOONLIGHT              211 // SE_W236
+#define SE_M_CHARM                  212 // SE_W204
+#define SE_M_CHARGE                 213 // SE_W268
+#define SE_M_STRENGTH               214 // SE_W070
+#define SE_M_HYPER_BEAM             215 // SE_W063
+#define SE_M_WATERFALL              216 // SE_W127
+#define SE_M_REVERSAL               217 // SE_W179
+#define SE_M_ACID_ARMOR             218 // SE_W151
+#define SE_M_SANDSTORM              219 // SE_W201
+#define SE_M_TRI_ATTACK             220 // SE_W161
+#define SE_M_TRI_ATTACK2            221 // SE_W161B
+#define SE_M_ENCORE                 222 // SE_W227
+#define SE_M_ENCORE2                223 // SE_W227B
+#define SE_M_BATON_PASS             224 // SE_W226
+#define SE_M_MILK_DRINK             225 // SE_W208
+#define SE_M_ATTRACT                226 // SE_W213
+#define SE_M_ATTRACT2               227 // SE_W213B
+#define SE_M_MORNING_SUN            228 // SE_W234
+#define SE_M_FLATTER                229 // SE_W260
+#define SE_M_SAND_TOMB              230 // SE_W328
+#define SE_M_GRASSWHISTLE           231 // SE_W320
+#define SE_M_SPIT_UP                232 // SE_W255
+#define SE_M_DIVE                   233 // SE_W291
+#define SE_M_EARTHQUAKE             234 // SE_W089
+#define SE_M_TWISTER                235 // SE_W239
+#define SE_M_SWEET_SCENT            236 // SE_W230
+#define SE_M_YAWN                   237 // SE_W281
+#define SE_M_SKY_UPPERCUT           238 // SE_W327
+#define SE_M_STAT_INCREASE          239 // SE_W287
+#define SE_M_HEAT_WAVE              240 // SE_W257
+#define SE_M_UPROAR                 241 // SE_W253
+#define SE_M_HAIL                   242 // SE_W258
+#define SE_M_COSMIC_POWER           243 // SE_W322
+#define SE_M_TEETER_DANCE           244 // SE_W298
+#define SE_M_STAT_DECREASE          245 // SE_W287B
+#define SE_M_HAZE                   246 // SE_W114
+#define SE_M_HYPER_BEAM2            247 // SE_W063B
+// FRLG SFX
+#define SE_RG_DOOR                  248 // SE_RG_W_DOOR
+#define SE_RG_CARD_FLIP             249 // SE_RG_CARD1
+#define SE_RG_CARD_FLIPPING         250 // SE_RG_CARD2
+#define SE_RG_CARD_OPEN             251 // SE_RG_CARD3
+#define SE_RG_BAG_CURSOR            252 // SE_RG_BAG1
+#define SE_RG_BAG_POCKET            253 // SE_RG_BAG2
+#define SE_RG_BALL_CLICK            254 // SE_RG_GETTING
+#define SE_RG_SHOP                  255 // SE_RG_SHOP
+#define SE_RG_SS_ANNE_HORN          256 // SE_RG_KITEKI
+#define SE_RG_HELP_OPEN             257 // SE_RG_HELP_OP
+#define SE_RG_HELP_CLOSE            258 // SE_RG_HELP_CL
+#define SE_RG_HELP_ERROR            259 // SE_RG_HELP_NG
+#define SE_RG_DEOXYS_MOVE           260 // SE_RG_DEOMOV
+#define SE_RG_POKE_JUMP_SUCCESS     261 // SE_RG_EXCELLENT
+#define SE_RG_POKE_JUMP_FAILURE     262 // SE_RG_NAWAMISS 
+// New Emerald SFX
+#define SE_POKENAV_CALL             263 // SE_TOREEYE
+#define SE_POKENAV_HANG_UP          264 // SE_TOREOFF
+#define SE_ARENA_TIMEUP1            265 // SE_HANTEI1
+#define SE_ARENA_TIMEUP2            266 // SE_HANTEI2
+#define SE_PIKE_CURTAIN_CLOSE       267 // SE_CURTAIN
+#define SE_PIKE_CURTAIN_OPEN        268 // SE_CURTAIN1
+#define SE_SUDOWOODO_SHAKE          269 // SE_USSOKI
 
-#define MUS_ROUTE_118 0x7FFF  // map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic().
+// Music
+#define MUS_LITTLEROOT_TEST         350 // MUS_TETSUJI
+#define MUS_GSC_ROUTE38             351 // MUS_FIELD13
+#define MUS_CAUGHT                  352 // MUS_KACHI22
+#define MUS_VICTORY_WILD            353 // MUS_KACHI2
+#define MUS_VICTORY_GYM_LEADER      354 // MUS_KACHI3
+#define MUS_VICTORY_LEAGUE          355 // MUS_KACHI5
+#define MUS_C_COMM_CENTER           356 // MUS_PCC
+#define MUS_GSC_PEWTER              357 // MUS_NIBI
+#define MUS_C_VS_LEGEND_BEAST       358 // MUS_SUIKUN
+#define MUS_ROUTE101                359 // MUS_DOORO1
+#define MUS_ROUTE110                360 // MUS_DOORO_X1
+#define MUS_ROUTE120                361 // MUS_DOORO_X3
+#define MUS_PETALBURG               362 // MUS_MACHI_S2
+#define MUS_OLDALE                  363 // MUS_MACHI_S4
+#define MUS_GYM                     364 // MUS_GIM
+#define MUS_SURF                    365 // MUS_NAMINORI
+#define MUS_PETALBURG_WOODS         366 // MUS_DAN01
+#define MUS_LEVEL_UP                367 // MUS_FANFA1
+#define MUS_HEAL                    368 // MUS_ME_ASA
+#define MUS_OBTAIN_BADGE            369 // MUS_ME_BACHI
+#define MUS_OBTAIN_ITEM             370 // MUS_FANFA4
+#define MUS_EVOLVED                 371 // MUS_FANFA5
+#define MUS_OBTAIN_TMHM             372 // MUS_ME_WAZA
+#define MUS_LILYCOVE_MUSEUM         373 // MUS_BIJYUTU
+#define MUS_ROUTE122                374 // MUS_DOORO_X4
+#define MUS_OCEANIC_MUSEUM          375 // MUS_FUNE_KAN
+#define MUS_EVOLUTION_INTRO         376 // MUS_ME_SHINKA
+#define MUS_EVOLUTION               377 // MUS_SHINKA
+#define MUS_MOVE_DELETED            378 // MUS_ME_WASURE
+#define MUS_ENCOUNTER_GIRL          379 // MUS_SYOUJOEYE
+#define MUS_ENCOUNTER_MALE          380 // MUS_BOYEYE
+#define MUS_ABANDONED_SHIP          381 // MUS_DAN02
+#define MUS_FORTREE                 382 // MUS_MACHI_S3
+#define MUS_BIRCH_LAB               383 // MUS_ODAMAKI
+#define MUS_B_TOWER_RS              384 // MUS_B_TOWER
+#define MUS_ENCOUNTER_SWIMMER       385 // MUS_SWIMEYE
+#define MUS_CAVE_OF_ORIGIN          386 // MUS_DAN03
+#define MUS_OBTAIN_BERRY            387 // MUS_ME_KINOMI
+#define MUS_AWAKEN_LEGEND           388 // MUS_ME_TAMA
+#define MUS_SLOTS_JACKPOT           389 // MUS_ME_B_BIG
+#define MUS_SLOTS_WIN               390 // MUS_ME_B_SMALL
+#define MUS_TOO_BAD                 391 // MUS_ME_ZANNEN
+#define MUS_ROULETTE                392 // MUS_BD_TIME
+#define MUS_LINK_CONTEST_P1         393 // MUS_TEST1
+#define MUS_LINK_CONTEST_P2         394 // MUS_TEST2
+#define MUS_LINK_CONTEST_P3         395 // MUS_TEST3
+#define MUS_LINK_CONTEST_P4         396 // MUS_TEST4
+#define MUS_ENCOUNTER_RICH          397 // MUS_TEST
+#define MUS_VERDANTURF              398 // MUS_GOMACHI0
+#define MUS_RUSTBORO                399 // MUS_GOTOWN
+#define MUS_POKE_CENTER             400 // MUS_POKECEN
+#define MUS_ROUTE104                401 // MUS_NEXTROAD
+#define MUS_ROUTE119                402 // MUS_GRANROAD
+#define MUS_CYCLING                 403 // MUS_CYCLING
+#define MUS_POKE_MART               404 // MUS_FRIENDLY
+#define MUS_LITTLEROOT              405 // MUS_MISHIRO
+#define MUS_MT_CHIMNEY              406 // MUS_TOZAN
+#define MUS_ENCOUNTER_FEMALE        407 // MUS_GIRLEYE
+#define MUS_LILYCOVE                408 // MUS_MINAMO
+#define MUS_ROUTE111                409 // MUS_ASHROAD
+#define MUS_HELP                    410 // MUS_EVENT0
+#define MUS_UNDERWATER              411 // MUS_DEEPDEEP
+#define MUS_VICTORY_TRAINER         412 // MUS_KACHI1
+#define MUS_TITLE                   413 // MUS_TITLE3
+#define MUS_INTRO                   414 // MUS_DEMO1
+#define MUS_ENCOUNTER_MAY           415 // MUS_GIRL_SUP
+#define MUS_ENCOUNTER_INTENSE       416 // MUS_HAGESHII
+#define MUS_ENCOUNTER_COOL          417 // MUS_KAKKOII
+#define MUS_ROUTE113                418 // MUS_KAZANBAI
+#define MUS_ENCOUNTER_AQUA          419 // MUS_AQA_0
+#define MUS_FOLLOW_ME               420 // MUS_TSURETEK
+#define MUS_ENCOUNTER_BRENDAN       421 // MUS_BOY_SUP
+#define MUS_EVER_GRANDE             422 // MUS_RAINBOW
+#define MUS_ENCOUNTER_SUSPICIOUS    423 // MUS_AYASII
+#define MUS_VICTORY_AQUA_MAGMA      424 // MUS_KACHI4
+#define MUS_CABLE_CAR               425 // MUS_ROPEWAY
+#define MUS_GAME_CORNER             426 // MUS_CASINO
+#define MUS_DEWFORD                 427 // MUS_HIGHTOWN
+#define MUS_SAFARI_ZONE             428 // MUS_SAFARI
+#define MUS_VICTORY_ROAD            429 // MUS_C_ROAD
+#define MUS_AQUA_MAGMA_HIDEOUT      430 // MUS_AJITO
+#define MUS_SAILING                 431 // MUS_M_BOAT
+#define MUS_MT_PYRE                 432 // MUS_M_DUNGON
+#define MUS_SLATEPORT               433 // MUS_FINECITY
+#define MUS_MT_PYRE_EXTERIOR        434 // MUS_MACHUPI
+#define MUS_SCHOOL                  435 // MUS_P_SCHOOL
+#define MUS_HALL_OF_FAME            436 // MUS_DENDOU
+#define MUS_FALLARBOR               437 // MUS_TONEKUSA
+#define MUS_SEALED_CHAMBER          438 // MUS_MABOROSI
+#define MUS_CONTEST_WINNER          439 // MUS_CON_FAN
+#define MUS_CONTEST                 440 // MUS_CONTEST0
+#define MUS_ENCOUNTER_MAGMA         441 // MUS_MGM0
+#define MUS_INTRO_BATTLE            442 // MUS_T_BATTLE
+#define MUS_ABNORMAL_WEATHER        443 // MUS_OOAME (Replaces MUS_WEATHER_KYOGRE from R/S)
+#define MUS_WEATHER_GROUDON         444 // MUS_HIDERI (Unused, from R/S)
+#define MUS_SOOTOPOLIS              445 // MUS_RUNECITY
+#define MUS_CONTEST_RESULTS         446 // MUS_CON_K
+#define MUS_HALL_OF_FAME_ROOM       447 // MUS_EIKOU_R
+#define MUS_TRICK_HOUSE             448 // MUS_KARAKURI
+#define MUS_ENCOUNTER_TWINS         449 // MUS_HUTAGO
+#define MUS_ENCOUNTER_ELITE_FOUR    450 // MUS_SITENNOU
+#define MUS_ENCOUNTER_HIKER         451 // MUS_YAMA_EYE
+#define MUS_CONTEST_LOBBY           452 // MUS_CONLOBBY
+#define MUS_ENCOUNTER_INTERVIEWER   453 // MUS_INTER_V
+#define MUS_ENCOUNTER_CHAMPION      454 // MUS_DAIGO
+#define MUS_CREDITS                 455 // MUS_THANKFOR
+#define MUS_END                     456 // MUS_END
+#define MUS_B_FRONTIER              457 // MUS_B_FRONTIER
+#define MUS_B_ARENA                 458 // MUS_B_ARENA
+#define MUS_OBTAIN_B_POINTS         459 // MUS_ME_POINTGET
+#define MUS_REGISTER_MATCH_CALL     460 // MUS_ME_TORE_EYE
+#define MUS_B_PYRAMID               461 // MUS_PYRAMID
+#define MUS_B_PYRAMID_TOP           462 // MUS_PYRAMID_TOP
+#define MUS_B_PALACE                463 // MUS_B_PALACE
+#define MUS_RAYQUAZA_APPEARS        464 // MUS_REKKUU_KOURIN
+#define MUS_B_TOWER                 465 // MUS_SATTOWER
+#define MUS_OBTAIN_SYMBOL           466 // MUS_ME_SYMBOLGET
+#define MUS_B_DOME                  467 // MUS_B_DOME
+#define MUS_B_PIKE                  468 // MUS_B_TUBE
+#define MUS_B_FACTORY               469 // MUS_B_FACTORY
+#define MUS_VS_RAYQUAZA             470 // MUS_VS_REKKU (Identical to MUS_VS_KYOGRE_GROUDON)
+#define MUS_VS_FRONTIER_BRAIN       471 // MUS_VS_FRONT
+#define MUS_VS_MEW                  472 // MUS_VS_MEW
+#define MUS_B_DOME_LOBBY            473 // MUS_B_DOME1
+#define MUS_VS_WILD                 474 // MUS_BATTLE27
+#define MUS_VS_AQUA_MAGMA           475 // MUS_BATTLE31
+#define MUS_VS_TRAINER              476 // MUS_BATTLE20
+#define MUS_VS_GYM_LEADER           477 // MUS_BATTLE32
+#define MUS_VS_CHAMPION             478 // MUS_BATTLE33
+#define MUS_VS_REGI                 479 // MUS_BATTLE36
+#define MUS_VS_KYOGRE_GROUDON       480 // MUS_BATTLE34
+#define MUS_VS_RIVAL                481 // MUS_BATTLE35
+#define MUS_VS_ELITE_FOUR           482 // MUS_BATTLE38
+#define MUS_VS_AQUA_MAGMA_LEADER    483 // MUS_BATTLE30
+// FRLG Music
+#define MUS_RG_FOLLOW_ME            484 // MUS_RG_ANNAI
+#define MUS_RG_GAME_CORNER          485 // MUS_RG_SLOT
+#define MUS_RG_ROCKET_HIDEOUT       486 // MUS_RG_AJITO
+#define MUS_RG_GYM                  487 // MUS_RG_GYM
+#define MUS_RG_JIGGLYPUFF           488 // MUS_RG_PURIN
+#define MUS_RG_INTRO_FIGHT          489 // MUS_RG_DEMO
+#define MUS_RG_TITLE                490 // MUS_RG_TITLE
+#define MUS_RG_CINNABAR             491 // MUS_RG_GUREN
+#define MUS_RG_LAVENDER             492 // MUS_RG_SHION
+#define MUS_RG_HEAL                 493 // MUS_RG_KAIHUKU
+#define MUS_RG_CYCLING              494 // MUS_RG_CYCLING
+#define MUS_RG_ENCOUNTER_ROCKET     495 // MUS_RG_ROCKET
+#define MUS_RG_ENCOUNTER_GIRL       496 // MUS_RG_SHOUJO
+#define MUS_RG_ENCOUNTER_BOY        497 // MUS_RG_SHOUNEN
+#define MUS_RG_HALL_OF_FAME         498 // MUS_RG_DENDOU
+#define MUS_RG_VIRIDIAN_FOREST      499 // MUS_RG_T_MORI
+#define MUS_RG_MT_MOON              500 // MUS_RG_OTSUKIMI
+#define MUS_RG_POKE_MANSION         501 // MUS_RG_POKEYASHI
+#define MUS_RG_CREDITS              502 // MUS_RG_ENDING
+#define MUS_RG_ROUTE1               503 // MUS_RG_LOAD01
+#define MUS_RG_ROUTE24              504 // MUS_RG_OPENING
+#define MUS_RG_ROUTE3               505 // MUS_RG_LOAD02
+#define MUS_RG_ROUTE11              506 // MUS_RG_LOAD03
+#define MUS_RG_VICTORY_ROAD         507 // MUS_RG_CHAMP_R
+#define MUS_RG_VS_GYM_LEADER        508 // MUS_RG_VS_GYM
+#define MUS_RG_VS_TRAINER           509 // MUS_RG_VS_TORE
+#define MUS_RG_VS_WILD              510 // MUS_RG_VS_YASEI
+#define MUS_RG_VS_CHAMPION          511 // MUS_RG_VS_LAST
+#define MUS_RG_PALLET               512 // MUS_RG_MASARA
+#define MUS_RG_OAK_LAB              513 // MUS_RG_KENKYU
+#define MUS_RG_OAK                  514 // MUS_RG_OHKIDO
+#define MUS_RG_POKE_CENTER          515 // MUS_RG_POKECEN
+#define MUS_RG_SS_ANNE              516 // MUS_RG_SANTOAN
+#define MUS_RG_SURF                 517 // MUS_RG_NAMINORI
+#define MUS_RG_POKE_TOWER           518 // MUS_RG_P_TOWER
+#define MUS_RG_SILPH                519 // MUS_RG_SHIRUHU
+#define MUS_RG_FUCHSIA              520 // MUS_RG_HANADA
+#define MUS_RG_CELADON              521 // MUS_RG_TAMAMUSI
+#define MUS_RG_VICTORY_TRAINER      522 // MUS_RG_WIN_TRE (Identical to MUS_VICTORY_TRAINER)
+#define MUS_RG_VICTORY_WILD         523 // MUS_RG_WIN_YASEI (Identical to MUS_VICTORY_WILD)
+#define MUS_RG_VICTORY_GYM_LEADER   524 // MUS_RG_WIN_GYM (Identical to MUS_VICTORY_GYM_LEADER)
+#define MUS_RG_VERMILLION           525 // MUS_RG_KUCHIBA
+#define MUS_RG_PEWTER               526 // MUS_RG_NIBI
+#define MUS_RG_ENCOUNTER_RIVAL      527 // MUS_RG_RIVAL1
+#define MUS_RG_RIVAL_EXIT           528 // MUS_RG_RIVAL2
+#define MUS_RG_DEX_RATING           529 // MUS_RG_FAN2
+#define MUS_RG_OBTAIN_KEY_ITEM      530 // MUS_RG_FAN5
+#define MUS_RG_CAUGHT_INTRO         531 // MUS_RG_FAN6
+#define MUS_RG_PHOTO                532 // MUS_ME_RG_PHOTO
+#define MUS_RG_GAME_FREAK           533 // MUS_RG_TITLEROG
+#define MUS_RG_CAUGHT               534 // MUS_RG_GET_YASEI
+#define MUS_RG_NEW_GAME_INSTRUCT    535 // MUS_RG_SOUSA
+#define MUS_RG_NEW_GAME_INTRO       536 // MUS_RG_SEKAIKAN
+#define MUS_RG_NEW_GAME_EXIT        537 // MUS_RG_SEIBETU
+#define MUS_RG_POKE_JUMP            538 // MUS_RG_JUMP
+#define MUS_RG_UNION_ROOM           539 // MUS_RG_UNION
+#define MUS_RG_NET_CENTER           540 // MUS_RG_NETWORK
+#define MUS_RG_MYSTERY_GIFT         541 // MUS_RG_OKURIMONO
+#define MUS_RG_BERRY_PICK           542 // MUS_RG_KINOMIKUI
+#define MUS_RG_SEVII_CAVE           543 // MUS_RG_NANADUNGEON (Identical to MUS_RG_MT_MOON)
+#define MUS_RG_TEACHY_TV_SHOW       544 // MUS_RG_OSHIE_TV (Identical to MUS_RG_FOLLOW_ME)
+#define MUS_RG_SEVII_ROUTE          545 // MUS_RG_NANASHIMA
+#define MUS_RG_SEVII_DUNGEON        546 // MUS_RG_NANAISEKI (Identical to MUS_RG_VIRIDIAN_FOREST)
+#define MUS_RG_SEVII_123            547 // MUS_RG_NANA123 (Identical to MUS_RG_PEWTER)
+#define MUS_RG_SEVII_45             548 // MUS_RG_NANA45
+#define MUS_RG_SEVII_67             549 // MUS_RG_NANA67
+#define MUS_RG_POKE_FLUTE           550 // MUS_RG_POKEFUE
+#define MUS_RG_VS_DEOXYS            551 // MUS_RG_VS_DEO
+#define MUS_RG_VS_MEWTWO            552 // MUS_RG_VS_MYU2
+#define MUS_RG_VS_LEGEND            553 // MUS_RG_VS_DEN
+#define MUS_RG_ENCOUNTER_GYM_LEADER 554 // MUS_RG_EXEYE
+#define MUS_RG_ENCOUNTER_DEOXYS     555 // MUS_RG_DEOEYE
+#define MUS_RG_TRAINER_TOWER        556 // MUS_RG_T_TOWER
+#define MUS_RG_SLOW_PALLET          557 // MUS_RG_SLOWMASARA
+#define MUS_RG_TEACHY_TV_MENU       558 // MUS_RG_TVNOIZE
 
-#define MUS_NONE 0xFFFF
+#define PH_TRAP_BLEND               559
+#define PH_TRAP_HELD                560
+#define PH_TRAP_SOLO                561
+#define PH_FACE_BLEND               562
+#define PH_FACE_HELD                563
+#define PH_FACE_SOLO                564
+#define PH_CLOTH_BLEND              565
+#define PH_CLOTH_HELD               566
+#define PH_CLOTH_SOLO               567
+#define PH_DRESS_BLEND              568
+#define PH_DRESS_HELD               569
+#define PH_DRESS_SOLO               570
+#define PH_FLEECE_BLEND             571
+#define PH_FLEECE_HELD              572
+#define PH_FLEECE_SOLO              573
+#define PH_KIT_BLEND                574
+#define PH_KIT_HELD                 575
+#define PH_KIT_SOLO                 576
+#define PH_PRICE_BLEND              577
+#define PH_PRICE_HELD               578
+#define PH_PRICE_SOLO               579
+#define PH_LOT_BLEND                580
+#define PH_LOT_HELD                 581
+#define PH_LOT_SOLO                 582
+#define PH_GOAT_BLEND               583
+#define PH_GOAT_HELD                584
+#define PH_GOAT_SOLO                585
+#define PH_THOUGHT_BLEND            586
+#define PH_THOUGHT_HELD             587
+#define PH_THOUGHT_SOLO             588
+#define PH_CHOICE_BLEND             589
+#define PH_CHOICE_HELD              590
+#define PH_CHOICE_SOLO              591
+#define PH_MOUTH_BLEND              592
+#define PH_MOUTH_HELD               593
+#define PH_MOUTH_SOLO               594
+#define PH_FOOT_BLEND               595
+#define PH_FOOT_HELD                596
+#define PH_FOOT_SOLO                597
+#define PH_GOOSE_BLEND              598
+#define PH_GOOSE_HELD               599
+#define PH_GOOSE_SOLO               600
+#define PH_STRUT_BLEND              601
+#define PH_STRUT_HELD               602
+#define PH_STRUT_SOLO               603
+#define PH_CURE_BLEND               604
+#define PH_CURE_HELD                605
+#define PH_CURE_SOLO                606
+#define PH_NURSE_BLEND              607
+#define PH_NURSE_HELD               608
+#define PH_NURSE_SOLO               609
+
+#define MUS_ROUTE118                0x7FFF  // Map is split into 2 music sections. controlled by GetCurrLocationDefaultMusic().
+
+#define MUS_NONE                    0xFFFF
 
 #endif  // GUARD_CONSTANTS_SONGS_H
diff --git a/ld_script.txt b/ld_script.txt
index ba95289de..9be5e4db3 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -698,7 +698,7 @@ SECTIONS {
     ALIGN(4)
     {
         sound/songs/midi/mus_dummy.o(.rodata);
-        sound/songs/midi/se_kaifuku.o(.rodata);
+        sound/songs/midi/se_use_item.o(.rodata);
         sound/songs/midi/se_pc_login.o(.rodata);
         sound/songs/midi/se_pc_off.o(.rodata);
         sound/songs/midi/se_pc_on.o(.rodata);
@@ -706,476 +706,476 @@ SECTIONS {
         sound/songs/se_win_open.o(.rodata);
         sound/songs/se_wall_hit.o(.rodata);
         sound/songs/midi/se_door.o(.rodata);
-        sound/songs/midi/se_kaidan.o(.rodata);
-        sound/songs/midi/se_dansa.o(.rodata);
-        sound/songs/midi/se_jitensya.o(.rodata);
-        sound/songs/midi/se_kouka_l.o(.rodata);
-        sound/songs/midi/se_kouka_m.o(.rodata);
-        sound/songs/midi/se_kouka_h.o(.rodata);
-        sound/songs/midi/se_bowa2.o(.rodata);
-        sound/songs/midi/se_poke_dead.o(.rodata);
-        sound/songs/midi/se_nigeru.o(.rodata);
-        sound/songs/midi/se_jido_doa.o(.rodata);
-        sound/songs/midi/se_naminori.o(.rodata);
-        sound/songs/midi/se_ban.o(.rodata);
+        sound/songs/midi/se_exit.o(.rodata);
+        sound/songs/midi/se_ledge.o(.rodata);
+        sound/songs/midi/se_bike_bell.o(.rodata);
+        sound/songs/midi/se_not_effective.o(.rodata);
+        sound/songs/midi/se_effective.o(.rodata);
+        sound/songs/midi/se_super_effective.o(.rodata);
+        sound/songs/midi/se_ball_open.o(.rodata);
+        sound/songs/midi/se_faint.o(.rodata);
+        sound/songs/midi/se_flee.o(.rodata);
+        sound/songs/midi/se_sliding_door.o(.rodata);
+        sound/songs/midi/se_ship.o(.rodata);
+        sound/songs/midi/se_bang.o(.rodata);
         sound/songs/midi/se_pin.o(.rodata);
         sound/songs/midi/se_boo.o(.rodata);
-        sound/songs/midi/se_bowa.o(.rodata);
-        sound/songs/midi/se_jyuni.o(.rodata);
+        sound/songs/midi/se_ball.o(.rodata);
+        sound/songs/midi/se_contest_place.o(.rodata);
         sound/songs/midi/se_a.o(.rodata);
         sound/songs/midi/se_i.o(.rodata);
         sound/songs/midi/se_u.o(.rodata);
         sound/songs/midi/se_e.o(.rodata);
         sound/songs/midi/se_o.o(.rodata);
         sound/songs/midi/se_n.o(.rodata);
-        sound/songs/midi/se_seikai.o(.rodata);
-        sound/songs/midi/se_hazure.o(.rodata);
+        sound/songs/midi/se_success.o(.rodata);
+        sound/songs/midi/se_failure.o(.rodata);
         sound/songs/midi/se_exp.o(.rodata);
-        sound/songs/midi/se_jite_pyoko.o(.rodata);
-        sound/songs/midi/se_mu_pachi.o(.rodata);
-        sound/songs/midi/se_tk_kasya.o(.rodata);
+        sound/songs/midi/se_bike_hop.o(.rodata);
+        sound/songs/midi/se_switch.o(.rodata);
+        sound/songs/midi/se_click.o(.rodata);
         sound/songs/midi/se_fu_zaku.o(.rodata);
-        sound/songs/midi/se_fu_zaku2.o(.rodata);
-        sound/songs/midi/se_fu_zuzuzu.o(.rodata);
-        sound/songs/midi/se_ru_gashin.o(.rodata);
-        sound/songs/midi/se_ru_gasyan.o(.rodata);
-        sound/songs/midi/se_ru_bari.o(.rodata);
-        sound/songs/midi/se_ru_hyuu.o(.rodata);
-        sound/songs/midi/se_ki_gasyan.o(.rodata);
-        sound/songs/midi/se_tk_warpin.o(.rodata);
-        sound/songs/midi/se_tk_warpout.o(.rodata);
-        sound/songs/midi/se_tu_saa.o(.rodata);
-        sound/songs/midi/se_hi_turun.o(.rodata);
-        sound/songs/midi/se_track_move.o(.rodata);
-        sound/songs/midi/se_track_stop.o(.rodata);
-        sound/songs/midi/se_track_haiki.o(.rodata);
-        sound/songs/midi/se_track_door.o(.rodata);
-        sound/songs/midi/se_moter.o(.rodata);
+        sound/songs/midi/se_contest_condition_lose.o(.rodata);
+        sound/songs/midi/se_lavaridge_fall_warp.o(.rodata);
+        sound/songs/midi/se_ice_stairs.o(.rodata);
+        sound/songs/midi/se_ice_break.o(.rodata);
+        sound/songs/midi/se_ice_crack.o(.rodata);
+        sound/songs/midi/se_fall.o(.rodata);
+        sound/songs/midi/se_unlock.o(.rodata);
+        sound/songs/midi/se_warp_in.o(.rodata);
+        sound/songs/midi/se_warp_out.o(.rodata);
+        sound/songs/midi/se_repel.o(.rodata);
+        sound/songs/midi/se_rotating_gate.o(.rodata);
+        sound/songs/midi/se_truck_move.o(.rodata);
+        sound/songs/midi/se_truck_stop.o(.rodata);
+        sound/songs/midi/se_truck_unload.o(.rodata);
+        sound/songs/midi/se_truck_door.o(.rodata);
+        sound/songs/midi/se_berry_blender.o(.rodata);
         sound/songs/midi/se_card.o(.rodata);
         sound/songs/midi/se_save.o(.rodata);
-        sound/songs/midi/se_kon.o(.rodata);
-        sound/songs/midi/se_kon2.o(.rodata);
-        sound/songs/midi/se_kon3.o(.rodata);
-        sound/songs/midi/se_kon4.o(.rodata);
-        sound/songs/midi/se_suikomu.o(.rodata);
-        sound/songs/midi/se_nageru.o(.rodata);
-        sound/songs/midi/se_toy_c.o(.rodata);
-        sound/songs/midi/se_toy_d.o(.rodata);
-        sound/songs/midi/se_toy_e.o(.rodata);
-        sound/songs/midi/se_toy_f.o(.rodata);
-        sound/songs/midi/se_toy_g.o(.rodata);
-        sound/songs/midi/se_toy_a.o(.rodata);
-        sound/songs/midi/se_toy_b.o(.rodata);
-        sound/songs/midi/se_toy_c1.o(.rodata);
-        sound/songs/midi/se_mizu.o(.rodata);
-        sound/songs/midi/se_hashi.o(.rodata);
-        sound/songs/midi/se_daugi.o(.rodata);
-        sound/songs/midi/se_pinpon.o(.rodata);
-        sound/songs/midi/se_fuusen1.o(.rodata);
-        sound/songs/midi/se_fuusen2.o(.rodata);
-        sound/songs/midi/se_fuusen3.o(.rodata);
-        sound/songs/midi/se_toy_kabe.o(.rodata);
-        sound/songs/midi/se_toy_dango.o(.rodata);
-        sound/songs/midi/se_doku.o(.rodata);
-        sound/songs/midi/se_esuka.o(.rodata);
-        sound/songs/midi/se_t_ame.o(.rodata);
-        sound/songs/midi/se_t_ame_e.o(.rodata);
-        sound/songs/midi/se_t_ooame.o(.rodata);
-        sound/songs/midi/se_t_ooame_e.o(.rodata);
-        sound/songs/midi/se_t_koame.o(.rodata);
-        sound/songs/midi/se_t_koame_e.o(.rodata);
-        sound/songs/midi/se_t_kami.o(.rodata);
-        sound/songs/midi/se_t_kami2.o(.rodata);
-        sound/songs/midi/se_elebeta.o(.rodata);
-        sound/songs/midi/se_hinsi.o(.rodata);
-        sound/songs/midi/se_expmax.o(.rodata);
-        sound/songs/midi/se_tamakoro.o(.rodata);
-        sound/songs/midi/se_tamakoro_e.o(.rodata);
-        sound/songs/midi/se_basabasa.o(.rodata);
-        sound/songs/midi/se_regi.o(.rodata);
-        sound/songs/midi/se_c_gaji.o(.rodata);
-        sound/songs/midi/se_c_maku_u.o(.rodata);
-        sound/songs/midi/se_c_maku_d.o(.rodata);
-        sound/songs/midi/se_c_pasi.o(.rodata);
-        sound/songs/midi/se_c_syu.o(.rodata);
-        sound/songs/midi/se_c_pikon.o(.rodata);
-        sound/songs/midi/se_reapoke.o(.rodata);
-        sound/songs/midi/se_op_basyu.o(.rodata);
-        sound/songs/midi/se_bt_start.o(.rodata);
-        sound/songs/midi/se_dendou.o(.rodata);
-        sound/songs/midi/se_jihanki.o(.rodata);
-        sound/songs/midi/se_tama.o(.rodata);
-        sound/songs/se_z_scroll.o(.rodata);
-        sound/songs/se_z_page.o(.rodata);
-        sound/songs/midi/se_pn_on.o(.rodata);
-        sound/songs/midi/se_pn_off.o(.rodata);
-        sound/songs/midi/se_z_search.o(.rodata);
-        sound/songs/midi/se_tamago.o(.rodata);
-        sound/songs/midi/se_tb_start.o(.rodata);
-        sound/songs/midi/se_tb_kon.o(.rodata);
-        sound/songs/midi/se_tb_kara.o(.rodata);
-        sound/songs/midi/se_bidoro.o(.rodata);
-        sound/songs/se_w085.o(.rodata);
-        sound/songs/se_w085b.o(.rodata);
-        sound/songs/se_w231.o(.rodata);
-        sound/songs/se_w171.o(.rodata);
-        sound/songs/se_w233.o(.rodata);
-        sound/songs/se_w233b.o(.rodata);
-        sound/songs/se_w145.o(.rodata);
-        sound/songs/se_w145b.o(.rodata);
-        sound/songs/se_w145c.o(.rodata);
-        sound/songs/se_w240.o(.rodata);
-        sound/songs/midi/se_w015.o(.rodata);
-        sound/songs/se_w081.o(.rodata);
-        sound/songs/se_w081b.o(.rodata);
-        sound/songs/se_w088.o(.rodata);
-        sound/songs/midi/se_w016.o(.rodata);
-        sound/songs/midi/se_w016b.o(.rodata);
-        sound/songs/midi/se_w003.o(.rodata);
-        sound/songs/se_w104.o(.rodata);
-        sound/songs/midi/se_w013.o(.rodata);
-        sound/songs/se_w196.o(.rodata);
-        sound/songs/se_w086.o(.rodata);
-        sound/songs/midi/se_w004.o(.rodata);
-        sound/songs/midi/se_w025.o(.rodata);
-        sound/songs/midi/se_w025b.o(.rodata);
-        sound/songs/se_w152.o(.rodata);
-        sound/songs/midi/se_w026.o(.rodata);
-        sound/songs/se_w172.o(.rodata);
-        sound/songs/se_w172b.o(.rodata);
-        sound/songs/se_w053.o(.rodata);
-        sound/songs/midi/se_w007.o(.rodata);
-        sound/songs/se_w092.o(.rodata);
-        sound/songs/se_w221.o(.rodata);
-        sound/songs/se_w221b.o(.rodata);
-        sound/songs/se_w052.o(.rodata);
-        sound/songs/midi/se_w036.o(.rodata);
-        sound/songs/se_w059.o(.rodata);
-        sound/songs/se_w059b.o(.rodata);
-        sound/songs/midi/se_w010.o(.rodata);
-        sound/songs/midi/se_w011.o(.rodata);
-        sound/songs/midi/se_w017.o(.rodata);
-        sound/songs/midi/se_w019.o(.rodata);
-        sound/songs/midi/se_w028.o(.rodata);
-        sound/songs/midi/se_w013b.o(.rodata);
-        sound/songs/se_w044.o(.rodata);
-        sound/songs/midi/se_w029.o(.rodata);
-        sound/songs/se_w057.o(.rodata);
-        sound/songs/se_w056.o(.rodata);
-        sound/songs/se_w250.o(.rodata);
-        sound/songs/midi/se_w030.o(.rodata);
-        sound/songs/midi/se_w039.o(.rodata);
-        sound/songs/se_w054.o(.rodata);
-        sound/songs/se_w077.o(.rodata);
-        sound/songs/midi/se_w020.o(.rodata);
-        sound/songs/se_w082.o(.rodata);
-        sound/songs/se_w047.o(.rodata);
-        sound/songs/se_w195.o(.rodata);
-        sound/songs/midi/se_w006.o(.rodata);
-        sound/songs/se_w091.o(.rodata);
-        sound/songs/se_w146.o(.rodata);
-        sound/songs/se_w120.o(.rodata);
-        sound/songs/se_w153.o(.rodata);
-        sound/songs/se_w071b.o(.rodata);
-        sound/songs/se_w071.o(.rodata);
-        sound/songs/se_w103.o(.rodata);
-        sound/songs/se_w062.o(.rodata);
-        sound/songs/se_w062b.o(.rodata);
-        sound/songs/se_w048.o(.rodata);
-        sound/songs/se_w187.o(.rodata);
-        sound/songs/se_w118.o(.rodata);
-        sound/songs/se_w155.o(.rodata);
-        sound/songs/se_w122.o(.rodata);
-        sound/songs/se_w060.o(.rodata);
-        sound/songs/se_w185.o(.rodata);
-        sound/songs/midi/se_w014.o(.rodata);
-        sound/songs/midi/se_w043.o(.rodata);
-        sound/songs/se_w207.o(.rodata);
-        sound/songs/se_w207b.o(.rodata);
-        sound/songs/se_w215.o(.rodata);
-        sound/songs/se_w109.o(.rodata);
-        sound/songs/se_w173.o(.rodata);
-        sound/songs/se_w280.o(.rodata);
-        sound/songs/se_w202.o(.rodata);
-        sound/songs/se_w060b.o(.rodata);
-        sound/songs/se_w076.o(.rodata);
-        sound/songs/se_w080.o(.rodata);
-        sound/songs/se_w100.o(.rodata);
-        sound/songs/se_w107.o(.rodata);
-        sound/songs/se_w166.o(.rodata);
-        sound/songs/se_w129.o(.rodata);
-        sound/songs/se_w115.o(.rodata);
-        sound/songs/se_w112.o(.rodata);
-        sound/songs/se_w197.o(.rodata);
-        sound/songs/se_w199.o(.rodata);
-        sound/songs/se_w236.o(.rodata);
-        sound/songs/se_w204.o(.rodata);
-        sound/songs/se_w268.o(.rodata);
-        sound/songs/se_w070.o(.rodata);
-        sound/songs/se_w063.o(.rodata);
-        sound/songs/se_w127.o(.rodata);
-        sound/songs/se_w179.o(.rodata);
-        sound/songs/se_w151.o(.rodata);
-        sound/songs/se_w201.o(.rodata);
-        sound/songs/se_w161.o(.rodata);
-        sound/songs/se_w161b.o(.rodata);
-        sound/songs/se_w227.o(.rodata);
-        sound/songs/se_w227b.o(.rodata);
-        sound/songs/se_w226.o(.rodata);
-        sound/songs/se_w208.o(.rodata);
-        sound/songs/se_w213.o(.rodata);
-        sound/songs/se_w213b.o(.rodata);
-        sound/songs/se_w234.o(.rodata);
-        sound/songs/se_w260.o(.rodata);
-        sound/songs/se_w328.o(.rodata);
-        sound/songs/se_w320.o(.rodata);
-        sound/songs/se_w255.o(.rodata);
-        sound/songs/se_w291.o(.rodata);
-        sound/songs/se_w089.o(.rodata);
-        sound/songs/se_w239.o(.rodata);
-        sound/songs/se_w230.o(.rodata);
-        sound/songs/se_w281.o(.rodata);
-        sound/songs/se_w327.o(.rodata);
-        sound/songs/se_w287.o(.rodata);
-        sound/songs/se_w257.o(.rodata);
-        sound/songs/se_w253.o(.rodata);
-        sound/songs/se_w258.o(.rodata);
-        sound/songs/se_w322.o(.rodata);
-        sound/songs/se_w298.o(.rodata);
-        sound/songs/se_w287b.o(.rodata);
-        sound/songs/se_w114.o(.rodata);
-        sound/songs/se_w063b.o(.rodata);
-        sound/songs/midi/se_rg_w_door.o(.rodata);
-        sound/songs/midi/se_rg_card1.o(.rodata);
-        sound/songs/midi/se_rg_card2.o(.rodata);
-        sound/songs/midi/se_rg_card3.o(.rodata);
-        sound/songs/midi/se_rg_bag1.o(.rodata);
-        sound/songs/midi/se_rg_bag2.o(.rodata);
-        sound/songs/midi/se_rg_getting.o(.rodata);
+        sound/songs/midi/se_ball_bounce_1.o(.rodata);
+        sound/songs/midi/se_ball_bounce_2.o(.rodata);
+        sound/songs/midi/se_ball_bounce_3.o(.rodata);
+        sound/songs/midi/se_ball_bounce_4.o(.rodata);
+        sound/songs/midi/se_ball_trade.o(.rodata);
+        sound/songs/midi/se_ball_throw.o(.rodata);
+        sound/songs/midi/se_note_c.o(.rodata);
+        sound/songs/midi/se_note_d.o(.rodata);
+        sound/songs/midi/se_note_e.o(.rodata);
+        sound/songs/midi/se_note_f.o(.rodata);
+        sound/songs/midi/se_note_g.o(.rodata);
+        sound/songs/midi/se_note_a.o(.rodata);
+        sound/songs/midi/se_note_b.o(.rodata);
+        sound/songs/midi/se_note_c_high.o(.rodata);
+        sound/songs/midi/se_puddle.o(.rodata);
+        sound/songs/midi/se_bridge_walk.o(.rodata);
+        sound/songs/midi/se_itemfinder.o(.rodata);
+        sound/songs/midi/se_ding_dong.o(.rodata);
+        sound/songs/midi/se_balloon_red.o(.rodata);
+        sound/songs/midi/se_balloon_blue.o(.rodata);
+        sound/songs/midi/se_balloon_yellow.o(.rodata);
+        sound/songs/midi/se_breakable_door.o(.rodata);
+        sound/songs/midi/se_mud_ball.o(.rodata);
+        sound/songs/midi/se_field_poison.o(.rodata);
+        sound/songs/midi/se_escalator.o(.rodata);
+        sound/songs/midi/se_thunderstorm.o(.rodata);
+        sound/songs/midi/se_thunderstorm_stop.o(.rodata);
+        sound/songs/midi/se_downpour.o(.rodata);
+        sound/songs/midi/se_downpour_stop.o(.rodata);
+        sound/songs/midi/se_rain.o(.rodata);
+        sound/songs/midi/se_rain_stop.o(.rodata);
+        sound/songs/midi/se_thunder.o(.rodata);
+        sound/songs/midi/se_thunder2.o(.rodata);
+        sound/songs/midi/se_elevator.o(.rodata);
+        sound/songs/midi/se_low_health.o(.rodata);
+        sound/songs/midi/se_exp_max.o(.rodata);
+        sound/songs/midi/se_roulette_ball.o(.rodata);
+        sound/songs/midi/se_roulette_ball2.o(.rodata);
+        sound/songs/midi/se_taillow_wing_flap.o(.rodata);
+        sound/songs/midi/se_shop.o(.rodata);
+        sound/songs/midi/se_contest_heart.o(.rodata);
+        sound/songs/midi/se_contest_curtain_rise.o(.rodata);
+        sound/songs/midi/se_contest_curtain_fall.o(.rodata);
+        sound/songs/midi/se_contest_icon_change.o(.rodata);
+        sound/songs/midi/se_contest_icon_clear.o(.rodata);
+        sound/songs/midi/se_contest_mons_turn.o(.rodata);
+        sound/songs/midi/se_shiny.o(.rodata);
+        sound/songs/midi/se_intro_blast.o(.rodata);
+        sound/songs/midi/se_mugshot.o(.rodata);
+        sound/songs/midi/se_applause.o(.rodata);
+        sound/songs/midi/se_vend.o(.rodata);
+        sound/songs/midi/se_orb.o(.rodata);
+        sound/songs/se_dex_scroll.o(.rodata);
+        sound/songs/se_dex_page.o(.rodata);
+        sound/songs/midi/se_pokenav_on.o(.rodata);
+        sound/songs/midi/se_pokenav_off.o(.rodata);
+        sound/songs/midi/se_dex_search.o(.rodata);
+        sound/songs/midi/se_egg_hatch.o(.rodata);
+        sound/songs/midi/se_ball_tray_enter.o(.rodata);
+        sound/songs/midi/se_ball_tray_ball.o(.rodata);
+        sound/songs/midi/se_ball_tray_exit.o(.rodata);
+        sound/songs/midi/se_glass_flute.o(.rodata);
+        sound/songs/se_m_thunderbolt.o(.rodata);
+        sound/songs/se_m_thunderbolt2.o(.rodata);
+        sound/songs/se_m_harden.o(.rodata);
+        sound/songs/se_m_nightmare.o(.rodata);
+        sound/songs/se_m_vital_throw.o(.rodata);
+        sound/songs/se_m_vital_throw2.o(.rodata);
+        sound/songs/se_m_bubble.o(.rodata);
+        sound/songs/se_m_bubble2.o(.rodata);
+        sound/songs/se_m_bubble3.o(.rodata);
+        sound/songs/se_m_rain_dance.o(.rodata);
+        sound/songs/midi/se_m_cut.o(.rodata);
+        sound/songs/se_m_string_shot.o(.rodata);
+        sound/songs/se_m_string_shot2.o(.rodata);
+        sound/songs/se_m_rock_throw.o(.rodata);
+        sound/songs/midi/se_m_gust.o(.rodata);
+        sound/songs/midi/se_m_gust2.o(.rodata);
+        sound/songs/midi/se_m_double_slap.o(.rodata);
+        sound/songs/se_m_double_team.o(.rodata);
+        sound/songs/midi/se_m_razor_wind.o(.rodata);
+        sound/songs/se_m_icy_wind.o(.rodata);
+        sound/songs/se_m_thunder_wave.o(.rodata);
+        sound/songs/midi/se_m_comet_punch.o(.rodata);
+        sound/songs/midi/se_m_mega_kick.o(.rodata);
+        sound/songs/midi/se_m_mega_kick2.o(.rodata);
+        sound/songs/se_m_crabhammer.o(.rodata);
+        sound/songs/midi/se_m_jump_kick.o(.rodata);
+        sound/songs/se_m_flame_wheel.o(.rodata);
+        sound/songs/se_m_flame_wheel2.o(.rodata);
+        sound/songs/se_m_flamethrower.o(.rodata);
+        sound/songs/midi/se_m_fire_punch.o(.rodata);
+        sound/songs/se_m_toxic.o(.rodata);
+        sound/songs/se_m_sacred_fire.o(.rodata);
+        sound/songs/se_m_sacred_fire2.o(.rodata);
+        sound/songs/se_m_ember.o(.rodata);
+        sound/songs/midi/se_m_take_down.o(.rodata);
+        sound/songs/se_m_blizzard.o(.rodata);
+        sound/songs/se_m_blizzard2.o(.rodata);
+        sound/songs/midi/se_m_scratch.o(.rodata);
+        sound/songs/midi/se_m_vicegrip.o(.rodata);
+        sound/songs/midi/se_m_wing_attack.o(.rodata);
+        sound/songs/midi/se_m_fly.o(.rodata);
+        sound/songs/midi/se_m_sand_attack.o(.rodata);
+        sound/songs/midi/se_m_razor_wind2.o(.rodata);
+        sound/songs/se_m_bite.o(.rodata);
+        sound/songs/midi/se_m_headbutt.o(.rodata);
+        sound/songs/se_m_surf.o(.rodata);
+        sound/songs/se_m_hydro_pump.o(.rodata);
+        sound/songs/se_m_whirlpool.o(.rodata);
+        sound/songs/midi/se_m_horn_attack.o(.rodata);
+        sound/songs/midi/se_m_tail_whip.o(.rodata);
+        sound/songs/se_m_mist.o(.rodata);
+        sound/songs/se_m_poison_powder.o(.rodata);
+        sound/songs/midi/se_m_bind.o(.rodata);
+        sound/songs/se_m_dragon_rage.o(.rodata);
+        sound/songs/se_m_sing.o(.rodata);
+        sound/songs/se_m_perish_song.o(.rodata);
+        sound/songs/midi/se_m_pay_day.o(.rodata);
+        sound/songs/se_m_dig.o(.rodata);
+        sound/songs/se_m_dizzy_punch.o(.rodata);
+        sound/songs/se_m_self_destruct.o(.rodata);
+        sound/songs/se_m_explosion.o(.rodata);
+        sound/songs/se_m_absorb_2.o(.rodata);
+        sound/songs/se_m_absorb.o(.rodata);
+        sound/songs/se_m_screech.o(.rodata);
+        sound/songs/se_m_bubble_beam.o(.rodata);
+        sound/songs/se_m_bubble_beam2.o(.rodata);
+        sound/songs/se_m_supersonic.o(.rodata);
+        sound/songs/se_m_belly_drum.o(.rodata);
+        sound/songs/se_m_metronome.o(.rodata);
+        sound/songs/se_m_bonemerang.o(.rodata);
+        sound/songs/se_m_lick.o(.rodata);
+        sound/songs/se_m_psybeam.o(.rodata);
+        sound/songs/se_m_faint_attack.o(.rodata);
+        sound/songs/midi/se_m_swords_dance.o(.rodata);
+        sound/songs/midi/se_m_leer.o(.rodata);
+        sound/songs/se_m_swagger.o(.rodata);
+        sound/songs/se_m_swagger2.o(.rodata);
+        sound/songs/se_m_heal_bell.o(.rodata);
+        sound/songs/se_m_confuse_ray.o(.rodata);
+        sound/songs/se_m_snore.o(.rodata);
+        sound/songs/se_m_brick_break.o(.rodata);
+        sound/songs/se_m_giga_drain.o(.rodata);
+        sound/songs/se_m_psybeam2.o(.rodata);
+        sound/songs/se_m_solar_beam.o(.rodata);
+        sound/songs/se_m_petal_dance.o(.rodata);
+        sound/songs/se_m_teleport.o(.rodata);
+        sound/songs/se_m_minimize.o(.rodata);
+        sound/songs/se_m_sketch.o(.rodata);
+        sound/songs/se_m_swift.o(.rodata);
+        sound/songs/se_m_reflect.o(.rodata);
+        sound/songs/se_m_barrier.o(.rodata);
+        sound/songs/se_m_detect.o(.rodata);
+        sound/songs/se_m_lock_on.o(.rodata);
+        sound/songs/se_m_moonlight.o(.rodata);
+        sound/songs/se_m_charm.o(.rodata);
+        sound/songs/se_m_charge.o(.rodata);
+        sound/songs/se_m_strength.o(.rodata);
+        sound/songs/se_m_hyper_beam.o(.rodata);
+        sound/songs/se_m_waterfall.o(.rodata);
+        sound/songs/se_m_reversal.o(.rodata);
+        sound/songs/se_m_acid_armor.o(.rodata);
+        sound/songs/se_m_sandstorm.o(.rodata);
+        sound/songs/se_m_tri_attack.o(.rodata);
+        sound/songs/se_m_tri_attack2.o(.rodata);
+        sound/songs/se_m_encore.o(.rodata);
+        sound/songs/se_m_encore2.o(.rodata);
+        sound/songs/se_m_baton_pass.o(.rodata);
+        sound/songs/se_m_milk_drink.o(.rodata);
+        sound/songs/se_m_attract.o(.rodata);
+        sound/songs/se_m_attract2.o(.rodata);
+        sound/songs/se_m_morning_sun.o(.rodata);
+        sound/songs/se_m_flatter.o(.rodata);
+        sound/songs/se_m_sand_tomb.o(.rodata);
+        sound/songs/se_m_grasswhistle.o(.rodata);
+        sound/songs/se_m_spit_up.o(.rodata);
+        sound/songs/se_m_dive.o(.rodata);
+        sound/songs/se_m_earthquake.o(.rodata);
+        sound/songs/se_m_twister.o(.rodata);
+        sound/songs/se_m_sweet_scent.o(.rodata);
+        sound/songs/se_m_yawn.o(.rodata);
+        sound/songs/se_m_sky_uppercut.o(.rodata);
+        sound/songs/se_m_stat_increase.o(.rodata);
+        sound/songs/se_m_heat_wave.o(.rodata);
+        sound/songs/se_m_uproar.o(.rodata);
+        sound/songs/se_m_hail.o(.rodata);
+        sound/songs/se_m_cosmic_power.o(.rodata);
+        sound/songs/se_m_teeter_dance.o(.rodata);
+        sound/songs/se_m_stat_decrease.o(.rodata);
+        sound/songs/se_m_haze.o(.rodata);
+        sound/songs/se_m_hyper_beam2.o(.rodata);
+        sound/songs/midi/se_rg_door.o(.rodata);
+        sound/songs/midi/se_rg_card_flip.o(.rodata);
+        sound/songs/midi/se_rg_card_flipping.o(.rodata);
+        sound/songs/midi/se_rg_card_open.o(.rodata);
+        sound/songs/midi/se_rg_bag_cursor.o(.rodata);
+        sound/songs/midi/se_rg_bag_pocket.o(.rodata);
+        sound/songs/midi/se_rg_ball_click.o(.rodata);
         sound/songs/midi/se_rg_shop.o(.rodata);
-        sound/songs/midi/se_rg_kiteki.o(.rodata);
-        sound/songs/midi/se_rg_help_op.o(.rodata);
-        sound/songs/midi/se_rg_help_cl.o(.rodata);
-        sound/songs/midi/se_rg_help_ng.o(.rodata);
-        sound/songs/midi/se_rg_deomov.o(.rodata);
-        sound/songs/midi/se_rg_excellent.o(.rodata);
-        sound/songs/midi/se_rg_nawamiss.o(.rodata);
-        sound/songs/midi/se_toreeye.o(.rodata);
-        sound/songs/midi/se_toreoff.o(.rodata);
-        sound/songs/midi/se_hantei1.o(.rodata);
-        sound/songs/midi/se_hantei2.o(.rodata);
-        sound/songs/midi/se_curtain.o(.rodata);
-        sound/songs/midi/se_curtain1.o(.rodata);
-        sound/songs/midi/se_ussoki.o(.rodata);
-        sound/songs/midi/mus_tetsuji.o(.rodata);
-        sound/songs/midi/mus_field13.o(.rodata);
-        sound/songs/midi/mus_kachi22.o(.rodata);
-        sound/songs/midi/mus_kachi2.o(.rodata);
-        sound/songs/midi/mus_kachi3.o(.rodata);
-        sound/songs/midi/mus_kachi5.o(.rodata);
-        sound/songs/midi/mus_pcc.o(.rodata);
-        sound/songs/midi/mus_nibi.o(.rodata);
-        sound/songs/midi/mus_suikun.o(.rodata);
-        sound/songs/midi/mus_dooro1.o(.rodata);
-        sound/songs/midi/mus_dooro_x1.o(.rodata);
-        sound/songs/midi/mus_dooro_x3.o(.rodata);
-        sound/songs/midi/mus_machi_s2.o(.rodata);
-        sound/songs/midi/mus_machi_s4.o(.rodata);
-        sound/songs/midi/mus_gim.o(.rodata);
-        sound/songs/midi/mus_naminori.o(.rodata);
-        sound/songs/midi/mus_dan01.o(.rodata);
-        sound/songs/midi/mus_fanfa1.o(.rodata);
-        sound/songs/midi/mus_me_asa.o(.rodata);
-        sound/songs/midi/mus_me_bachi.o(.rodata);
-        sound/songs/midi/mus_fanfa4.o(.rodata);
-        sound/songs/midi/mus_fanfa5.o(.rodata);
-        sound/songs/midi/mus_me_waza.o(.rodata);
-        sound/songs/midi/mus_bijyutu.o(.rodata);
-        sound/songs/midi/mus_dooro_x4.o(.rodata);
-        sound/songs/midi/mus_fune_kan.o(.rodata);
-        sound/songs/midi/mus_me_shinka.o(.rodata);
-        sound/songs/midi/mus_shinka.o(.rodata);
-        sound/songs/midi/mus_me_wasure.o(.rodata);
-        sound/songs/midi/mus_syoujoeye.o(.rodata);
-        sound/songs/midi/mus_boyeye.o(.rodata);
-        sound/songs/midi/mus_dan02.o(.rodata);
-        sound/songs/midi/mus_machi_s3.o(.rodata);
-        sound/songs/midi/mus_odamaki.o(.rodata);
-        sound/songs/midi/mus_b_tower.o(.rodata);
-        sound/songs/midi/mus_swimeye.o(.rodata);
-        sound/songs/midi/mus_dan03.o(.rodata);
-        sound/songs/midi/mus_me_kinomi.o(.rodata);
-        sound/songs/midi/mus_me_tama.o(.rodata);
-        sound/songs/midi/mus_me_b_big.o(.rodata);
-        sound/songs/midi/mus_me_b_small.o(.rodata);
-        sound/songs/midi/mus_me_zannen.o(.rodata);
-        sound/songs/midi/mus_bd_time.o(.rodata);
-        sound/songs/midi/mus_test1.o(.rodata);
-        sound/songs/midi/mus_test2.o(.rodata);
-        sound/songs/midi/mus_test3.o(.rodata);
-        sound/songs/midi/mus_test4.o(.rodata);
-        sound/songs/midi/mus_test.o(.rodata);
-        sound/songs/midi/mus_gomachi0.o(.rodata);
-        sound/songs/midi/mus_gotown.o(.rodata);
-        sound/songs/midi/mus_pokecen.o(.rodata);
-        sound/songs/midi/mus_nextroad.o(.rodata);
-        sound/songs/midi/mus_granroad.o(.rodata);
+        sound/songs/midi/se_rg_ss_anne_horn.o(.rodata);
+        sound/songs/midi/se_rg_help_open.o(.rodata);
+        sound/songs/midi/se_rg_help_close.o(.rodata);
+        sound/songs/midi/se_rg_help_error.o(.rodata);
+        sound/songs/midi/se_rg_deoxys_move.o(.rodata);
+        sound/songs/midi/se_rg_poke_jump_success.o(.rodata);
+        sound/songs/midi/se_rg_poke_jump_failure.o(.rodata);
+        sound/songs/midi/se_pokenav_call.o(.rodata);
+        sound/songs/midi/se_pokenav_hang_up.o(.rodata);
+        sound/songs/midi/se_arena_timeup1.o(.rodata);
+        sound/songs/midi/se_arena_timeup2.o(.rodata);
+        sound/songs/midi/se_pike_curtain_close.o(.rodata);
+        sound/songs/midi/se_pike_curtain_open.o(.rodata);
+        sound/songs/midi/se_sudowoodo_shake.o(.rodata);
+        sound/songs/midi/mus_littleroot_test.o(.rodata);
+        sound/songs/midi/mus_gsc_route38.o(.rodata);
+        sound/songs/midi/mus_caught.o(.rodata);
+        sound/songs/midi/mus_victory_wild.o(.rodata);
+        sound/songs/midi/mus_victory_gym_leader.o(.rodata);
+        sound/songs/midi/mus_victory_league.o(.rodata);
+        sound/songs/midi/mus_c_comm_center.o(.rodata);
+        sound/songs/midi/mus_gsc_pewter.o(.rodata);
+        sound/songs/midi/mus_c_vs_legend_beast.o(.rodata);
+        sound/songs/midi/mus_route101.o(.rodata);
+        sound/songs/midi/mus_route110.o(.rodata);
+        sound/songs/midi/mus_route120.o(.rodata);
+        sound/songs/midi/mus_petalburg.o(.rodata);
+        sound/songs/midi/mus_oldale.o(.rodata);
+        sound/songs/midi/mus_gym.o(.rodata);
+        sound/songs/midi/mus_surf.o(.rodata);
+        sound/songs/midi/mus_petalburg_woods.o(.rodata);
+        sound/songs/midi/mus_level_up.o(.rodata);
+        sound/songs/midi/mus_heal.o(.rodata);
+        sound/songs/midi/mus_obtain_badge.o(.rodata);
+        sound/songs/midi/mus_obtain_item.o(.rodata);
+        sound/songs/midi/mus_evolved.o(.rodata);
+        sound/songs/midi/mus_obtain_tmhm.o(.rodata);
+        sound/songs/midi/mus_lilycove_museum.o(.rodata);
+        sound/songs/midi/mus_route122.o(.rodata);
+        sound/songs/midi/mus_oceanic_museum.o(.rodata);
+        sound/songs/midi/mus_evolution_intro.o(.rodata);
+        sound/songs/midi/mus_evolution.o(.rodata);
+        sound/songs/midi/mus_move_deleted.o(.rodata);
+        sound/songs/midi/mus_encounter_girl.o(.rodata);
+        sound/songs/midi/mus_encounter_male.o(.rodata);
+        sound/songs/midi/mus_abandoned_ship.o(.rodata);
+        sound/songs/midi/mus_fortree.o(.rodata);
+        sound/songs/midi/mus_birch_lab.o(.rodata);
+        sound/songs/midi/mus_b_tower_rs.o(.rodata);
+        sound/songs/midi/mus_encounter_swimmer.o(.rodata);
+        sound/songs/midi/mus_cave_of_origin.o(.rodata);
+        sound/songs/midi/mus_obtain_berry.o(.rodata);
+        sound/songs/midi/mus_awaken_legend.o(.rodata);
+        sound/songs/midi/mus_slots_jackpot.o(.rodata);
+        sound/songs/midi/mus_slots_win.o(.rodata);
+        sound/songs/midi/mus_too_bad.o(.rodata);
+        sound/songs/midi/mus_roulette.o(.rodata);
+        sound/songs/midi/mus_link_contest_p1.o(.rodata);
+        sound/songs/midi/mus_link_contest_p2.o(.rodata);
+        sound/songs/midi/mus_link_contest_p3.o(.rodata);
+        sound/songs/midi/mus_link_contest_p4.o(.rodata);
+        sound/songs/midi/mus_encounter_rich.o(.rodata);
+        sound/songs/midi/mus_verdanturf.o(.rodata);
+        sound/songs/midi/mus_rustboro.o(.rodata);
+        sound/songs/midi/mus_poke_center.o(.rodata);
+        sound/songs/midi/mus_route104.o(.rodata);
+        sound/songs/midi/mus_route119.o(.rodata);
         sound/songs/midi/mus_cycling.o(.rodata);
-        sound/songs/midi/mus_friendly.o(.rodata);
-        sound/songs/midi/mus_mishiro.o(.rodata);
-        sound/songs/midi/mus_tozan.o(.rodata);
-        sound/songs/midi/mus_girleye.o(.rodata);
-        sound/songs/midi/mus_minamo.o(.rodata);
-        sound/songs/midi/mus_ashroad.o(.rodata);
-        sound/songs/midi/mus_event0.o(.rodata);
-        sound/songs/midi/mus_deepdeep.o(.rodata);
-        sound/songs/midi/mus_kachi1.o(.rodata);
-        sound/songs/midi/mus_title3.o(.rodata);
-        sound/songs/midi/mus_demo1.o(.rodata);
-        sound/songs/midi/mus_girl_sup.o(.rodata);
-        sound/songs/midi/mus_hageshii.o(.rodata);
-        sound/songs/midi/mus_kakkoii.o(.rodata);
-        sound/songs/midi/mus_kazanbai.o(.rodata);
-        sound/songs/midi/mus_aqa_0.o(.rodata);
-        sound/songs/midi/mus_tsuretek.o(.rodata);
-        sound/songs/midi/mus_boy_sup.o(.rodata);
-        sound/songs/midi/mus_rainbow.o(.rodata);
-        sound/songs/midi/mus_ayasii.o(.rodata);
-        sound/songs/midi/mus_kachi4.o(.rodata);
-        sound/songs/midi/mus_ropeway.o(.rodata);
-        sound/songs/midi/mus_casino.o(.rodata);
-        sound/songs/midi/mus_hightown.o(.rodata);
-        sound/songs/midi/mus_safari.o(.rodata);
-        sound/songs/midi/mus_c_road.o(.rodata);
-        sound/songs/midi/mus_ajito.o(.rodata);
-        sound/songs/midi/mus_m_boat.o(.rodata);
-        sound/songs/midi/mus_m_dungon.o(.rodata);
-        sound/songs/midi/mus_finecity.o(.rodata);
-        sound/songs/midi/mus_machupi.o(.rodata);
-        sound/songs/midi/mus_p_school.o(.rodata);
-        sound/songs/midi/mus_dendou.o(.rodata);
-        sound/songs/midi/mus_tonekusa.o(.rodata);
-        sound/songs/midi/mus_maborosi.o(.rodata);
-        sound/songs/midi/mus_con_fan.o(.rodata);
-        sound/songs/midi/mus_contest0.o(.rodata);
-        sound/songs/midi/mus_mgm0.o(.rodata);
-        sound/songs/midi/mus_t_battle.o(.rodata);
-        sound/songs/midi/mus_ooame.o(.rodata);
-        sound/songs/midi/mus_hideri.o(.rodata);
-        sound/songs/midi/mus_runecity.o(.rodata);
-        sound/songs/midi/mus_con_k.o(.rodata);
-        sound/songs/midi/mus_eikou_r.o(.rodata);
-        sound/songs/midi/mus_karakuri.o(.rodata);
-        sound/songs/midi/mus_hutago.o(.rodata);
-        sound/songs/midi/mus_sitennou.o(.rodata);
-        sound/songs/midi/mus_yama_eye.o(.rodata);
-        sound/songs/midi/mus_conlobby.o(.rodata);
-        sound/songs/midi/mus_inter_v.o(.rodata);
-        sound/songs/midi/mus_daigo.o(.rodata);
-        sound/songs/midi/mus_thankfor.o(.rodata);
+        sound/songs/midi/mus_poke_mart.o(.rodata);
+        sound/songs/midi/mus_littleroot.o(.rodata);
+        sound/songs/midi/mus_mt_chimney.o(.rodata);
+        sound/songs/midi/mus_encounter_female.o(.rodata);
+        sound/songs/midi/mus_lilycove.o(.rodata);
+        sound/songs/midi/mus_route111.o(.rodata);
+        sound/songs/midi/mus_help.o(.rodata);
+        sound/songs/midi/mus_underwater.o(.rodata);
+        sound/songs/midi/mus_victory_trainer.o(.rodata);
+        sound/songs/midi/mus_title.o(.rodata);
+        sound/songs/midi/mus_intro.o(.rodata);
+        sound/songs/midi/mus_encounter_may.o(.rodata);
+        sound/songs/midi/mus_encounter_intense.o(.rodata);
+        sound/songs/midi/mus_encounter_cool.o(.rodata);
+        sound/songs/midi/mus_route113.o(.rodata);
+        sound/songs/midi/mus_encounter_aqua.o(.rodata);
+        sound/songs/midi/mus_follow_me.o(.rodata);
+        sound/songs/midi/mus_encounter_brendan.o(.rodata);
+        sound/songs/midi/mus_ever_grande.o(.rodata);
+        sound/songs/midi/mus_encounter_suspicious.o(.rodata);
+        sound/songs/midi/mus_victory_aqua_magma.o(.rodata);
+        sound/songs/midi/mus_cable_car.o(.rodata);
+        sound/songs/midi/mus_game_corner.o(.rodata);
+        sound/songs/midi/mus_dewford.o(.rodata);
+        sound/songs/midi/mus_safari_zone.o(.rodata);
+        sound/songs/midi/mus_victory_road.o(.rodata);
+        sound/songs/midi/mus_aqua_magma_hideout.o(.rodata);
+        sound/songs/midi/mus_sailing.o(.rodata);
+        sound/songs/midi/mus_mt_pyre.o(.rodata);
+        sound/songs/midi/mus_slateport.o(.rodata);
+        sound/songs/midi/mus_mt_pyre_exterior.o(.rodata);
+        sound/songs/midi/mus_school.o(.rodata);
+        sound/songs/midi/mus_hall_of_fame.o(.rodata);
+        sound/songs/midi/mus_fallarbor.o(.rodata);
+        sound/songs/midi/mus_sealed_chamber.o(.rodata);
+        sound/songs/midi/mus_contest_winner.o(.rodata);
+        sound/songs/midi/mus_contest.o(.rodata);
+        sound/songs/midi/mus_encounter_magma.o(.rodata);
+        sound/songs/midi/mus_intro_battle.o(.rodata);
+        sound/songs/midi/mus_abnormal_weather.o(.rodata);
+        sound/songs/midi/mus_weather_groudon.o(.rodata);
+        sound/songs/midi/mus_sootopolis.o(.rodata);
+        sound/songs/midi/mus_contest_results.o(.rodata);
+        sound/songs/midi/mus_hall_of_fame_room.o(.rodata);
+        sound/songs/midi/mus_trick_house.o(.rodata);
+        sound/songs/midi/mus_encounter_twins.o(.rodata);
+        sound/songs/midi/mus_encounter_elite_four.o(.rodata);
+        sound/songs/midi/mus_encounter_hiker.o(.rodata);
+        sound/songs/midi/mus_contest_lobby.o(.rodata);
+        sound/songs/midi/mus_encounter_interviewer.o(.rodata);
+        sound/songs/midi/mus_encounter_champion.o(.rodata);
+        sound/songs/midi/mus_credits.o(.rodata);
         sound/songs/midi/mus_end.o(.rodata);
         sound/songs/midi/mus_b_frontier.o(.rodata);
         sound/songs/midi/mus_b_arena.o(.rodata);
-        sound/songs/midi/mus_me_pointget.o(.rodata);
-        sound/songs/midi/mus_me_tore_eye.o(.rodata);
-        sound/songs/midi/mus_pyramid.o(.rodata);
-        sound/songs/midi/mus_pyramid_top.o(.rodata);
+        sound/songs/midi/mus_obtain_b_points.o(.rodata);
+        sound/songs/midi/mus_register_match_call.o(.rodata);
+        sound/songs/midi/mus_b_pyramid.o(.rodata);
+        sound/songs/midi/mus_b_pyramid_top.o(.rodata);
         sound/songs/midi/mus_b_palace.o(.rodata);
-        sound/songs/midi/mus_rekkuu_kourin.o(.rodata);
-        sound/songs/midi/mus_sattower.o(.rodata);
-        sound/songs/midi/mus_me_symbolget.o(.rodata);
+        sound/songs/midi/mus_rayquaza_appears.o(.rodata);
+        sound/songs/midi/mus_b_tower.o(.rodata);
+        sound/songs/midi/mus_obtain_symbol.o(.rodata);
         sound/songs/midi/mus_b_dome.o(.rodata);
-        sound/songs/midi/mus_b_tube.o(.rodata);
+        sound/songs/midi/mus_b_pike.o(.rodata);
         sound/songs/midi/mus_b_factory.o(.rodata);
-        sound/songs/midi/mus_vs_rekku.o(.rodata);
-        sound/songs/midi/mus_vs_front.o(.rodata);
+        sound/songs/midi/mus_vs_rayquaza.o(.rodata);
+        sound/songs/midi/mus_vs_frontier_brain.o(.rodata);
         sound/songs/midi/mus_vs_mew.o(.rodata);
-        sound/songs/midi/mus_b_dome1.o(.rodata);
-        sound/songs/midi/mus_battle27.o(.rodata);
-        sound/songs/midi/mus_battle31.o(.rodata);
-        sound/songs/midi/mus_battle20.o(.rodata);
-        sound/songs/midi/mus_battle32.o(.rodata);
-        sound/songs/midi/mus_battle33.o(.rodata);
-        sound/songs/midi/mus_battle36.o(.rodata);
-        sound/songs/midi/mus_battle34.o(.rodata);
-        sound/songs/midi/mus_battle35.o(.rodata);
-        sound/songs/midi/mus_battle38.o(.rodata);
-        sound/songs/midi/mus_battle30.o(.rodata);
-        sound/songs/midi/mus_rg_annai.o(.rodata);
-        sound/songs/midi/mus_rg_slot.o(.rodata);
-        sound/songs/midi/mus_rg_ajito.o(.rodata);
+        sound/songs/midi/mus_b_dome_lobby.o(.rodata);
+        sound/songs/midi/mus_vs_wild.o(.rodata);
+        sound/songs/midi/mus_vs_aqua_magma.o(.rodata);
+        sound/songs/midi/mus_vs_trainer.o(.rodata);
+        sound/songs/midi/mus_vs_gym_leader.o(.rodata);
+        sound/songs/midi/mus_vs_champion.o(.rodata);
+        sound/songs/midi/mus_vs_regi.o(.rodata);
+        sound/songs/midi/mus_vs_kyogre_groudon.o(.rodata);
+        sound/songs/midi/mus_vs_rival.o(.rodata);
+        sound/songs/midi/mus_vs_elite_four.o(.rodata);
+        sound/songs/midi/mus_vs_aqua_magma_leader.o(.rodata);
+        sound/songs/midi/mus_rg_follow_me.o(.rodata);
+        sound/songs/midi/mus_rg_game_corner.o(.rodata);
+        sound/songs/midi/mus_rg_rocket_hideout.o(.rodata);
         sound/songs/midi/mus_rg_gym.o(.rodata);
-        sound/songs/midi/mus_rg_purin.o(.rodata);
-        sound/songs/midi/mus_rg_demo.o(.rodata);
+        sound/songs/midi/mus_rg_jigglypuff.o(.rodata);
+        sound/songs/midi/mus_rg_intro_fight.o(.rodata);
         sound/songs/midi/mus_rg_title.o(.rodata);
-        sound/songs/midi/mus_rg_guren.o(.rodata);
-        sound/songs/midi/mus_rg_shion.o(.rodata);
-        sound/songs/midi/mus_rg_kaihuku.o(.rodata);
+        sound/songs/midi/mus_rg_cinnabar.o(.rodata);
+        sound/songs/midi/mus_rg_lavender.o(.rodata);
+        sound/songs/midi/mus_rg_heal.o(.rodata);
         sound/songs/midi/mus_rg_cycling.o(.rodata);
-        sound/songs/midi/mus_rg_rocket.o(.rodata);
-        sound/songs/midi/mus_rg_shoujo.o(.rodata);
-        sound/songs/midi/mus_rg_shounen.o(.rodata);
-        sound/songs/midi/mus_rg_dendou.o(.rodata);
-        sound/songs/midi/mus_rg_t_mori.o(.rodata);
-        sound/songs/midi/mus_rg_otsukimi.o(.rodata);
-        sound/songs/midi/mus_rg_pokeyashi.o(.rodata);
-        sound/songs/midi/mus_rg_ending.o(.rodata);
-        sound/songs/midi/mus_rg_load01.o(.rodata);
-        sound/songs/midi/mus_rg_opening.o(.rodata);
-        sound/songs/midi/mus_rg_load02.o(.rodata);
-        sound/songs/midi/mus_rg_load03.o(.rodata);
-        sound/songs/midi/mus_rg_champ_r.o(.rodata);
-        sound/songs/midi/mus_rg_vs_gym.o(.rodata);
-        sound/songs/midi/mus_rg_vs_tore.o(.rodata);
-        sound/songs/midi/mus_rg_vs_yasei.o(.rodata);
-        sound/songs/midi/mus_rg_vs_last.o(.rodata);
-        sound/songs/midi/mus_rg_masara.o(.rodata);
-        sound/songs/midi/mus_rg_kenkyu.o(.rodata);
-        sound/songs/midi/mus_rg_ohkido.o(.rodata);
-        sound/songs/midi/mus_rg_pokecen.o(.rodata);
-        sound/songs/midi/mus_rg_santoan.o(.rodata);
-        sound/songs/midi/mus_rg_naminori.o(.rodata);
-        sound/songs/midi/mus_rg_p_tower.o(.rodata);
-        sound/songs/midi/mus_rg_shiruhu.o(.rodata);
-        sound/songs/midi/mus_rg_hanada.o(.rodata);
-        sound/songs/midi/mus_rg_tamamusi.o(.rodata);
-        sound/songs/midi/mus_rg_win_tre.o(.rodata);
-        sound/songs/midi/mus_rg_win_yasei.o(.rodata);
-        sound/songs/midi/mus_rg_win_gym.o(.rodata);
-        sound/songs/midi/mus_rg_kuchiba.o(.rodata);
-        sound/songs/midi/mus_rg_nibi.o(.rodata);
-        sound/songs/midi/mus_rg_rival1.o(.rodata);
-        sound/songs/midi/mus_rg_rival2.o(.rodata);
-        sound/songs/midi/mus_rg_fan2.o(.rodata);
-        sound/songs/midi/mus_rg_fan5.o(.rodata);
-        sound/songs/midi/mus_rg_fan6.o(.rodata);
-        sound/songs/midi/mus_me_rg_photo.o(.rodata);
-        sound/songs/midi/mus_rg_titlerog.o(.rodata);
-        sound/songs/midi/mus_rg_get_yasei.o(.rodata);
-        sound/songs/midi/mus_rg_sousa.o(.rodata);
-        sound/songs/midi/mus_rg_sekaikan.o(.rodata);
-        sound/songs/midi/mus_rg_seibetu.o(.rodata);
-        sound/songs/midi/mus_rg_jump.o(.rodata);
-        sound/songs/midi/mus_rg_union.o(.rodata);
-        sound/songs/midi/mus_rg_network.o(.rodata);
-        sound/songs/midi/mus_rg_okurimono.o(.rodata);
-        sound/songs/midi/mus_rg_kinomikui.o(.rodata);
-        sound/songs/midi/mus_rg_nanadungeon.o(.rodata);
-        sound/songs/midi/mus_rg_oshie_tv.o(.rodata);
-        sound/songs/midi/mus_rg_nanashima.o(.rodata);
-        sound/songs/midi/mus_rg_nanaiseki.o(.rodata);
-        sound/songs/midi/mus_rg_nana123.o(.rodata);
-        sound/songs/midi/mus_rg_nana45.o(.rodata);
-        sound/songs/midi/mus_rg_nana67.o(.rodata);
-        sound/songs/midi/mus_rg_pokefue.o(.rodata);
-        sound/songs/midi/mus_rg_vs_deo.o(.rodata);
-        sound/songs/midi/mus_rg_vs_myu2.o(.rodata);
-        sound/songs/midi/mus_rg_vs_den.o(.rodata);
-        sound/songs/midi/mus_rg_exeye.o(.rodata);
-        sound/songs/midi/mus_rg_deoeye.o(.rodata);
-        sound/songs/midi/mus_rg_t_tower.o(.rodata);
-        sound/songs/midi/mus_rg_slowmasara.o(.rodata);
-        sound/songs/midi/mus_rg_tvnoize.o(.rodata);
+        sound/songs/midi/mus_rg_encounter_rocket.o(.rodata);
+        sound/songs/midi/mus_rg_encounter_girl.o(.rodata);
+        sound/songs/midi/mus_rg_encounter_boy.o(.rodata);
+        sound/songs/midi/mus_rg_hall_of_fame.o(.rodata);
+        sound/songs/midi/mus_rg_viridian_forest.o(.rodata);
+        sound/songs/midi/mus_rg_mt_moon.o(.rodata);
+        sound/songs/midi/mus_rg_poke_mansion.o(.rodata);
+        sound/songs/midi/mus_rg_credits.o(.rodata);
+        sound/songs/midi/mus_rg_route1.o(.rodata);
+        sound/songs/midi/mus_rg_route24.o(.rodata);
+        sound/songs/midi/mus_rg_route3.o(.rodata);
+        sound/songs/midi/mus_rg_route11.o(.rodata);
+        sound/songs/midi/mus_rg_victory_road.o(.rodata);
+        sound/songs/midi/mus_rg_vs_gym_leader.o(.rodata);
+        sound/songs/midi/mus_rg_vs_trainer.o(.rodata);
+        sound/songs/midi/mus_rg_vs_wild.o(.rodata);
+        sound/songs/midi/mus_rg_vs_champion.o(.rodata);
+        sound/songs/midi/mus_rg_pallet.o(.rodata);
+        sound/songs/midi/mus_rg_oak_lab.o(.rodata);
+        sound/songs/midi/mus_rg_oak.o(.rodata);
+        sound/songs/midi/mus_rg_poke_center.o(.rodata);
+        sound/songs/midi/mus_rg_ss_anne.o(.rodata);
+        sound/songs/midi/mus_rg_surf.o(.rodata);
+        sound/songs/midi/mus_rg_poke_tower.o(.rodata);
+        sound/songs/midi/mus_rg_silph.o(.rodata);
+        sound/songs/midi/mus_rg_fuchsia.o(.rodata);
+        sound/songs/midi/mus_rg_celadon.o(.rodata);
+        sound/songs/midi/mus_rg_victory_trainer.o(.rodata);
+        sound/songs/midi/mus_rg_victory_wild.o(.rodata);
+        sound/songs/midi/mus_rg_victory_gym_leader.o(.rodata);
+        sound/songs/midi/mus_rg_vermillion.o(.rodata);
+        sound/songs/midi/mus_rg_pewter.o(.rodata);
+        sound/songs/midi/mus_rg_encounter_rival.o(.rodata);
+        sound/songs/midi/mus_rg_rival_exit.o(.rodata);
+        sound/songs/midi/mus_rg_dex_rating.o(.rodata);
+        sound/songs/midi/mus_rg_obtain_key_item.o(.rodata);
+        sound/songs/midi/mus_rg_caught_intro.o(.rodata);
+        sound/songs/midi/mus_rg_photo.o(.rodata);
+        sound/songs/midi/mus_rg_game_freak.o(.rodata);
+        sound/songs/midi/mus_rg_caught.o(.rodata);
+        sound/songs/midi/mus_rg_new_game_instruct.o(.rodata);
+        sound/songs/midi/mus_rg_new_game_intro.o(.rodata);
+        sound/songs/midi/mus_rg_new_game_exit.o(.rodata);
+        sound/songs/midi/mus_rg_poke_jump.o(.rodata);
+        sound/songs/midi/mus_rg_union_room.o(.rodata);
+        sound/songs/midi/mus_rg_net_center.o(.rodata);
+        sound/songs/midi/mus_rg_mystery_gift.o(.rodata);
+        sound/songs/midi/mus_rg_berry_pick.o(.rodata);
+        sound/songs/midi/mus_rg_sevii_cave.o(.rodata);
+        sound/songs/midi/mus_rg_teachy_tv_show.o(.rodata);
+        sound/songs/midi/mus_rg_sevii_route.o(.rodata);
+        sound/songs/midi/mus_rg_sevii_dungeon.o(.rodata);
+        sound/songs/midi/mus_rg_sevii_123.o(.rodata);
+        sound/songs/midi/mus_rg_sevii_45.o(.rodata);
+        sound/songs/midi/mus_rg_sevii_67.o(.rodata);
+        sound/songs/midi/mus_rg_poke_flute.o(.rodata);
+        sound/songs/midi/mus_rg_vs_deoxys.o(.rodata);
+        sound/songs/midi/mus_rg_vs_mewtwo.o(.rodata);
+        sound/songs/midi/mus_rg_vs_legend.o(.rodata);
+        sound/songs/midi/mus_rg_encounter_gym_leader.o(.rodata);
+        sound/songs/midi/mus_rg_encounter_deoxys.o(.rodata);
+        sound/songs/midi/mus_rg_trainer_tower.o(.rodata);
+        sound/songs/midi/mus_rg_slow_pallet.o(.rodata);
+        sound/songs/midi/mus_rg_teachy_tv_menu.o(.rodata);
         sound/songs/midi/ph_trap_blend.o(.rodata);
         sound/songs/midi/ph_trap_held.o(.rodata);
         sound/songs/midi/ph_trap_solo.o(.rodata);
diff --git a/songs.mk b/songs.mk
index e1007af21..698f983ce 100644
--- a/songs.mk
+++ b/songs.mk
@@ -3,16 +3,16 @@ STD_REVERB = 50
 $(MID_BUILDDIR)/%.o: $(MID_SUBDIR)/%.s
 	$(AS) $(ASFLAGS) -I sound -o $@ $<
 
-$(MID_SUBDIR)/mus_ajito.s: %.s: %.mid
+$(MID_SUBDIR)/mus_aqua_magma_hideout.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G076 -V084
 
-$(MID_SUBDIR)/mus_aqa_0.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_aqua.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G065 -V086
 
-$(MID_SUBDIR)/mus_ashroad.s: %.s: %.mid
+$(MID_SUBDIR)/mus_route111.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G055 -V076
 
-$(MID_SUBDIR)/mus_ayasii.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_suspicious.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G069 -V078
 
 $(MID_SUBDIR)/mus_b_arena.s: %.s: %.mid
@@ -21,7 +21,7 @@ $(MID_SUBDIR)/mus_b_arena.s: %.s: %.mid
 $(MID_SUBDIR)/mus_b_dome.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G111 -V090
 
-$(MID_SUBDIR)/mus_b_dome1.s: %.s: %.mid
+$(MID_SUBDIR)/mus_b_dome_lobby.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G111 -V056
 
 $(MID_SUBDIR)/mus_b_factory.s: %.s: %.mid
@@ -33,604 +33,604 @@ $(MID_SUBDIR)/mus_b_frontier.s: %.s: %.mid
 $(MID_SUBDIR)/mus_b_palace.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G108 -V105
 
-$(MID_SUBDIR)/mus_b_tower.s: %.s: %.mid
+$(MID_SUBDIR)/mus_b_tower_rs.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G035 -V080
 
-$(MID_SUBDIR)/mus_b_tube.s: %.s: %.mid
+$(MID_SUBDIR)/mus_b_pike.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G112 -V092
 
-$(MID_SUBDIR)/mus_battle20.s: %.s: %.mid
+$(MID_SUBDIR)/mus_vs_trainer.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G119 -V080 -P1
 
-$(MID_SUBDIR)/mus_battle27.s: %.s: %.mid
+$(MID_SUBDIR)/mus_vs_wild.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G117 -V080 -P1
 
-$(MID_SUBDIR)/mus_battle30.s: %.s: %.mid
+$(MID_SUBDIR)/mus_vs_aqua_magma_leader.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G126 -V080 -P1
 
-$(MID_SUBDIR)/mus_battle31.s: %.s: %.mid
+$(MID_SUBDIR)/mus_vs_aqua_magma.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G118 -V080 -P1
 
-$(MID_SUBDIR)/mus_battle32.s: %.s: %.mid
+$(MID_SUBDIR)/mus_vs_gym_leader.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G120 -V080 -P1
 
-$(MID_SUBDIR)/mus_battle33.s: %.s: %.mid
+$(MID_SUBDIR)/mus_vs_champion.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G121 -V080 -P1
 
-$(MID_SUBDIR)/mus_battle34.s: %.s: %.mid
+$(MID_SUBDIR)/mus_vs_kyogre_groudon.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G123 -V080 -P1
 
-$(MID_SUBDIR)/mus_battle35.s: %.s: %.mid
+$(MID_SUBDIR)/mus_vs_rival.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G124 -V080 -P1
 
-$(MID_SUBDIR)/mus_battle36.s: %.s: %.mid
+$(MID_SUBDIR)/mus_vs_regi.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G122 -V080 -P1
 
-$(MID_SUBDIR)/mus_battle38.s: %.s: %.mid
+$(MID_SUBDIR)/mus_vs_elite_four.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G125 -V080 -P1
 
-$(MID_SUBDIR)/mus_bd_time.s: %.s: %.mid
+$(MID_SUBDIR)/mus_roulette.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G038 -V080
 
-$(MID_SUBDIR)/mus_bijyutu.s: %.s: %.mid
+$(MID_SUBDIR)/mus_lilycove_museum.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G020 -V080
 
-$(MID_SUBDIR)/mus_boy_sup.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_brendan.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G067 -V078
 
-$(MID_SUBDIR)/mus_boyeye.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_male.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G028 -V080
 
-$(MID_SUBDIR)/mus_c_road.s: %.s: %.mid
+$(MID_SUBDIR)/mus_victory_road.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G075 -V076
 
-$(MID_SUBDIR)/mus_casino.s: %.s: %.mid
+$(MID_SUBDIR)/mus_game_corner.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G072 -V072
 
-$(MID_SUBDIR)/mus_con_fan.s: %.s: %.mid
+$(MID_SUBDIR)/mus_contest_winner.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G085 -V100
 
-$(MID_SUBDIR)/mus_con_k.s: %.s: %.mid
+$(MID_SUBDIR)/mus_contest_results.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G092 -V080
 
-$(MID_SUBDIR)/mus_conlobby.s: %.s: %.mid
+$(MID_SUBDIR)/mus_contest_lobby.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G098 -V060
 
-$(MID_SUBDIR)/mus_contest0.s: %.s: %.mid
+$(MID_SUBDIR)/mus_contest.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G086 -V088
 
 $(MID_SUBDIR)/mus_cycling.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G049 -V083
 
-$(MID_SUBDIR)/mus_daigo.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_champion.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G100 -V076
 
-$(MID_SUBDIR)/mus_dan01.s: %.s: %.mid
+$(MID_SUBDIR)/mus_petalburg_woods.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G018 -V080
 
-$(MID_SUBDIR)/mus_dan02.s: %.s: %.mid
+$(MID_SUBDIR)/mus_abandoned_ship.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G030 -V080
 
-$(MID_SUBDIR)/mus_dan03.s: %.s: %.mid
+$(MID_SUBDIR)/mus_cave_of_origin.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G037 -V080
 
-$(MID_SUBDIR)/mus_deepdeep.s: %.s: %.mid
+$(MID_SUBDIR)/mus_underwater.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G057 -V094
 
-$(MID_SUBDIR)/mus_demo1.s: %.s: %.mid
+$(MID_SUBDIR)/mus_intro.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G060 -V090
 
-$(MID_SUBDIR)/mus_dendou.s: %.s: %.mid
+$(MID_SUBDIR)/mus_hall_of_fame.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G082 -V078
 
-$(MID_SUBDIR)/mus_dooro_x1.s: %.s: %.mid
+$(MID_SUBDIR)/mus_route110.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G010 -V080
 
-$(MID_SUBDIR)/mus_dooro_x3.s: %.s: %.mid
+$(MID_SUBDIR)/mus_route120.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G014 -V080
 
-$(MID_SUBDIR)/mus_dooro_x4.s: %.s: %.mid
+$(MID_SUBDIR)/mus_route122.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G021 -V080
 
-$(MID_SUBDIR)/mus_dooro1.s: %.s: %.mid
+$(MID_SUBDIR)/mus_route101.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G011 -V080
 
 $(MID_SUBDIR)/mus_dummy.s: %.s: %.mid
 	$(MID) $< $@ -E -R40
 
-$(MID_SUBDIR)/mus_eikou_r.s: %.s: %.mid
+$(MID_SUBDIR)/mus_hall_of_fame_room.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G093 -V080
 
 $(MID_SUBDIR)/mus_end.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G102 -V036
 
-$(MID_SUBDIR)/mus_event0.s: %.s: %.mid
+$(MID_SUBDIR)/mus_help.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G056 -V078
 
-$(MID_SUBDIR)/mus_fanfa1.s: %.s: %.mid
+$(MID_SUBDIR)/mus_level_up.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
-$(MID_SUBDIR)/mus_fanfa4.s: %.s: %.mid
+$(MID_SUBDIR)/mus_obtain_item.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
-$(MID_SUBDIR)/mus_fanfa5.s: %.s: %.mid
+$(MID_SUBDIR)/mus_evolved.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
-$(MID_SUBDIR)/mus_field13.s: %.s: %.mid
+$(MID_SUBDIR)/mus_gsc_route38.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -V080
 
-$(MID_SUBDIR)/mus_finecity.s: %.s: %.mid
+$(MID_SUBDIR)/mus_slateport.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G079 -V070
 
-$(MID_SUBDIR)/mus_friendly.s: %.s: %.mid
+$(MID_SUBDIR)/mus_poke_mart.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G050 -V085
 
-$(MID_SUBDIR)/mus_fune_kan.s: %.s: %.mid
+$(MID_SUBDIR)/mus_oceanic_museum.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G023 -V080
 
-$(MID_SUBDIR)/mus_gim.s: %.s: %.mid
+$(MID_SUBDIR)/mus_gym.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G013 -V080
 
-$(MID_SUBDIR)/mus_girl_sup.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_may.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G061 -V078
 
-$(MID_SUBDIR)/mus_girleye.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_female.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G053 -V072
 
-$(MID_SUBDIR)/mus_gomachi0.s: %.s: %.mid
+$(MID_SUBDIR)/mus_verdanturf.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G044 -V090
 
-$(MID_SUBDIR)/mus_gotown.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rustboro.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G045 -V085
 
-$(MID_SUBDIR)/mus_granroad.s: %.s: %.mid
+$(MID_SUBDIR)/mus_route119.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G048 -V096
 
-$(MID_SUBDIR)/mus_hageshii.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_intense.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G062 -V078
 
-$(MID_SUBDIR)/mus_hideri.s: %.s: %.mid
+$(MID_SUBDIR)/mus_weather_groudon.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G090 -V050
 
-$(MID_SUBDIR)/mus_hightown.s: %.s: %.mid
+$(MID_SUBDIR)/mus_dewford.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G073 -V078
 
-$(MID_SUBDIR)/mus_hutago.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_twins.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G095 -V075
 
-$(MID_SUBDIR)/mus_inter_v.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_interviewer.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G099 -V062
 
-$(MID_SUBDIR)/mus_kachi1.s: %.s: %.mid
+$(MID_SUBDIR)/mus_victory_trainer.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G058 -V091
 
-$(MID_SUBDIR)/mus_kachi2.s: %.s: %.mid
+$(MID_SUBDIR)/mus_victory_wild.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G025 -V080
 
-$(MID_SUBDIR)/mus_kachi3.s: %.s: %.mid
+$(MID_SUBDIR)/mus_victory_gym_leader.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G024 -V080
 
-$(MID_SUBDIR)/mus_kachi4.s: %.s: %.mid
+$(MID_SUBDIR)/mus_victory_aqua_magma.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G070 -V088
 
-$(MID_SUBDIR)/mus_kachi5.s: %.s: %.mid
+$(MID_SUBDIR)/mus_victory_league.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G029 -V080
 
-$(MID_SUBDIR)/mus_kachi22.s: %.s: %.mid
+$(MID_SUBDIR)/mus_caught.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G025 -V080
 
-$(MID_SUBDIR)/mus_kakkoii.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_cool.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G063 -V086
 
-$(MID_SUBDIR)/mus_karakuri.s: %.s: %.mid
+$(MID_SUBDIR)/mus_trick_house.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G094 -V070
 
-$(MID_SUBDIR)/mus_kazanbai.s: %.s: %.mid
+$(MID_SUBDIR)/mus_route113.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G064 -V084
 
-$(MID_SUBDIR)/mus_m_boat.s: %.s: %.mid
+$(MID_SUBDIR)/mus_sailing.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G077 -V086
 
-$(MID_SUBDIR)/mus_m_dungon.s: %.s: %.mid
+$(MID_SUBDIR)/mus_mt_pyre.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G078 -V088
 
-$(MID_SUBDIR)/mus_maborosi.s: %.s: %.mid
+$(MID_SUBDIR)/mus_sealed_chamber.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G084 -V100
 
-$(MID_SUBDIR)/mus_machi_s2.s: %.s: %.mid
+$(MID_SUBDIR)/mus_petalburg.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G015 -V080
 
-$(MID_SUBDIR)/mus_machi_s3.s: %.s: %.mid
+$(MID_SUBDIR)/mus_fortree.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G032 -V080
 
-$(MID_SUBDIR)/mus_machi_s4.s: %.s: %.mid
+$(MID_SUBDIR)/mus_oldale.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G019 -V080
 
-$(MID_SUBDIR)/mus_machupi.s: %.s: %.mid
+$(MID_SUBDIR)/mus_mt_pyre_exterior.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G080 -V080
 
-$(MID_SUBDIR)/mus_me_asa.s: %.s: %.mid
+$(MID_SUBDIR)/mus_heal.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
-$(MID_SUBDIR)/mus_me_b_big.s: %.s: %.mid
+$(MID_SUBDIR)/mus_slots_jackpot.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
-$(MID_SUBDIR)/mus_me_b_small.s: %.s: %.mid
+$(MID_SUBDIR)/mus_slots_win.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
-$(MID_SUBDIR)/mus_me_bachi.s: %.s: %.mid
+$(MID_SUBDIR)/mus_obtain_badge.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
-$(MID_SUBDIR)/mus_me_kinomi.s: %.s: %.mid
+$(MID_SUBDIR)/mus_obtain_berry.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
-$(MID_SUBDIR)/mus_me_pointget.s: %.s: %.mid
+$(MID_SUBDIR)/mus_obtain_b_points.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G103 -V090 -P5
 
-$(MID_SUBDIR)/mus_me_rg_photo.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_photo.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G180 -V100 -P5
 
-$(MID_SUBDIR)/mus_me_shinka.s: %.s: %.mid
+$(MID_SUBDIR)/mus_evolution_intro.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G026 -V080
 
-$(MID_SUBDIR)/mus_me_symbolget.s: %.s: %.mid
+$(MID_SUBDIR)/mus_obtain_symbol.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G103 -V100 -P5
 
-$(MID_SUBDIR)/mus_me_tama.s: %.s: %.mid
+$(MID_SUBDIR)/mus_awaken_legend.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
-$(MID_SUBDIR)/mus_me_tore_eye.s: %.s: %.mid
+$(MID_SUBDIR)/mus_register_match_call.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G105 -V090 -P5
 
-$(MID_SUBDIR)/mus_me_wasure.s: %.s: %.mid
+$(MID_SUBDIR)/mus_move_deleted.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
-$(MID_SUBDIR)/mus_me_waza.s: %.s: %.mid
+$(MID_SUBDIR)/mus_obtain_tmhm.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
-$(MID_SUBDIR)/mus_me_zannen.s: %.s: %.mid
+$(MID_SUBDIR)/mus_too_bad.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G012 -V090 -P5
 
-$(MID_SUBDIR)/mus_mgm0.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_magma.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G087 -V072
 
-$(MID_SUBDIR)/mus_minamo.s: %.s: %.mid
+$(MID_SUBDIR)/mus_lilycove.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G054 -V085
 
-$(MID_SUBDIR)/mus_mishiro.s: %.s: %.mid
+$(MID_SUBDIR)/mus_littleroot.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G051 -V100
 
-$(MID_SUBDIR)/mus_naminori.s: %.s: %.mid
+$(MID_SUBDIR)/mus_surf.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G017 -V080
 
-$(MID_SUBDIR)/mus_nextroad.s: %.s: %.mid
+$(MID_SUBDIR)/mus_route104.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G047 -V097
 
-$(MID_SUBDIR)/mus_nibi.s: %.s: %.mid
+$(MID_SUBDIR)/mus_gsc_pewter.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -V080
 
-$(MID_SUBDIR)/mus_odamaki.s: %.s: %.mid
+$(MID_SUBDIR)/mus_birch_lab.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G033 -V080
 
-$(MID_SUBDIR)/mus_ooame.s: %.s: %.mid
+$(MID_SUBDIR)/mus_abnormal_weather.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G089 -V080
 
-$(MID_SUBDIR)/mus_p_school.s: %.s: %.mid
+$(MID_SUBDIR)/mus_school.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G081 -V100
 
-$(MID_SUBDIR)/mus_pcc.s: %.s: %.mid
+$(MID_SUBDIR)/mus_c_comm_center.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -V080
 
-$(MID_SUBDIR)/mus_pokecen.s: %.s: %.mid
+$(MID_SUBDIR)/mus_poke_center.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G046 -V092
 
-$(MID_SUBDIR)/mus_pyramid.s: %.s: %.mid
+$(MID_SUBDIR)/mus_b_pyramid.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G106 -V079
 
-$(MID_SUBDIR)/mus_pyramid_top.s: %.s: %.mid
+$(MID_SUBDIR)/mus_b_pyramid_top.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G107 -V077
 
-$(MID_SUBDIR)/mus_rainbow.s: %.s: %.mid
+$(MID_SUBDIR)/mus_ever_grande.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G068 -V086
 
-$(MID_SUBDIR)/mus_rekkuu_kourin.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rayquaza_appears.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G109 -V090
 
-$(MID_SUBDIR)/mus_rg_ajito.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_rocket_hideout.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G133 -V090
 
-$(MID_SUBDIR)/mus_rg_annai.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_follow_me.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G131 -V068
 
-$(MID_SUBDIR)/mus_rg_champ_r.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_victory_road.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G154 -V090
 
 $(MID_SUBDIR)/mus_rg_cycling.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G141 -V090
 
-$(MID_SUBDIR)/mus_rg_demo.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_intro_fight.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G136 -V090
 
-$(MID_SUBDIR)/mus_rg_dendou.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_hall_of_fame.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G145 -V079
 
-$(MID_SUBDIR)/mus_rg_deoeye.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_encounter_deoxys.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G184 -V079
 
-$(MID_SUBDIR)/mus_rg_ending.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_credits.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G149 -V090
 
-$(MID_SUBDIR)/mus_rg_exeye.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_encounter_gym_leader.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G144 -V090
 
-$(MID_SUBDIR)/mus_rg_fan2.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_dex_rating.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G175 -V070 -P5
 
-$(MID_SUBDIR)/mus_rg_fan5.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_obtain_key_item.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G178 -V077 -P5
 
-$(MID_SUBDIR)/mus_rg_fan6.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_caught_intro.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G179 -V094 -P5
 
-$(MID_SUBDIR)/mus_rg_get_yasei.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_caught.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G170 -V100
 
-$(MID_SUBDIR)/mus_rg_guren.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_cinnabar.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G138 -V090
 
 $(MID_SUBDIR)/mus_rg_gym.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G134 -V090
 
-$(MID_SUBDIR)/mus_rg_hanada.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_fuchsia.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G167 -V090
 
-$(MID_SUBDIR)/mus_rg_jump.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_poke_jump.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090
 
-$(MID_SUBDIR)/mus_rg_kaihuku.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_heal.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G140 -V090
 
-$(MID_SUBDIR)/mus_rg_kenkyu.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_oak_lab.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G160 -V075
 
-$(MID_SUBDIR)/mus_rg_kinomikui.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_berry_pick.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090
 
-$(MID_SUBDIR)/mus_rg_kuchiba.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_vermillion.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G172 -V090
 
-$(MID_SUBDIR)/mus_rg_load01.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_route1.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G150 -V079
 
-$(MID_SUBDIR)/mus_rg_load02.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_route3.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G152 -V083
 
-$(MID_SUBDIR)/mus_rg_load03.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_route11.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G153 -V090
 
-$(MID_SUBDIR)/mus_rg_masara.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_pallet.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G159 -V100
 
-$(MID_SUBDIR)/mus_rg_naminori.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_surf.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G164 -V071
 
-$(MID_SUBDIR)/mus_rg_nana45.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_sevii_45.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G188 -V084
 
-$(MID_SUBDIR)/mus_rg_nana67.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_sevii_67.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G189 -V084
 
-$(MID_SUBDIR)/mus_rg_nana123.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_sevii_123.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G173 -V084
 
-$(MID_SUBDIR)/mus_rg_nanadungeon.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_sevii_cave.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G147 -V090
 
-$(MID_SUBDIR)/mus_rg_nanaiseki.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_sevii_dungeon.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G146 -V090
 
-$(MID_SUBDIR)/mus_rg_nanashima.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_sevii_route.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G187 -V080
 
-$(MID_SUBDIR)/mus_rg_network.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_net_center.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G162 -V096
 
-$(MID_SUBDIR)/mus_rg_nibi.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_pewter.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G173 -V084
 
-$(MID_SUBDIR)/mus_rg_ohkido.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_oak.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G161 -V086
 
-$(MID_SUBDIR)/mus_rg_okurimono.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_mystery_gift.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G183 -V100
 
-$(MID_SUBDIR)/mus_rg_opening.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_route24.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G151 -V086
 
-$(MID_SUBDIR)/mus_rg_oshie_tv.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_teachy_tv_show.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G131 -V068
 
-$(MID_SUBDIR)/mus_rg_otsukimi.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_mt_moon.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G147 -V090
 
-$(MID_SUBDIR)/mus_rg_p_tower.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_poke_tower.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G165 -V090
 
-$(MID_SUBDIR)/mus_rg_pokecen.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_poke_center.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G162 -V096
 
-$(MID_SUBDIR)/mus_rg_pokefue.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_poke_flute.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G165 -V048 -P5
 
-$(MID_SUBDIR)/mus_rg_pokeyashi.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_poke_mansion.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G148 -V090
 
-$(MID_SUBDIR)/mus_rg_purin.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_jigglypuff.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G135 -V068 -P5
 
-$(MID_SUBDIR)/mus_rg_rival1.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_encounter_rival.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G174 -V079
 
-$(MID_SUBDIR)/mus_rg_rival2.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_rival_exit.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G174 -V079
 
-$(MID_SUBDIR)/mus_rg_rocket.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_encounter_rocket.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G142 -V096
 
-$(MID_SUBDIR)/mus_rg_santoan.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_ss_anne.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G163 -V090
 
-$(MID_SUBDIR)/mus_rg_seibetu.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_new_game_exit.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G182 -V088
 
-$(MID_SUBDIR)/mus_rg_sekaikan.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_new_game_intro.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G182 -V088
 
-$(MID_SUBDIR)/mus_rg_shion.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_lavender.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G139 -V090
 
-$(MID_SUBDIR)/mus_rg_shiruhu.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_silph.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G166 -V076
 
-$(MID_SUBDIR)/mus_rg_shoujo.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_encounter_girl.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G143 -V051
 
-$(MID_SUBDIR)/mus_rg_shounen.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_encounter_boy.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G144 -V090
 
-$(MID_SUBDIR)/mus_rg_slot.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_game_corner.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090
 
-$(MID_SUBDIR)/mus_rg_slowmasara.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_slow_pallet.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G159 -V092
 
-$(MID_SUBDIR)/mus_rg_sousa.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_new_game_instruct.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G182 -V085
 
-$(MID_SUBDIR)/mus_rg_t_mori.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_viridian_forest.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G146 -V090
 
-$(MID_SUBDIR)/mus_rg_t_tower.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_trainer_tower.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G134 -V090
 
-$(MID_SUBDIR)/mus_rg_tamamusi.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_celadon.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G168 -V070
 
 $(MID_SUBDIR)/mus_rg_title.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G137 -V090
 
-$(MID_SUBDIR)/mus_rg_titlerog.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_game_freak.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G181 -V075
 
-$(MID_SUBDIR)/mus_rg_tvnoize.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_teachy_tv_menu.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G186 -V059
 
-$(MID_SUBDIR)/mus_rg_union.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_union_room.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090
 
-$(MID_SUBDIR)/mus_rg_vs_den.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_vs_legend.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090
 
-$(MID_SUBDIR)/mus_rg_vs_deo.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_vs_deoxys.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G185 -V080
 
-$(MID_SUBDIR)/mus_rg_vs_gym.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_vs_gym_leader.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G155 -V090
 
-$(MID_SUBDIR)/mus_rg_vs_last.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_vs_champion.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G158 -V090
 
-$(MID_SUBDIR)/mus_rg_vs_myu2.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_vs_mewtwo.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090
 
-$(MID_SUBDIR)/mus_rg_vs_tore.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_vs_trainer.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G156 -V090
 
-$(MID_SUBDIR)/mus_rg_vs_yasei.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_vs_wild.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090
 
-$(MID_SUBDIR)/mus_rg_win_gym.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_victory_gym_leader.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G171 -V090
 
-$(MID_SUBDIR)/mus_rg_win_tre.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_victory_trainer.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G169 -V089
 
-$(MID_SUBDIR)/mus_rg_win_yasei.s: %.s: %.mid
+$(MID_SUBDIR)/mus_rg_victory_wild.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G170 -V090
 
-$(MID_SUBDIR)/mus_ropeway.s: %.s: %.mid
+$(MID_SUBDIR)/mus_cable_car.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G071 -V078
 
-$(MID_SUBDIR)/mus_runecity.s: %.s: %.mid
+$(MID_SUBDIR)/mus_sootopolis.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G091 -V062
 
-$(MID_SUBDIR)/mus_safari.s: %.s: %.mid
+$(MID_SUBDIR)/mus_safari_zone.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G074 -V082
 
-$(MID_SUBDIR)/mus_sattower.s: %.s: %.mid
+$(MID_SUBDIR)/mus_b_tower.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G110 -V100
 
-$(MID_SUBDIR)/mus_shinka.s: %.s: %.mid
+$(MID_SUBDIR)/mus_evolution.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G026 -V080
 
-$(MID_SUBDIR)/mus_sitennou.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_elite_four.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G096 -V078
 
-$(MID_SUBDIR)/mus_suikun.s: %.s: %.mid
+$(MID_SUBDIR)/mus_c_vs_legend_beast.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -V080
 
-$(MID_SUBDIR)/mus_swimeye.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_swimmer.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G036 -V080
 
-$(MID_SUBDIR)/mus_syoujoeye.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_girl.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G027 -V080
 
-$(MID_SUBDIR)/mus_t_battle.s: %.s: %.mid
+$(MID_SUBDIR)/mus_intro_battle.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G088 -V088
 
-$(MID_SUBDIR)/mus_test.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_rich.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G043 -V094
 
-$(MID_SUBDIR)/mus_test1.s: %.s: %.mid
+$(MID_SUBDIR)/mus_link_contest_p1.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G039 -V079
 
-$(MID_SUBDIR)/mus_test2.s: %.s: %.mid
+$(MID_SUBDIR)/mus_link_contest_p2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G040 -V090
 
-$(MID_SUBDIR)/mus_test3.s: %.s: %.mid
+$(MID_SUBDIR)/mus_link_contest_p3.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G041 -V075
 
-$(MID_SUBDIR)/mus_test4.s: %.s: %.mid
+$(MID_SUBDIR)/mus_link_contest_p4.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G042 -V090
 
-$(MID_SUBDIR)/mus_tetsuji.s: %.s: %.mid
+$(MID_SUBDIR)/mus_littleroot_test.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G034 -V099
 
-$(MID_SUBDIR)/mus_thankfor.s: %.s: %.mid
+$(MID_SUBDIR)/mus_credits.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G101 -V100
 
-$(MID_SUBDIR)/mus_title3.s: %.s: %.mid
+$(MID_SUBDIR)/mus_title.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G059 -V090
 
-$(MID_SUBDIR)/mus_tonekusa.s: %.s: %.mid
+$(MID_SUBDIR)/mus_fallarbor.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G083 -V100
 
-$(MID_SUBDIR)/mus_tozan.s: %.s: %.mid
+$(MID_SUBDIR)/mus_mt_chimney.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G052 -V078
 
-$(MID_SUBDIR)/mus_tsuretek.s: %.s: %.mid
+$(MID_SUBDIR)/mus_follow_me.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G066 -V074
 
-$(MID_SUBDIR)/mus_vs_front.s: %.s: %.mid
+$(MID_SUBDIR)/mus_vs_frontier_brain.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G115 -V090 -P1
 
 $(MID_SUBDIR)/mus_vs_mew.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G116 -V090
 
-$(MID_SUBDIR)/mus_vs_rekku.s: %.s: %.mid
+$(MID_SUBDIR)/mus_vs_rayquaza.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G114 -V080 -P1
 
-$(MID_SUBDIR)/mus_yama_eye.s: %.s: %.mid
+$(MID_SUBDIR)/mus_encounter_hiker.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G097 -V076
 
 $(MID_SUBDIR)/ph_choice_blend.s: %.s: %.mid
@@ -789,64 +789,64 @@ $(MID_SUBDIR)/ph_trap_solo.s: %.s: %.mid
 $(MID_SUBDIR)/se_a.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
 
-$(MID_SUBDIR)/se_ban.s: %.s: %.mid
+$(MID_SUBDIR)/se_bang.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_basabasa.s: %.s: %.mid
+$(MID_SUBDIR)/se_taillow_wing_flap.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5
 
-$(MID_SUBDIR)/se_bidoro.s: %.s: %.mid
+$(MID_SUBDIR)/se_glass_flute.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5
 
 $(MID_SUBDIR)/se_boo.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4
 
-$(MID_SUBDIR)/se_bowa.s: %.s: %.mid
+$(MID_SUBDIR)/se_ball.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V070 -P4
 
-$(MID_SUBDIR)/se_bowa2.s: %.s: %.mid
+$(MID_SUBDIR)/se_ball_open.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
-$(MID_SUBDIR)/se_bt_start.s: %.s: %.mid
+$(MID_SUBDIR)/se_mugshot.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
 
-$(MID_SUBDIR)/se_c_gaji.s: %.s: %.mid
+$(MID_SUBDIR)/se_contest_heart.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
 
-$(MID_SUBDIR)/se_c_maku_d.s: %.s: %.mid
+$(MID_SUBDIR)/se_contest_curtain_fall.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5
 
-$(MID_SUBDIR)/se_c_maku_u.s: %.s: %.mid
+$(MID_SUBDIR)/se_contest_curtain_rise.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5
 
-$(MID_SUBDIR)/se_c_pasi.s: %.s: %.mid
+$(MID_SUBDIR)/se_contest_icon_change.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5
 
-$(MID_SUBDIR)/se_c_pikon.s: %.s: %.mid
+$(MID_SUBDIR)/se_contest_mons_turn.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
 
-$(MID_SUBDIR)/se_c_syu.s: %.s: %.mid
+$(MID_SUBDIR)/se_contest_icon_clear.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5
 
 $(MID_SUBDIR)/se_card.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
 
-$(MID_SUBDIR)/se_curtain.s: %.s: %.mid
+$(MID_SUBDIR)/se_pike_curtain_close.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
-$(MID_SUBDIR)/se_curtain1.s: %.s: %.mid
+$(MID_SUBDIR)/se_pike_curtain_open.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
-$(MID_SUBDIR)/se_dansa.s: %.s: %.mid
+$(MID_SUBDIR)/se_ledge.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
 
-$(MID_SUBDIR)/se_daugi.s: %.s: %.mid
+$(MID_SUBDIR)/se_itemfinder.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
 
-$(MID_SUBDIR)/se_dendou.s: %.s: %.mid
+$(MID_SUBDIR)/se_applause.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5
 
-$(MID_SUBDIR)/se_doku.s: %.s: %.mid
+$(MID_SUBDIR)/se_field_poison.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
 
 $(MID_SUBDIR)/se_door.s: %.s: %.mid
@@ -855,127 +855,127 @@ $(MID_SUBDIR)/se_door.s: %.s: %.mid
 $(MID_SUBDIR)/se_e.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
 
-$(MID_SUBDIR)/se_elebeta.s: %.s: %.mid
+$(MID_SUBDIR)/se_elevator.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
-$(MID_SUBDIR)/se_esuka.s: %.s: %.mid
+$(MID_SUBDIR)/se_escalator.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
 $(MID_SUBDIR)/se_exp.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5
 
-$(MID_SUBDIR)/se_expmax.s: %.s: %.mid
+$(MID_SUBDIR)/se_exp_max.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V094 -P5
 
 $(MID_SUBDIR)/se_fu_zaku.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4
 
-$(MID_SUBDIR)/se_fu_zaku2.s: %.s: %.mid
+$(MID_SUBDIR)/se_contest_condition_lose.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4
 
-$(MID_SUBDIR)/se_fu_zuzuzu.s: %.s: %.mid
+$(MID_SUBDIR)/se_lavaridge_fall_warp.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4
 
-$(MID_SUBDIR)/se_fuusen1.s: %.s: %.mid
+$(MID_SUBDIR)/se_balloon_red.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4
 
-$(MID_SUBDIR)/se_fuusen2.s: %.s: %.mid
+$(MID_SUBDIR)/se_balloon_blue.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4
 
-$(MID_SUBDIR)/se_fuusen3.s: %.s: %.mid
+$(MID_SUBDIR)/se_balloon_yellow.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4
 
-$(MID_SUBDIR)/se_hantei1.s: %.s: %.mid
+$(MID_SUBDIR)/se_arena_timeup1.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
-$(MID_SUBDIR)/se_hantei2.s: %.s: %.mid
+$(MID_SUBDIR)/se_arena_timeup2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
-$(MID_SUBDIR)/se_hashi.s: %.s: %.mid
+$(MID_SUBDIR)/se_bridge_walk.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
 
-$(MID_SUBDIR)/se_hazure.s: %.s: %.mid
+$(MID_SUBDIR)/se_failure.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4
 
-$(MID_SUBDIR)/se_hi_turun.s: %.s: %.mid
+$(MID_SUBDIR)/se_rotating_gate.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
 
-$(MID_SUBDIR)/se_hinsi.s: %.s: %.mid
+$(MID_SUBDIR)/se_low_health.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P3
 
 $(MID_SUBDIR)/se_i.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
 
-$(MID_SUBDIR)/se_jido_doa.s: %.s: %.mid
+$(MID_SUBDIR)/se_sliding_door.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
 
-$(MID_SUBDIR)/se_jihanki.s: %.s: %.mid
+$(MID_SUBDIR)/se_vend.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_jite_pyoko.s: %.s: %.mid
+$(MID_SUBDIR)/se_bike_hop.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4
 
-$(MID_SUBDIR)/se_jitensya.s: %.s: %.mid
+$(MID_SUBDIR)/se_bike_bell.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
 
-$(MID_SUBDIR)/se_jyuni.s: %.s: %.mid
+$(MID_SUBDIR)/se_contest_place.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4
 
-$(MID_SUBDIR)/se_kaidan.s: %.s: %.mid
+$(MID_SUBDIR)/se_exit.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P5
 
-$(MID_SUBDIR)/se_kaifuku.s: %.s: %.mid
+$(MID_SUBDIR)/se_use_item.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
-$(MID_SUBDIR)/se_ki_gasyan.s: %.s: %.mid
+$(MID_SUBDIR)/se_unlock.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
-$(MID_SUBDIR)/se_kon.s: %.s: %.mid
+$(MID_SUBDIR)/se_ball_bounce_1.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
-$(MID_SUBDIR)/se_kon2.s: %.s: %.mid
+$(MID_SUBDIR)/se_ball_bounce_2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
-$(MID_SUBDIR)/se_kon3.s: %.s: %.mid
+$(MID_SUBDIR)/se_ball_bounce_3.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
-$(MID_SUBDIR)/se_kon4.s: %.s: %.mid
+$(MID_SUBDIR)/se_ball_bounce_4.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
-$(MID_SUBDIR)/se_kouka_h.s: %.s: %.mid
+$(MID_SUBDIR)/se_super_effective.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
 
-$(MID_SUBDIR)/se_kouka_l.s: %.s: %.mid
+$(MID_SUBDIR)/se_not_effective.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
 
-$(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid
+$(MID_SUBDIR)/se_effective.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
 
-$(MID_SUBDIR)/se_mizu.s: %.s: %.mid
+$(MID_SUBDIR)/se_puddle.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V020 -P4
 
-$(MID_SUBDIR)/se_moter.s: %.s: %.mid
+$(MID_SUBDIR)/se_berry_blender.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
 
-$(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid
+$(MID_SUBDIR)/se_switch.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
 
 $(MID_SUBDIR)/se_n.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4
 
-$(MID_SUBDIR)/se_nageru.s: %.s: %.mid
+$(MID_SUBDIR)/se_ball_throw.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5
 
-$(MID_SUBDIR)/se_naminori.s: %.s: %.mid
+$(MID_SUBDIR)/se_ship.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V075 -P4
 
-$(MID_SUBDIR)/se_nigeru.s: %.s: %.mid
+$(MID_SUBDIR)/se_flee.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
 
 $(MID_SUBDIR)/se_o.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
 
-$(MID_SUBDIR)/se_op_basyu.s: %.s: %.mid
+$(MID_SUBDIR)/se_intro_blast.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
 $(MID_SUBDIR)/se_pc_login.s: %.s: %.mid
@@ -990,275 +990,275 @@ $(MID_SUBDIR)/se_pc_on.s: %.s: %.mid
 $(MID_SUBDIR)/se_pin.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V060 -P4
 
-$(MID_SUBDIR)/se_pinpon.s: %.s: %.mid
+$(MID_SUBDIR)/se_ding_dong.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
 
-$(MID_SUBDIR)/se_pn_off.s: %.s: %.mid
+$(MID_SUBDIR)/se_pokenav_off.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
-$(MID_SUBDIR)/se_pn_on.s: %.s: %.mid
+$(MID_SUBDIR)/se_pokenav_on.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
-$(MID_SUBDIR)/se_poke_dead.s: %.s: %.mid
+$(MID_SUBDIR)/se_faint.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5
 
-$(MID_SUBDIR)/se_reapoke.s: %.s: %.mid
+$(MID_SUBDIR)/se_shiny.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P5
 
-$(MID_SUBDIR)/se_regi.s: %.s: %.mid
+$(MID_SUBDIR)/se_shop.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5
 
-$(MID_SUBDIR)/se_rg_bag1.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_bag_cursor.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
-$(MID_SUBDIR)/se_rg_bag2.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_bag_pocket.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
-$(MID_SUBDIR)/se_rg_card1.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_card_flip.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
-$(MID_SUBDIR)/se_rg_card2.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_card_flipping.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5
 
-$(MID_SUBDIR)/se_rg_card3.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_card_open.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V112 -P5
 
-$(MID_SUBDIR)/se_rg_deomov.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_deoxys_move.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5
 
-$(MID_SUBDIR)/se_rg_excellent.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_poke_jump_success.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5
 
-$(MID_SUBDIR)/se_rg_getting.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_ball_click.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
 
-$(MID_SUBDIR)/se_rg_help_cl.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_help_close.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V095 -P5
 
-$(MID_SUBDIR)/se_rg_help_ng.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_help_error.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V125 -P5
 
-$(MID_SUBDIR)/se_rg_help_op.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_help_open.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5
 
-$(MID_SUBDIR)/se_rg_kiteki.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_ss_anne_horn.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5
 
-$(MID_SUBDIR)/se_rg_nawamiss.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_poke_jump_failure.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5
 
 $(MID_SUBDIR)/se_rg_shop.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5
 
-$(MID_SUBDIR)/se_rg_w_door.s: %.s: %.mid
+$(MID_SUBDIR)/se_rg_door.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5
 
-$(MID_SUBDIR)/se_ru_bari.s: %.s: %.mid
+$(MID_SUBDIR)/se_ice_crack.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4
 
-$(MID_SUBDIR)/se_ru_gashin.s: %.s: %.mid
+$(MID_SUBDIR)/se_ice_stairs.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
 
-$(MID_SUBDIR)/se_ru_gasyan.s: %.s: %.mid
+$(MID_SUBDIR)/se_ice_break.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
-$(MID_SUBDIR)/se_ru_hyuu.s: %.s: %.mid
+$(MID_SUBDIR)/se_fall.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
 $(MID_SUBDIR)/se_save.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P5
 
-$(MID_SUBDIR)/se_seikai.s: %.s: %.mid
+$(MID_SUBDIR)/se_success.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P4
 
 $(MID_SUBDIR)/se_select.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5
 
-$(MID_SUBDIR)/se_suikomu.s: %.s: %.mid
+$(MID_SUBDIR)/se_ball_trade.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
-$(MID_SUBDIR)/se_t_ame.s: %.s: %.mid
+$(MID_SUBDIR)/se_thunderstorm.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
-$(MID_SUBDIR)/se_t_ame_e.s: %.s: %.mid
+$(MID_SUBDIR)/se_thunderstorm_stop.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
-$(MID_SUBDIR)/se_t_kami.s: %.s: %.mid
+$(MID_SUBDIR)/se_thunder.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3
 
-$(MID_SUBDIR)/se_t_kami2.s: %.s: %.mid
+$(MID_SUBDIR)/se_thunder2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3
 
-$(MID_SUBDIR)/se_t_koame.s: %.s: %.mid
+$(MID_SUBDIR)/se_rain.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
-$(MID_SUBDIR)/se_t_koame_e.s: %.s: %.mid
+$(MID_SUBDIR)/se_rain_stop.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2
 
-$(MID_SUBDIR)/se_t_ooame.s: %.s: %.mid
+$(MID_SUBDIR)/se_downpour.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2
 
-$(MID_SUBDIR)/se_t_ooame_e.s: %.s: %.mid
+$(MID_SUBDIR)/se_downpour_stop.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2
 
-$(MID_SUBDIR)/se_tama.s: %.s: %.mid
+$(MID_SUBDIR)/se_orb.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5
 
-$(MID_SUBDIR)/se_tamago.s: %.s: %.mid
+$(MID_SUBDIR)/se_egg_hatch.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5
 
-$(MID_SUBDIR)/se_tamakoro.s: %.s: %.mid
+$(MID_SUBDIR)/se_roulette_ball.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2
 
-$(MID_SUBDIR)/se_tamakoro_e.s: %.s: %.mid
+$(MID_SUBDIR)/se_roulette_ball2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2
 
-$(MID_SUBDIR)/se_tb_kara.s: %.s: %.mid
+$(MID_SUBDIR)/se_ball_tray_exit.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5
 
-$(MID_SUBDIR)/se_tb_kon.s: %.s: %.mid
+$(MID_SUBDIR)/se_ball_tray_ball.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5
 
-$(MID_SUBDIR)/se_tb_start.s: %.s: %.mid
+$(MID_SUBDIR)/se_ball_tray_enter.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5
 
-$(MID_SUBDIR)/se_tk_kasya.s: %.s: %.mid
+$(MID_SUBDIR)/se_click.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4
 
-$(MID_SUBDIR)/se_tk_warpin.s: %.s: %.mid
+$(MID_SUBDIR)/se_warp_in.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4
 
-$(MID_SUBDIR)/se_tk_warpout.s: %.s: %.mid
+$(MID_SUBDIR)/se_warp_out.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4
 
-$(MID_SUBDIR)/se_toreeye.s: %.s: %.mid
+$(MID_SUBDIR)/se_pokenav_call.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V120 -P5
 
-$(MID_SUBDIR)/se_toreoff.s: %.s: %.mid
+$(MID_SUBDIR)/se_pokenav_hang_up.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V110 -P5
 
-$(MID_SUBDIR)/se_toy_a.s: %.s: %.mid
+$(MID_SUBDIR)/se_note_a.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_toy_b.s: %.s: %.mid
+$(MID_SUBDIR)/se_note_b.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_toy_c.s: %.s: %.mid
+$(MID_SUBDIR)/se_note_c.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_toy_c1.s: %.s: %.mid
+$(MID_SUBDIR)/se_note_c_high.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_toy_d.s: %.s: %.mid
+$(MID_SUBDIR)/se_note_d.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_toy_dango.s: %.s: %.mid
+$(MID_SUBDIR)/se_mud_ball.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_toy_e.s: %.s: %.mid
+$(MID_SUBDIR)/se_note_e.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_toy_f.s: %.s: %.mid
+$(MID_SUBDIR)/se_note_f.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_toy_g.s: %.s: %.mid
+$(MID_SUBDIR)/se_note_g.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_toy_kabe.s: %.s: %.mid
+$(MID_SUBDIR)/se_breakable_door.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_track_door.s: %.s: %.mid
+$(MID_SUBDIR)/se_truck_door.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_track_haiki.s: %.s: %.mid
+$(MID_SUBDIR)/se_truck_unload.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4
 
-$(MID_SUBDIR)/se_track_move.s: %.s: %.mid
+$(MID_SUBDIR)/se_truck_move.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4
 
-$(MID_SUBDIR)/se_track_stop.s: %.s: %.mid
+$(MID_SUBDIR)/se_truck_stop.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4
 
-$(MID_SUBDIR)/se_tu_saa.s: %.s: %.mid
+$(MID_SUBDIR)/se_repel.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4
 
 $(MID_SUBDIR)/se_u.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4
 
-$(MID_SUBDIR)/se_ussoki.s: %.s: %.mid
+$(MID_SUBDIR)/se_sudowoodo_shake.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G129 -V077 -P5
 
-$(MID_SUBDIR)/se_w003.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_double_slap.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w004.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_comet_punch.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
 
-$(MID_SUBDIR)/se_w006.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_pay_day.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4
 
-$(MID_SUBDIR)/se_w007.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_fire_punch.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w010.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_scratch.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w011.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_vicegrip.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w013.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_razor_wind.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w013b.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_razor_wind2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
 
-$(MID_SUBDIR)/se_w014.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_swords_dance.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
-$(MID_SUBDIR)/se_w015.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_cut.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4
 
-$(MID_SUBDIR)/se_w016.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_gust.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w016b.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_gust2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w017.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_wing_attack.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4
 
-$(MID_SUBDIR)/se_w019.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_fly.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w020.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_bind.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4
 
-$(MID_SUBDIR)/se_w025.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_mega_kick.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4
 
-$(MID_SUBDIR)/se_w025b.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_mega_kick2.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w026.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_jump_kick.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w028.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_sand_attack.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w029.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_headbutt.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w030.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_horn_attack.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w036.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_take_down.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4
 
-$(MID_SUBDIR)/se_w039.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_tail_whip.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_w043.s: %.s: %.mid
+$(MID_SUBDIR)/se_m_leer.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4
 
-$(MID_SUBDIR)/se_z_search.s: %.s: %.mid
+$(MID_SUBDIR)/se_dex_search.s: %.s: %.mid
 	$(MID) $< $@ -E -R$(STD_REVERB) -G127 -v100 -P5
diff --git a/sound/song_table.inc b/sound/song_table.inc
index 42e62b832..ef5b4b48e 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -2,275 +2,275 @@
 
 gSongTable:: @ 86B49F0
 	song mus_dummy, 0, 0
-	song se_kaifuku, 1, 1           @ Healing Item
-	song se_pc_login, 1, 1          @ PC Login
-	song se_pc_off, 1, 1            @ PC Shutdown
-	song se_pc_on, 1, 1             @ PC Startup
-	song se_select, 2, 2            @ Cursor Selection
-	song se_win_open, 1, 1          @ Start Menu
-	song se_wall_hit, 2, 2          @ Wall Bump
-	song se_door, 1, 1              @ Opening Door
-	song se_kaidan, 1, 1            @ Stairs
-	song se_dansa, 1, 1             @ Ledge
-	song se_jitensya, 1, 1          @ Bicycle Bell
-	song se_kouka_l, 1, 1           @ Not Very Effective
-	song se_kouka_m, 1, 1           @ Normal Effectiveness
-	song se_kouka_h, 1, 1           @ Super Effective
-	song se_bowa2, 1, 1             @ Pokémon Withdrawal
-	song se_poke_dead, 1, 1         @ Pokémon Fainted
-	song se_nigeru, 1, 1            @ Flee from Wild Battle
-	song se_jido_doa, 1, 1          @ Pokémon Center Door
-	song se_naminori, 1, 1          @ Briney's Ship
-	song se_ban, 1, 1               @ Bang
-	song se_pin, 1, 1               @ Exclamation Bubble
-	song se_boo, 1, 1               @ Contest Jam
-	song se_bowa, 1, 1              @ Giving Poké Ball to Nurse, Poké Ball Wiggle
-	song se_jyuni, 2, 2             @ Contest - Rankings Revealed
-	song se_a, 1, 1                 @ Bard A
-	song se_i, 1, 1                 @ Bard I
-	song se_u, 1, 1                 @ Bard U
-	song se_e, 1, 1                 @ Bard E
-	song se_o, 1, 1                 @ Bard O
-	song se_n, 1, 1                 @ Bard N
-	song se_seikai, 1, 1            @ Success
-	song se_hazure, 1, 1            @ Failure
-	song se_exp, 1, 1               @ Exp. Bar
-	song se_jite_pyoko, 1, 1        @ Bunny Hop
-	song se_mu_pachi, 1, 1          @ Toggle Switch
-	song se_tk_kasya, 1, 1          @ Mossdeep Gym/Trick House Switch
+	song se_use_item, 1, 1
+	song se_pc_login, 1, 1
+	song se_pc_off, 1, 1
+	song se_pc_on, 1, 1
+	song se_select, 2, 2
+	song se_win_open, 1, 1
+	song se_wall_hit, 2, 2
+	song se_door, 1, 1
+	song se_exit, 1, 1
+	song se_ledge, 1, 1
+	song se_bike_bell, 1, 1
+	song se_not_effective, 1, 1
+	song se_effective, 1, 1
+	song se_super_effective, 1, 1
+	song se_ball_open, 1, 1
+	song se_faint, 1, 1
+	song se_flee, 1, 1
+	song se_sliding_door, 1, 1
+	song se_ship, 1, 1
+	song se_bang, 1, 1
+	song se_pin, 1, 1
+	song se_boo, 1, 1
+	song se_ball, 1, 1
+	song se_contest_place, 2, 2
+	song se_a, 1, 1
+	song se_i, 1, 1
+	song se_u, 1, 1
+	song se_e, 1, 1
+	song se_o, 1, 1
+	song se_n, 1, 1
+	song se_success, 1, 1
+	song se_failure, 1, 1
+	song se_exp, 1, 1
+	song se_bike_hop, 1, 1
+	song se_switch, 1, 1
+	song se_click, 1, 1
 	song se_fu_zaku, 1, 1
-	song se_fu_zaku2, 1, 1
-	song se_fu_zuzuzu, 1, 1         @ Lavaridge Gym - Warp
-	song se_ru_gashin, 1, 1         @ Sootopolis Gym - Stairs Appear
-	song se_ru_gasyan, 1, 1         @ Sootopolis Gym - Ice Breaking
-	song se_ru_bari, 1, 1           @ Sootopolis Gym - Walking on Ice
-	song se_ru_hyuu, 1, 1           @ Falling Down a Hole
-	song se_ki_gasyan, 2, 2
-	song se_tk_warpin, 1, 1         @ Warp In
-	song se_tk_warpout, 1, 1        @ Warp Out
-	song se_tu_saa, 1, 1            @ Repel
-	song se_hi_turun, 1, 1          @ Fortree Gym - Obstacle
-	song se_track_move, 1, 1        @ Moving Truck
-	song se_track_stop, 1, 1        @ Moving Truck Stop
-	song se_track_haiki, 2, 2       @ Moving Truck Unload
-	song se_track_door, 1, 1        @ Moving Truck Door
-	song se_moter, 2, 2
+	song se_contest_condition_lose, 1, 1
+	song se_lavaridge_fall_warp, 1, 1
+	song se_ice_stairs, 1, 1
+	song se_ice_break, 1, 1
+	song se_ice_crack, 1, 1
+	song se_fall, 1, 1
+	song se_unlock, 2, 2
+	song se_warp_in, 1, 1
+	song se_warp_out, 1, 1
+	song se_repel, 1, 1
+	song se_rotating_gate, 1, 1
+	song se_truck_move, 1, 1
+	song se_truck_stop, 1, 1
+	song se_truck_unload, 2, 2
+	song se_truck_door, 1, 1
+	song se_berry_blender, 2, 2
 	song se_card, 1, 1
-	song se_save, 1, 1              @ Save
-	song se_kon, 1, 1               @ Poké Ball Bounce 1
-	song se_kon2, 1, 1              @ Poké Ball Bounce 2
-	song se_kon3, 1, 1              @ Poké Ball Bounce 3
-	song se_kon4, 1, 1              @ Poké Ball Bounce 4
-	song se_suikomu, 2, 2           @ Poké Ball Trade
-	song se_nageru, 1, 1            @ Poké Ball Throw
-	song se_toy_c, 2, 2             @ Note C
-	song se_toy_d, 2, 2             @ Note D
-	song se_toy_e, 2, 2             @ Note E
-	song se_toy_f, 2, 2             @ Note F
-	song se_toy_g, 2, 2             @ Note G
-	song se_toy_a, 2, 2             @ Note A
-	song se_toy_b, 2, 2             @ Note B
-	song se_toy_c1, 2, 2            @ Note High C
-	song se_mizu, 2, 2              @ Puddle
-	song se_hashi, 2, 2             @ Fortree Walkways
-	song se_daugi, 1, 1             @ Slots - Credits
-	song se_pinpon, 1, 1            @ Elevator - Reached Destination
-	song se_fuusen1, 2, 2           @ Red Balloon
-	song se_fuusen2, 2, 2           @ Blue Balloon
-	song se_fuusen3, 2, 2           @ Yellow Balloon
-	song se_toy_kabe, 2, 2          @ Breakable Door
-	song se_toy_dango, 2, 2         @ Mud Ball
-	song se_doku, 1, 1              @ Overworld - Poison Damage
-	song se_esuka, 1, 1             @ Escalator
-	song se_t_ame, 3, 3             @ Rain
-	song se_t_ame_e, 3, 3           @ Rain Stop
-	song se_t_ooame, 3, 3           @ Heavy Rain
-	song se_t_ooame_e, 3, 3         @ Heavy Rain Stop
-	song se_t_koame, 3, 3           @ Light Rain
-	song se_t_koame_e, 3, 3         @ Light Rain Stop
-	song se_t_kami, 1, 1            @ Thunder
-	song se_t_kami2, 1, 1           @ Thunder 2
-	song se_elebeta, 1, 1           @ Elevator
-	song se_hinsi, 3, 3             @ Low Health
-	song se_expmax, 1, 1            @ Exp. Max
-	song se_tamakoro, 2, 2          @ Roulette Ball
-	song se_tamakoro_e, 2, 2        @ Roulette Ball 2
-	song se_basabasa, 1, 1          @ Wing Attack
-	song se_regi, 1, 1              @ Cash Register
-	song se_c_gaji, 1, 1            @ Contest - Hearts
-	song se_c_maku_u, 1, 1          @ Contest - Curtain Rises
-	song se_c_maku_d, 1, 1          @ Contest - Curtain Falls
-	song se_c_pasi, 1, 1            @ Contest - Inflict Status
-	song se_c_syu, 1, 1             @ Contest - Pokémon Switches Out
-	song se_c_pikon, 1, 1           @ Contest - Pokémon Switches In
-	song se_reapoke, 1, 1           @ Shiny Pokémon
-	song se_op_basyu, 1, 1          @ Opening Movie -> Title Screen Transition
-	song se_bt_start, 1, 1          @ Battle Mugshot whoosh
-	song se_dendou, 1, 1            @ Audience Cheering
-	song se_jihanki, 1, 1           @ Vending Machine
-	song se_tama, 1, 1              @ Orb Used
-	song se_z_scroll, 1, 1          @ Pokédex Scrolling
-	song se_z_page, 1, 1            @ Pokédex Page
-	song se_pn_on, 1, 1             @ PokéNav On
-	song se_pn_off, 1, 1            @ PokéNav Off
-	song se_z_search, 1, 1          @ Pokédex Search
-	song se_tamago, 1, 1            @ Egg hatch
-	song se_tb_start, 1, 1          @ Battle - Poké Ball Tray slide in
-	song se_tb_kon, 1, 1            @ Battle - Poké Ball Tray ball sound
-	song se_tb_kara, 2, 2           @ Battle - Poké Ball Tray slide out
-	song se_bidoro, 1, 1
-	song se_w085, 2, 2              @ Thunderbolt
-	song se_w085b, 1, 1             @ Thunderbolt 2
-	song se_w231, 1, 1              @ Harden
-	song se_w171, 1, 1              @ Nightmare
-	song se_w233, 1, 1              @ Vital Throw
-	song se_w233b, 1, 1             @ Vital Throw 2
-	song se_w145, 1, 1              @ Bubble
-	song se_w145b, 1, 1             @ Bubble 2
-	song se_w145c, 1, 1             @ Bubble 3
-	song se_w240, 1, 1              @ Rain Dance
-	song se_w015, 1, 1              @ Cut
-	song se_w081, 1, 1              @ String Shot
-	song se_w081b, 1, 1             @ String Shot 2
-	song se_w088, 1, 1              @ Rock Throw
-	song se_w016, 2, 2              @ Gust
-	song se_w016b, 2, 2             @ Gust 2
-	song se_w003, 1, 1              @ DoubleSlap
-	song se_w104, 1, 1              @ Double Team
-	song se_w013, 1, 1              @ Razor Wind
-	song se_w196, 1, 1              @ Icy Wind
-	song se_w086, 1, 1              @ Thunder Wave
-	song se_w004, 1, 1              @ Comet Punch
-	song se_w025, 1, 1              @ Mega Kick
-	song se_w025b, 1, 1             @ Mega Kick 2
-	song se_w152, 1, 1              @ Crabhammer
-	song se_w026, 1, 1              @ Jump Kick
-	song se_w172, 1, 1              @ Flame Wheel
-	song se_w172b, 1, 1             @ Flame Wheel 2
-	song se_w053, 1, 1              @ Flamethrower
-	song se_w007, 1, 1              @ Fire Punch
-	song se_w092, 1, 1              @ Toxic
-	song se_w221, 1, 1              @ Sacred Fire
-	song se_w221b, 2, 2             @ Sacred Fire 2
-	song se_w052, 1, 1              @ Ember
-	song se_w036, 2, 2              @ Take Down
-	song se_w059, 1, 1              @ Blizzard
-	song se_w059b, 1, 1             @ Blizzard 2
-	song se_w010, 1, 1              @ Scratch
-	song se_w011, 1, 1              @ Vicegrip
-	song se_w017, 1, 1              @ Wing Attack
-	song se_w019, 1, 1              @ Fly
-	song se_w028, 1, 1              @ Sand-Attack
-	song se_w013b, 1, 1             @ Razor Wind 2
-	song se_w044, 1, 1              @ Bite
-	song se_w029, 1, 1              @ Headbutt
-	song se_w057, 1, 1              @ Surf
-	song se_w056, 1, 1              @ Hydro Pump
-	song se_w250, 1, 1              @ Whirlpool
-	song se_w030, 1, 1              @ Horn Attack
-	song se_w039, 2, 2              @ Tail Whip
-	song se_w054, 1, 1              @ Mist
-	song se_w077, 1, 1              @ PoisonPowder
-	song se_w020, 2, 2              @ Bind
-	song se_w082, 1, 1              @ Dragon Rage
-	song se_w047, 1, 1              @ Sing
-	song se_w195, 1, 1              @ Perish Song
-	song se_w006, 1, 1              @ Pay Day
-	song se_w091, 1, 1              @ Dig
-	song se_w146, 1, 1              @ Dizzy Punch
-	song se_w120, 1, 1              @ Self-Destruct
-	song se_w153, 1, 1              @ Explosion
-	song se_w071b, 1, 1             @ Absorb 2
-	song se_w071, 1, 1              @ Absorb
-	song se_w103, 1, 1              @ Screech
-	song se_w062, 1, 1              @ BubbleBeam
-	song se_w062b, 1, 1             @ BubbleBeam 2
-	song se_w048, 1, 1              @ Supersonic
-	song se_w187, 1, 1              @ Belly Drum
-	song se_w118, 1, 1              @ Metronome
-	song se_w155, 1, 1              @ Bonemerang
-	song se_w122, 1, 1              @ Lick
-	song se_w060, 1, 1              @ Psybeam
-	song se_w185, 1, 1              @ Faint Attack
-	song se_w014, 1, 1              @ Swords Dance
-	song se_w043, 1, 1              @ Leer
-	song se_w207, 1, 1              @ Swagger
-	song se_w207b, 1, 1             @ Swagger 2
-	song se_w215, 1, 1              @ Heal Bell
-	song se_w109, 1, 1              @ Confuse Ray
-	song se_w173, 1, 1              @ Snore
-	song se_w280, 1, 1              @ Brick Break
-	song se_w202, 1, 1              @ Giga Drain
-	song se_w060b, 1, 1             @ Psybeam 2
-	song se_w076, 2, 2              @ SolarBeam
-	song se_w080, 1, 1              @ Petal Dance
-	song se_w100, 1, 1              @ Teleport
-	song se_w107, 1, 1              @ Minimize
-	song se_w166, 1, 1              @ Sketch
-	song se_w129, 1, 1              @ Swift
-	song se_w115, 1, 1              @ Reflect
-	song se_w112, 1, 1              @ Barrier
-	song se_w197, 2, 2              @ Detect
-	song se_w199, 1, 1              @ Lock-On
-	song se_w236, 1, 1              @ Moonlight
-	song se_w204, 1, 1              @ Charm
-	song se_w268, 1, 1              @ Charge
-	song se_w070, 1, 1              @ Strength
-	song se_w063, 1, 1              @ Hyper Beam
-	song se_w127, 1, 1              @ Waterfall
-	song se_w179, 1, 1              @ Reversal
-	song se_w151, 1, 1              @ Acid Armor
-	song se_w201, 1, 1              @ Sandstorm
-	song se_w161, 1, 1              @ Tri-Attack
-	song se_w161b, 1, 1             @ Tri-Attack 2
-	song se_w227, 1, 1              @ Encore
-	song se_w227b, 2, 2             @ Encore 2
-	song se_w226, 1, 1              @ Baton Pass
-	song se_w208, 1, 1              @ Milk Drink
-	song se_w213, 1, 1              @ Attract
-	song se_w213b, 1, 1             @ Attract 2
-	song se_w234, 1, 1              @ Morning Sun
-	song se_w260, 1, 1              @ Flatter
-	song se_w328, 1, 1              @ Sand Tomb
-	song se_w320, 1, 1              @ GrassWhistle
-	song se_w255, 1, 1              @ Spit Up
-	song se_w291, 1, 1              @ Dive
-	song se_w089, 2, 2              @ Earthquake
-	song se_w239, 2, 2              @ Twister
-	song se_w230, 1, 1              @ Sweet Scent
-	song se_w281, 1, 1              @ Yawn
-	song se_w327, 2, 2              @ Sky Uppercut
-	song se_w287, 1, 1              @ Stat Increased
-	song se_w257, 1, 1              @ Heat Wave
-	song se_w253, 1, 1              @ Uproar
-	song se_w258, 1, 1              @ Hail
-	song se_w322, 2, 2              @ Cosmic Power
-	song se_w298, 1, 1              @ Teeter Dance
-	song se_w287b, 1, 1             @ Stat Decreased
-	song se_w114, 1, 1              @ Haze
-	song se_w063b, 1, 1             @ Hyper Beam 2
-	song se_rg_w_door, 1, 1         @ Door (FRLG)
-	song se_rg_card1, 1, 1          @ Trainer Card 1 (FRLG)
-	song se_rg_card2, 1, 1          @ Trainer Card 2 (FRLG)
-	song se_rg_card3, 1, 1          @ Trainer Card 3 (FRLG)
-	song se_rg_bag1, 1, 1           @ Bag Scroll (FRLG)
-	song se_rg_bag2, 1, 1           @ Bag Pocket Change (FRLG)
-	song se_rg_getting, 1, 1
-	song se_rg_shop, 1, 1           @ Cash Register (FRLG)
-	song se_rg_kiteki, 1, 1         @ S.S. Anne Horn (FRLG)
-	song se_rg_help_op, 1, 1        @ Help Menu Open (FRLG)
-	song se_rg_help_cl, 1, 1        @ Help Menu Close (FRLG)
-	song se_rg_help_ng, 1, 1        @ Help Menu Error (FRLG)
-	song se_rg_deomov, 1, 1         @ Deoxys Moves
-	song se_rg_excellent, 1, 1      @ HP Restored (FRLG)
-	song se_rg_nawamiss, 1, 1
-	song se_toreeye, 1, 1           @ Trainer's Eye Call
-	song se_toreoff, 1, 1           @ Trainer's Eye Hang Up
-	song se_hantei1, 1, 1           @ Battle Arena - Judgment 1
-	song se_hantei2, 1, 1           @ Battle Arena - Judgment 2
-	song se_curtain, 1, 1           @ Battle Pike - Curtain Opens
-	song se_curtain1, 1, 1          @ Battle Pike - Curtain Closes
-	song se_ussoki, 1, 1            @ Sudowoodo
+	song se_save, 1, 1
+	song se_ball_bounce_1, 1, 1
+	song se_ball_bounce_2, 1, 1
+	song se_ball_bounce_3, 1, 1
+	song se_ball_bounce_4, 1, 1
+	song se_ball_trade, 2, 2
+	song se_ball_throw, 1, 1
+	song se_note_c, 2, 2
+	song se_note_d, 2, 2
+	song se_note_e, 2, 2
+	song se_note_f, 2, 2
+	song se_note_g, 2, 2
+	song se_note_a, 2, 2
+	song se_note_b, 2, 2
+	song se_note_c_high, 2, 2
+	song se_puddle, 2, 2
+	song se_bridge_walk, 2, 2
+	song se_itemfinder, 1, 1
+	song se_ding_dong, 1, 1
+	song se_balloon_red, 2, 2
+	song se_balloon_blue, 2, 2
+	song se_balloon_yellow, 2, 2
+	song se_breakable_door, 2, 2
+	song se_mud_ball, 2, 2
+	song se_field_poison, 1, 1
+	song se_escalator, 1, 1
+	song se_thunderstorm, 3, 3
+	song se_thunderstorm_stop, 3, 3
+	song se_downpour, 3, 3
+	song se_downpour_stop, 3, 3
+	song se_rain, 3, 3
+	song se_rain_stop, 3, 3
+	song se_thunder, 1, 1
+	song se_thunder2, 1, 1
+	song se_elevator, 1, 1
+	song se_low_health, 3, 3
+	song se_exp_max, 1, 1
+	song se_roulette_ball, 2, 2
+	song se_roulette_ball2, 2, 2
+	song se_taillow_wing_flap, 1, 1
+	song se_shop, 1, 1
+	song se_contest_heart, 1, 1
+	song se_contest_curtain_rise, 1, 1
+	song se_contest_curtain_fall, 1, 1
+	song se_contest_icon_change, 1, 1
+	song se_contest_icon_clear, 1, 1
+	song se_contest_mons_turn, 1, 1
+	song se_shiny, 1, 1
+	song se_intro_blast, 1, 1
+	song se_mugshot, 1, 1
+	song se_applause, 1, 1
+	song se_vend, 1, 1
+	song se_orb, 1, 1
+	song se_dex_scroll, 1, 1
+	song se_dex_page, 1, 1
+	song se_pokenav_on, 1, 1
+	song se_pokenav_off, 1, 1
+	song se_dex_search, 1, 1
+	song se_egg_hatch, 1, 1
+	song se_ball_tray_enter, 1, 1
+	song se_ball_tray_ball, 1, 1
+	song se_ball_tray_exit, 2, 2
+	song se_glass_flute, 1, 1
+	song se_m_thunderbolt, 2, 2
+	song se_m_thunderbolt2, 1, 1
+	song se_m_harden, 1, 1
+	song se_m_nightmare, 1, 1
+	song se_m_vital_throw, 1, 1
+	song se_m_vital_throw2, 1, 1
+	song se_m_bubble, 1, 1
+	song se_m_bubble2, 1, 1
+	song se_m_bubble3, 1, 1
+	song se_m_rain_dance, 1, 1
+	song se_m_cut, 1, 1
+	song se_m_string_shot, 1, 1
+	song se_m_string_shot2, 1, 1
+	song se_m_rock_throw, 1, 1
+	song se_m_gust, 2, 2
+	song se_m_gust2, 2, 2
+	song se_m_double_slap, 1, 1
+	song se_m_double_team, 1, 1
+	song se_m_razor_wind, 1, 1
+	song se_m_icy_wind, 1, 1
+	song se_m_thunder_wave, 1, 1
+	song se_m_comet_punch, 1, 1
+	song se_m_mega_kick, 1, 1
+	song se_m_mega_kick2, 1, 1
+	song se_m_crabhammer, 1, 1
+	song se_m_jump_kick, 1, 1
+	song se_m_flame_wheel, 1, 1
+	song se_m_flame_wheel2, 1, 1
+	song se_m_flamethrower, 1, 1
+	song se_m_fire_punch, 1, 1
+	song se_m_toxic, 1, 1
+	song se_m_sacred_fire, 1, 1
+	song se_m_sacred_fire2, 2, 2
+	song se_m_ember, 1, 1
+	song se_m_take_down, 2, 2
+	song se_m_blizzard, 1, 1
+	song se_m_blizzard2, 1, 1
+	song se_m_scratch, 1, 1
+	song se_m_vicegrip, 1, 1
+	song se_m_wing_attack, 1, 1
+	song se_m_fly, 1, 1
+	song se_m_sand_attack, 1, 1
+	song se_m_razor_wind2, 1, 1
+	song se_m_bite, 1, 1
+	song se_m_headbutt, 1, 1
+	song se_m_surf, 1, 1
+	song se_m_hydro_pump, 1, 1
+	song se_m_whirlpool, 1, 1
+	song se_m_horn_attack, 1, 1
+	song se_m_tail_whip, 2, 2
+	song se_m_mist, 1, 1
+	song se_m_poison_powder, 1, 1
+	song se_m_bind, 2, 2
+	song se_m_dragon_rage, 1, 1
+	song se_m_sing, 1, 1
+	song se_m_perish_song, 1, 1
+	song se_m_pay_day, 1, 1
+	song se_m_dig, 1, 1
+	song se_m_dizzy_punch, 1, 1
+	song se_m_self_destruct, 1, 1
+	song se_m_explosion, 1, 1
+	song se_m_absorb_2, 1, 1
+	song se_m_absorb, 1, 1
+	song se_m_screech, 1, 1
+	song se_m_bubble_beam, 1, 1
+	song se_m_bubble_beam2, 1, 1
+	song se_m_supersonic, 1, 1
+	song se_m_belly_drum, 1, 1
+	song se_m_metronome, 1, 1
+	song se_m_bonemerang, 1, 1
+	song se_m_lick, 1, 1
+	song se_m_psybeam, 1, 1
+	song se_m_faint_attack, 1, 1
+	song se_m_swords_dance, 1, 1
+	song se_m_leer, 1, 1
+	song se_m_swagger, 1, 1
+	song se_m_swagger2, 1, 1
+	song se_m_heal_bell, 1, 1
+	song se_m_confuse_ray, 1, 1
+	song se_m_snore, 1, 1
+	song se_m_brick_break, 1, 1
+	song se_m_giga_drain, 1, 1
+	song se_m_psybeam2, 1, 1
+	song se_m_solar_beam, 2, 2
+	song se_m_petal_dance, 1, 1
+	song se_m_teleport, 1, 1
+	song se_m_minimize, 1, 1
+	song se_m_sketch, 1, 1
+	song se_m_swift, 1, 1
+	song se_m_reflect, 1, 1
+	song se_m_barrier, 1, 1
+	song se_m_detect, 2, 2
+	song se_m_lock_on, 1, 1
+	song se_m_moonlight, 1, 1
+	song se_m_charm, 1, 1
+	song se_m_charge, 1, 1
+	song se_m_strength, 1, 1
+	song se_m_hyper_beam, 1, 1
+	song se_m_waterfall, 1, 1
+	song se_m_reversal, 1, 1
+	song se_m_acid_armor, 1, 1
+	song se_m_sandstorm, 1, 1
+	song se_m_tri_attack, 1, 1
+	song se_m_tri_attack2, 1, 1
+	song se_m_encore, 1, 1
+	song se_m_encore2, 2, 2
+	song se_m_baton_pass, 1, 1
+	song se_m_milk_drink, 1, 1
+	song se_m_attract, 1, 1
+	song se_m_attract2, 1, 1
+	song se_m_morning_sun, 1, 1
+	song se_m_flatter, 1, 1
+	song se_m_sand_tomb, 1, 1
+	song se_m_grasswhistle, 1, 1
+	song se_m_spit_up, 1, 1
+	song se_m_dive, 1, 1
+	song se_m_earthquake, 2, 2
+	song se_m_twister, 2, 2
+	song se_m_sweet_scent, 1, 1
+	song se_m_yawn, 1, 1
+	song se_m_sky_uppercut, 2, 2
+	song se_m_stat_increase, 1, 1
+	song se_m_heat_wave, 1, 1
+	song se_m_uproar, 1, 1
+	song se_m_hail, 1, 1
+	song se_m_cosmic_power, 2, 2
+	song se_m_teeter_dance, 1, 1
+	song se_m_stat_decrease, 1, 1
+	song se_m_haze, 1, 1
+	song se_m_hyper_beam2, 1, 1
+	song se_rg_door, 1, 1
+	song se_rg_card_flip, 1, 1
+	song se_rg_card_flipping, 1, 1
+	song se_rg_card_open, 1, 1
+	song se_rg_bag_cursor, 1, 1
+	song se_rg_bag_pocket, 1, 1
+	song se_rg_ball_click, 1, 1
+	song se_rg_shop, 1, 1
+	song se_rg_ss_anne_horn, 1, 1
+	song se_rg_help_open, 1, 1
+	song se_rg_help_close, 1, 1
+	song se_rg_help_error, 1, 1
+	song se_rg_deoxys_move, 1, 1
+	song se_rg_poke_jump_success, 1, 1
+	song se_rg_poke_jump_failure, 1, 1
+	song se_pokenav_call, 1, 1
+	song se_pokenav_hang_up, 1, 1
+	song se_arena_timeup1, 1, 1
+	song se_arena_timeup2, 1, 1
+	song se_pike_curtain_close, 1, 1
+	song se_pike_curtain_open, 1, 1
+	song se_sudowoodo_shake, 1, 1
 	song dummy_song_header, 0, 0
 	song dummy_song_header, 0, 0
 	song dummy_song_header, 0, 0
@@ -351,215 +351,215 @@ gSongTable:: @ 86B49F0
 	song dummy_song_header, 0, 0
 	song dummy_song_header, 0, 0
 	song dummy_song_header, 0, 0
-	song mus_tetsuji, 0, 0          @ Unused - TETSUJI
-	song mus_field13, 0, 0          @ Unused - Route 38
-	song mus_kachi22, 0, 0          @ Victory! (Wild Pokémon) (No Intro)
-	song mus_kachi2, 0, 0           @ Victory! (Wild Pokémon)
-	song mus_kachi3, 0, 0           @ Victory! (Gym Leader)
-	song mus_kachi5, 0, 0           @ Victory! (Wallace)
-	song mus_pcc, 0, 0              @ Unused - Pokémon Center (2)
-	song mus_nibi, 0, 0             @ Unused - Viridian City
-	song mus_suikun, 0, 0           @ Unused - Battle! (Entei/Raikou/Suicune)
-	song mus_dooro1, 0, 0           @ Route 101
-	song mus_dooro_x1, 0, 0         @ Route 110
-	song mus_dooro_x3, 0, 0         @ Route 120
-	song mus_machi_s2, 0, 0         @ Petalburg City
-	song mus_machi_s4, 0, 0         @ Oldale Town
-	song mus_gim, 0, 0              @ Pokémon Gym
-	song mus_naminori, 0, 0         @ Surf
-	song mus_dan01, 0, 0            @ Petalburg Woods
-	song mus_fanfa1, 2, 2           @ Level Up!
-	song mus_me_asa, 2, 2           @ Pokémon Healed
-	song mus_me_bachi, 2, 2         @ Obtained a Badge!
-	song mus_fanfa4, 2, 2           @ Obtained an Item!
-	song mus_fanfa5, 2, 2           @ Congratulations! Your Pokémon Evolved!
-	song mus_me_waza, 2, 2          @ Obtained a TM!
-	song mus_bijyutu, 0, 0          @ Museum
-	song mus_dooro_x4, 0, 0         @ Introductions
-	song mus_fune_kan, 0, 0         @ Oceanic Museum
-	song mus_me_shinka, 2, 2        @ Evolution (Intro)
-	song mus_shinka, 0, 0           @ Evolution
-	song mus_me_wasure, 2, 2        @ Move Deleted
-	song mus_syoujoeye, 0, 0        @ Trainers' Eyes Meet (Tuber♀)
-	song mus_boyeye, 0, 0           @ Trainers' Eyes Meet (Youngster)
-	song mus_dan02, 0, 0            @ Abandoned Ship
-	song mus_machi_s3, 0, 0         @ Fortree City
-	song mus_odamaki, 0, 0          @ Birch Pokémon Lab
-	song mus_b_tower, 0, 0          @ Battle Tower (RS)
-	song mus_swimeye, 0, 0          @ Trainers' Eyes Meet (Swimmer♀)
-	song mus_dan03, 0, 0            @ Cave of Origin
-	song mus_me_kinomi, 2, 2        @ Obtained a Berry!
-	song mus_me_tama, 2, 2          @ The Super-Ancient Pokémon Awaken!
-	song mus_me_b_big, 2, 2         @ Jackpot
-	song mus_me_b_small, 2, 2       @ Win
-	song mus_me_zannen, 2, 2        @ Lose
-	song mus_bd_time, 0, 0          @ Reel Time
-	song mus_test1, 0, 0            @ Pokémon Contest! (Multiplayer - Player 1)
-	song mus_test2, 0, 0            @ Pokémon Contest! (Multiplayer - Player 2)
-	song mus_test3, 0, 0            @ Pokémon Contest! (Multiplayer - Player 3)
-	song mus_test4, 0, 0            @ Pokémon Contest! (Multiplayer - Player 4)
-	song mus_test, 0, 0             @ Trainers' Eyes Meet (Gentleman)
-	song mus_gomachi0, 0, 0         @ Verdanturf Town
-	song mus_gotown, 0, 0           @ Rustboro City
-	song mus_pokecen, 0, 0          @ Pokémon Center
-	song mus_nextroad, 0, 0         @ Route 104
-	song mus_granroad, 0, 0         @ Route 119
-	song mus_cycling, 0, 0          @ Cycling
-	song mus_friendly, 0, 0         @ Poké Mart
-	song mus_mishiro, 0, 0          @ Littleroot Town
-	song mus_tozan, 0, 0            @ Mt. Chimney
-	song mus_girleye, 0, 0          @ Trainers' Eyes Meet (Lass)
-	song mus_minamo, 0, 0           @ Lilycove City
-	song mus_ashroad, 0, 0          @ Route 111
-	song mus_event0, 0, 0           @ H-Help Me!
-	song mus_deepdeep, 0, 0         @ Dive
-	song mus_kachi1, 0, 0           @ Victory! (Trainer Battle)
-	song mus_title3, 0, 0           @ Title Screen
-	song mus_demo1, 0, 0            @ Opening Movie: Setting out on a Journey in the Hoenn Region
-	song mus_girl_sup, 0, 0         @ May
-	song mus_hageshii, 0, 0         @ Trainers' Eyes Meet (Psychic)
-	song mus_kakkoii, 0, 0          @ Trainers' Eyes Meet (Cooltrainer)
-	song mus_kazanbai, 0, 0         @ Route 113
-	song mus_aqa_0, 0, 0            @ Team Aqua Appears!
-	song mus_tsuretek, 0, 0         @ Hurry Along
-	song mus_boy_sup, 0, 0          @ Brendan
-	song mus_rainbow, 0, 0          @ Evergrande City
-	song mus_ayasii, 0, 0           @ Trainers' Eyes Meet (Hex Maniac)
-	song mus_kachi4, 0, 0           @ Victory! (Team Aqua / Team Magma)
-	song mus_ropeway, 0, 0          @ Cable Car
-	song mus_casino, 0, 0           @ Game Corner
-	song mus_hightown, 0, 0         @ Dewford Town
-	song mus_safari, 0, 0           @ Safari Zone
-	song mus_c_road, 0, 0           @ Victory Road
-	song mus_ajito, 0, 0            @ Hideout
-	song mus_m_boat, 0, 0           @ Crossing the Sea
-	song mus_m_dungon, 0, 0         @ Mt. Pyre
-	song mus_finecity, 0, 0         @ Slateport City
-	song mus_machupi, 0, 0          @ Mt. Pyre Exterior
-	song mus_p_school, 0, 0         @ Trainers' School
-	song mus_dendou, 0, 0           @ The Hall of Fame
-	song mus_tonekusa, 0, 0         @ Fallarbor Town
-	song mus_maborosi, 0, 0         @ Sealed Chamber
-	song mus_con_fan, 0, 0          @ Contest Winner
-	song mus_contest0, 0, 0         @ Pokémon Contest!
-	song mus_mgm0, 0, 0             @ Team Magma Appears!
-	song mus_t_battle, 0, 0         @ Opening Movie: Double Battles
-	song mus_ooame, 0, 0            @ Heavy Rain
-	song mus_hideri, 0, 0           @ The Drought
-	song mus_runecity, 0, 0         @ Sootopolis City
-	song mus_con_k, 0, 0            @ Results Announcement
-	song mus_eikou_r, 0, 0          @ Room of Glory
-	song mus_karakuri, 0, 0         @ The Trick House
-	song mus_hutago, 0, 0           @ Twins
-	song mus_sitennou, 0, 0         @ The Elite Four Appear!
-	song mus_yama_eye, 0, 0         @ Trainers' Eyes Meet (Hiker)
-	song mus_conlobby, 0, 0         @ Contest Lobby
-	song mus_inter_v, 0, 0          @ Interviewers
-	song mus_daigo, 0, 0            @ Champion Wallace
-	song mus_thankfor, 0, 0         @ Ending Theme
-	song mus_end, 0, 0              @ The End
-	song mus_b_frontier, 0, 0       @ Battle Frontier
-	song mus_b_arena, 0, 0          @ Battle Arena
-	song mus_me_pointget, 2, 2      @ Obtained a Battle Point!
-	song mus_me_tore_eye, 2, 2      @ Registered Trainer!
-	song mus_pyramid, 0, 0          @ Battle Pyramid
-	song mus_pyramid_top, 0, 0      @ Battle Pyramid Summit
-	song mus_b_palace, 0, 0         @ Battle Palace
-	song mus_rekkuu_kourin, 0, 0    @ Rayquaza Enters!
-	song mus_sattower, 0, 0         @ Battle Tower
-	song mus_me_symbolget, 2, 2     @ Obtained a Frontier Symbol!
-	song mus_b_dome, 0, 0           @ Battle Dome
-	song mus_b_tube, 0, 0           @ Battle Pike
-	song mus_b_factory, 0, 0        @ Battle Factory
-	song mus_vs_rekku, 0, 0         @ Battle! (Rayquaza)
-	song mus_vs_front, 0, 0         @ Battle! (Frontier Brain)
-	song mus_vs_mew, 0, 0           @ Battle! (Mew)
-	song mus_b_dome1, 0, 0          @ Battle Dome Lobby
-	song mus_battle27, 0, 0         @ Battle! (Wild Pokémon)
-	song mus_battle31, 0, 0         @ Battle! (Team Aqua / Team Magma)
-	song mus_battle20, 0, 0         @ Battle! (Trainer Battle)
-	song mus_battle32, 0, 0         @ Battle! (Gym Leader)
-	song mus_battle33, 0, 0         @ Battle! (Champion Wallace)
-	song mus_battle36, 0, 0         @ Battle! (Regirock/Regice/Registeel)
-	song mus_battle34, 0, 0         @ Battle! (Groudon/Kyogre)
-	song mus_battle35, 0, 0         @ Battle! (Brendan/May/Steven)
-	song mus_battle38, 0, 0         @ Battle! (Elite Four)
-	song mus_battle30, 0, 0         @ Battle! (Team Aqua/Team Magma Leaders)
-	song mus_rg_annai, 0, 0         @ Guide (FRLG)
-	song mus_rg_slot, 0, 0          @ Rocket Game Corner (FRLG)
-	song mus_rg_ajito, 0, 0         @ Rocket Hideout (FRLG)
-	song mus_rg_gym, 0, 0           @ Pokémon Gym (FRLG)
-	song mus_rg_purin, 2, 2         @ Jigglypuff's Song (FRLG)
-	song mus_rg_demo, 0, 0          @ Opening Movie (FRLG)
-	song mus_rg_title, 0, 0         @ Title Screen (FRLG)
-	song mus_rg_guren, 0, 0         @ Cinnabar Island Theme (FRLG)
-	song mus_rg_shion, 0, 0         @ Lavender Town Theme (FRLG)
-	song mus_rg_kaihuku, 0, 0       @ Pokémon Healed (FRLG)
-	song mus_rg_cycling, 0, 0       @ Cycling (FRLG)
-	song mus_rg_rocket, 0, 0        @ A Trainer Appears (Bad Guy Version) (FRLG)
-	song mus_rg_shoujo, 0, 0        @ A Trainer Appears (Girl Version) (FRLG)
-	song mus_rg_shounen, 0, 0       @ A Trainer Appears (Boy Version) (FRLG)
-	song mus_rg_dendou, 0, 0        @ Hall of Fame (FRLG)
-	song mus_rg_t_mori, 0, 0        @ Viridian Forest (FRLG)
-	song mus_rg_otsukimi, 0, 0      @ Navel Rock
-	song mus_rg_pokeyashi, 0, 0     @ Pokémon Mansion (FRLG)
-	song mus_rg_ending, 0, 0        @ Ending Theme (FRLG)
-	song mus_rg_load01, 0, 0        @ Road to Viridian City: Leaving Pallet Town (FRLG)
-	song mus_rg_opening, 0, 0       @ Welcome to the World of Pokémon! (FRLG)
-	song mus_rg_load02, 0, 0        @ Road to Cerulean City: Leaving Mt. Moon (FRLG)
-	song mus_rg_load03, 0, 0        @ Road to Fuchsia City: Leaving Lavender Town (FRLG)
-	song mus_rg_champ_r, 0, 0       @ The Final Road (FRLG)
-	song mus_rg_vs_gym, 0, 0        @ Battle! (Gym Leader Battle) (FRLG)
-	song mus_rg_vs_tore, 0, 0       @ Battle! (Trainer Battle) (FRLG)
-	song mus_rg_vs_yasei, 0, 0      @ Battle! (Wild Pokémon) (FRLG)
-	song mus_rg_vs_last, 0, 0       @ Final Battle! (Rival) (FRLG)
-	song mus_rg_masara, 0, 0        @ Pallet Town Theme (FRLG)
-	song mus_rg_kenkyu, 0, 0        @ Professor Oak's Laboratory (FRLG)
-	song mus_rg_ohkido, 0, 0        @ Professor Oak (FRLG)
-	song mus_rg_pokecen, 0, 0       @ Pokémon Center (FRLG)
-	song mus_rg_santoan, 0, 0       @ The S.S. Anne (FRLG)
-	song mus_rg_naminori, 0, 0      @ The Sea (FRLG)
-	song mus_rg_p_tower, 0, 0       @ Pokémon Tower (FRLG)
-	song mus_rg_shiruhu, 0, 0       @ Silph Co. (FRLG)
-	song mus_rg_hanada, 0, 0        @ Fuchsia City Theme (FRLG)
-	song mus_rg_tamamusi, 0, 0      @ Celadon City Theme (FRLG)
-	song mus_rg_win_tre, 0, 0       @ Victory! (Trainer Battle) (FRLG)
-	song mus_rg_win_yasei, 0, 0     @ Victory! (Wild Pokémon) (FRLG)
-	song mus_rg_win_gym, 0, 0       @ Victory! (Gym Leader Battle) (FRLG)
-	song mus_rg_kuchiba, 0, 0       @ Vermillion City Theme (FRLG)
-	song mus_rg_nibi, 0, 0          @ Pewter City Theme (FRLG)
-	song mus_rg_rival1, 0, 0        @ A Rival Appears (FRLG)
-	song mus_rg_rival2, 0, 0        @ A Rival Appears (No Intro) (FRLG)
-	song mus_rg_fan2, 2, 2          @ Fanfare: Professor Oak's Evaluation (FRLG)
-	song mus_rg_fan5, 2, 2          @ Fanfare: Pokémon Obtained (FRLG)
-	song mus_rg_fan6, 2, 2          @ Fanfare: Pokémon Caught
-	song mus_me_rg_photo, 2, 2      @ Pokémon Printer (FRLG)
-	song mus_rg_titlerog, 0, 0      @ Game Freak Logo (FRLG)
-	song mus_rg_get_yasei, 0, 0     @ Fanfare: Pokémon Caught (No Intro) (FRLG)
-	song mus_rg_sousa, 0, 0         @ Game Tutorial (1) (FRLG)
-	song mus_rg_sekaikan, 0, 0      @ Game Tutorial (2) (FRLG)
-	song mus_rg_seibetu, 0, 0       @ Game Tutorial (3) (FRLG)
-	song mus_rg_jump, 0, 0          @ Pokémon Jump (FRLG)
-	song mus_rg_union, 0, 0         @ The Union Room (FRLG)
-	song mus_rg_network, 0, 0       @ Pokémon Net Center (FRLG)
-	song mus_rg_okurimono, 0, 0     @ Mystery Gift (FRLG)
-	song mus_rg_kinomikui, 0, 0     @ Dodrio Berry Picking (FRLG)
-	song mus_rg_nanadungeon, 0, 0   @ Mt. Ember (FRLG)
-	song mus_rg_oshie_tv, 0, 0      @ Teachy TV Lesson (FRLG)
-	song mus_rg_nanashima, 0, 0     @ Sevii Islands (FRLG)
-	song mus_rg_nanaiseki, 0, 0     @ Tanoby Chambers (FRLG)
-	song mus_rg_nana123, 0, 0       @ Sevii Islands: One, Two & Three Islands (FRLG)
-	song mus_rg_nana45, 0, 0        @ Sevii Islands: Four & Five Islands (FRLG)
-	song mus_rg_nana67, 0, 0        @ Sevii Islands: Six & Seven Islands (FRLG)
-	song mus_rg_pokefue, 2, 2       @ The Poké Flute (FRLG)
-	song mus_rg_vs_deo, 0, 0        @ Battle! (Deoxys)
-	song mus_rg_vs_myu2, 0, 0       @ Battle! (Mewtwo) (FRLG)
-	song mus_rg_vs_den, 0, 0        @ Battle! (Ho-Oh/Lugia)
-	song mus_rg_exeye, 0, 0         @ Tense Battle! (FRLG)
-	song mus_rg_deoeye, 0, 0        @ Deoxys Appears
-	song mus_rg_t_tower, 0, 0       @ Trainer Tower (FRLG)
-	song mus_rg_slowmasara, 0, 0    @ Epilogue (FRLG)
-	song mus_rg_tvnoize, 0, 0       @ Teachy TV Menu (FRLG)
+	song mus_littleroot_test, 0, 0
+	song mus_gsc_route38, 0, 0
+	song mus_caught, 0, 0
+	song mus_victory_wild, 0, 0
+	song mus_victory_gym_leader, 0, 0
+	song mus_victory_league, 0, 0
+	song mus_c_comm_center, 0, 0
+	song mus_gsc_pewter, 0, 0
+	song mus_c_vs_legend_beast, 0, 0
+	song mus_route101, 0, 0
+	song mus_route110, 0, 0
+	song mus_route120, 0, 0
+	song mus_petalburg, 0, 0
+	song mus_oldale, 0, 0
+	song mus_gym, 0, 0
+	song mus_surf, 0, 0
+	song mus_petalburg_woods, 0, 0
+	song mus_level_up, 2, 2
+	song mus_heal, 2, 2
+	song mus_obtain_badge, 2, 2
+	song mus_obtain_item, 2, 2
+	song mus_evolved, 2, 2
+	song mus_obtain_tmhm, 2, 2
+	song mus_lilycove_museum, 0, 0
+	song mus_route122, 0, 0
+	song mus_oceanic_museum, 0, 0
+	song mus_evolution_intro, 2, 2
+	song mus_evolution, 0, 0
+	song mus_move_deleted, 2, 2
+	song mus_encounter_girl, 0, 0
+	song mus_encounter_male, 0, 0
+	song mus_abandoned_ship, 0, 0
+	song mus_fortree, 0, 0
+	song mus_birch_lab, 0, 0
+	song mus_b_tower_rs, 0, 0
+	song mus_encounter_swimmer, 0, 0
+	song mus_cave_of_origin, 0, 0
+	song mus_obtain_berry, 2, 2
+	song mus_awaken_legend, 2, 2
+	song mus_slots_jackpot, 2, 2
+	song mus_slots_win, 2, 2
+	song mus_too_bad, 2, 2
+	song mus_roulette, 0, 0
+	song mus_link_contest_p1, 0, 0
+	song mus_link_contest_p2, 0, 0
+	song mus_link_contest_p3, 0, 0
+	song mus_link_contest_p4, 0, 0
+	song mus_encounter_rich, 0, 0
+	song mus_verdanturf, 0, 0
+	song mus_rustboro, 0, 0
+	song mus_poke_center, 0, 0
+	song mus_route104, 0, 0
+	song mus_route119, 0, 0
+	song mus_cycling, 0, 0
+	song mus_poke_mart, 0, 0
+	song mus_littleroot, 0, 0
+	song mus_mt_chimney, 0, 0
+	song mus_encounter_female, 0, 0
+	song mus_lilycove, 0, 0
+	song mus_route111, 0, 0
+	song mus_help, 0, 0
+	song mus_underwater, 0, 0
+	song mus_victory_trainer, 0, 0
+	song mus_title, 0, 0
+	song mus_intro, 0, 0
+	song mus_encounter_may, 0, 0
+	song mus_encounter_intense, 0, 0
+	song mus_encounter_cool, 0, 0
+	song mus_route113, 0, 0
+	song mus_encounter_aqua, 0, 0
+	song mus_follow_me, 0, 0
+	song mus_encounter_brendan, 0, 0
+	song mus_ever_grande, 0, 0
+	song mus_encounter_suspicious, 0, 0
+	song mus_victory_aqua_magma, 0, 0
+	song mus_cable_car, 0, 0
+	song mus_game_corner, 0, 0
+	song mus_dewford, 0, 0
+	song mus_safari_zone, 0, 0
+	song mus_victory_road, 0, 0
+	song mus_aqua_magma_hideout, 0, 0
+	song mus_sailing, 0, 0
+	song mus_mt_pyre, 0, 0
+	song mus_slateport, 0, 0
+	song mus_mt_pyre_exterior, 0, 0
+	song mus_school, 0, 0
+	song mus_hall_of_fame, 0, 0
+	song mus_fallarbor, 0, 0
+	song mus_sealed_chamber, 0, 0
+	song mus_contest_winner, 0, 0
+	song mus_contest, 0, 0
+	song mus_encounter_magma, 0, 0
+	song mus_intro_battle, 0, 0
+	song mus_abnormal_weather, 0, 0
+	song mus_weather_groudon, 0, 0
+	song mus_sootopolis, 0, 0
+	song mus_contest_results, 0, 0
+	song mus_hall_of_fame_room, 0, 0
+	song mus_trick_house, 0, 0
+	song mus_encounter_twins, 0, 0
+	song mus_encounter_elite_four, 0, 0
+	song mus_encounter_hiker, 0, 0
+	song mus_contest_lobby, 0, 0
+	song mus_encounter_interviewer, 0, 0
+	song mus_encounter_champion, 0, 0
+	song mus_credits, 0, 0
+	song mus_end, 0, 0
+	song mus_b_frontier, 0, 0
+	song mus_b_arena, 0, 0
+	song mus_obtain_b_points, 2, 2
+	song mus_register_match_call, 2, 2
+	song mus_b_pyramid, 0, 0
+	song mus_b_pyramid_top, 0, 0
+	song mus_b_palace, 0, 0
+	song mus_rayquaza_appears, 0, 0
+	song mus_b_tower, 0, 0
+	song mus_obtain_symbol, 2, 2
+	song mus_b_dome, 0, 0
+	song mus_b_pike, 0, 0
+	song mus_b_factory, 0, 0
+	song mus_vs_rayquaza, 0, 0
+	song mus_vs_frontier_brain, 0, 0
+	song mus_vs_mew, 0, 0
+	song mus_b_dome_lobby, 0, 0
+	song mus_vs_wild, 0, 0
+	song mus_vs_aqua_magma, 0, 0
+	song mus_vs_trainer, 0, 0
+	song mus_vs_gym_leader, 0, 0
+	song mus_vs_champion, 0, 0
+	song mus_vs_regi, 0, 0
+	song mus_vs_kyogre_groudon, 0, 0
+	song mus_vs_rival, 0, 0
+	song mus_vs_elite_four, 0, 0
+	song mus_vs_aqua_magma_leader, 0, 0
+	song mus_rg_follow_me, 0, 0
+	song mus_rg_game_corner, 0, 0
+	song mus_rg_rocket_hideout, 0, 0
+	song mus_rg_gym, 0, 0
+	song mus_rg_jigglypuff, 2, 2
+	song mus_rg_intro_fight, 0, 0
+	song mus_rg_title, 0, 0
+	song mus_rg_cinnabar, 0, 0
+	song mus_rg_lavender, 0, 0
+	song mus_rg_heal, 0, 0
+	song mus_rg_cycling, 0, 0
+	song mus_rg_encounter_rocket, 0, 0
+	song mus_rg_encounter_girl, 0, 0
+	song mus_rg_encounter_boy, 0, 0
+	song mus_rg_hall_of_fame, 0, 0
+	song mus_rg_viridian_forest, 0, 0
+	song mus_rg_mt_moon, 0, 0
+	song mus_rg_poke_mansion, 0, 0
+	song mus_rg_credits, 0, 0
+	song mus_rg_route1, 0, 0
+	song mus_rg_route24, 0, 0
+	song mus_rg_route3, 0, 0
+	song mus_rg_route11, 0, 0
+	song mus_rg_victory_road, 0, 0
+	song mus_rg_vs_gym_leader, 0, 0
+	song mus_rg_vs_trainer, 0, 0
+	song mus_rg_vs_wild, 0, 0
+	song mus_rg_vs_champion, 0, 0
+	song mus_rg_pallet, 0, 0
+	song mus_rg_oak_lab, 0, 0
+	song mus_rg_oak, 0, 0
+	song mus_rg_poke_center, 0, 0
+	song mus_rg_ss_anne, 0, 0
+	song mus_rg_surf, 0, 0
+	song mus_rg_poke_tower, 0, 0
+	song mus_rg_silph, 0, 0
+	song mus_rg_fuchsia, 0, 0
+	song mus_rg_celadon, 0, 0
+	song mus_rg_victory_trainer, 0, 0
+	song mus_rg_victory_wild, 0, 0
+	song mus_rg_victory_gym_leader, 0, 0
+	song mus_rg_vermillion, 0, 0
+	song mus_rg_pewter, 0, 0
+	song mus_rg_encounter_rival, 0, 0
+	song mus_rg_rival_exit, 0, 0
+	song mus_rg_dex_rating, 2, 2
+	song mus_rg_obtain_key_item, 2, 2
+	song mus_rg_caught_intro, 2, 2
+	song mus_rg_photo, 2, 2
+	song mus_rg_game_freak, 0, 0
+	song mus_rg_caught, 0, 0
+	song mus_rg_new_game_instruct, 0, 0
+	song mus_rg_new_game_intro, 0, 0
+	song mus_rg_new_game_exit, 0, 0
+	song mus_rg_poke_jump, 0, 0
+	song mus_rg_union_room, 0, 0
+	song mus_rg_net_center, 0, 0
+	song mus_rg_mystery_gift, 0, 0
+	song mus_rg_berry_pick, 0, 0
+	song mus_rg_sevii_cave, 0, 0
+	song mus_rg_teachy_tv_show, 0, 0
+	song mus_rg_sevii_route, 0, 0
+	song mus_rg_sevii_dungeon, 0, 0
+	song mus_rg_sevii_123, 0, 0
+	song mus_rg_sevii_45, 0, 0
+	song mus_rg_sevii_67, 0, 0
+	song mus_rg_poke_flute, 2, 2
+	song mus_rg_vs_deoxys, 0, 0
+	song mus_rg_vs_mewtwo, 0, 0
+	song mus_rg_vs_legend, 0, 0
+	song mus_rg_encounter_gym_leader, 0, 0
+	song mus_rg_encounter_deoxys, 0, 0
+	song mus_rg_trainer_tower, 0, 0
+	song mus_rg_slow_pallet, 0, 0
+	song mus_rg_teachy_tv_menu, 0, 0
 	song ph_trap_blend, 2, 2
 	song ph_trap_held, 2, 2
 	song ph_trap_solo, 2, 2
diff --git a/sound/songs/midi/mus_dan02.mid b/sound/songs/midi/mus_abandoned_ship.mid
index 84d0cd199..84d0cd199 100644
--- a/sound/songs/midi/mus_dan02.mid
+++ b/sound/songs/midi/mus_abandoned_ship.mid
diff --git a/sound/songs/midi/mus_ooame.mid b/sound/songs/midi/mus_abnormal_weather.mid
index be847f6a6..be847f6a6 100644
--- a/sound/songs/midi/mus_ooame.mid
+++ b/sound/songs/midi/mus_abnormal_weather.mid
diff --git a/sound/songs/midi/mus_ajito.mid b/sound/songs/midi/mus_aqua_magma_hideout.mid
index 200fa88dd..200fa88dd 100644
--- a/sound/songs/midi/mus_ajito.mid
+++ b/sound/songs/midi/mus_aqua_magma_hideout.mid
diff --git a/sound/songs/midi/mus_me_tama.mid b/sound/songs/midi/mus_awaken_legend.mid
index 4190733d9..4190733d9 100644
--- a/sound/songs/midi/mus_me_tama.mid
+++ b/sound/songs/midi/mus_awaken_legend.mid
diff --git a/sound/songs/midi/mus_b_dome1.mid b/sound/songs/midi/mus_b_dome_lobby.mid
index 69aefab0a..69aefab0a 100644
--- a/sound/songs/midi/mus_b_dome1.mid
+++ b/sound/songs/midi/mus_b_dome_lobby.mid
diff --git a/sound/songs/midi/mus_b_tube.mid b/sound/songs/midi/mus_b_pike.mid
index 1909543f3..1909543f3 100644
--- a/sound/songs/midi/mus_b_tube.mid
+++ b/sound/songs/midi/mus_b_pike.mid
diff --git a/sound/songs/midi/mus_pyramid.mid b/sound/songs/midi/mus_b_pyramid.mid
index ceb50e667..ceb50e667 100644
--- a/sound/songs/midi/mus_pyramid.mid
+++ b/sound/songs/midi/mus_b_pyramid.mid
diff --git a/sound/songs/midi/mus_pyramid_top.mid b/sound/songs/midi/mus_b_pyramid_top.mid
index 502013243..502013243 100644
--- a/sound/songs/midi/mus_pyramid_top.mid
+++ b/sound/songs/midi/mus_b_pyramid_top.mid
diff --git a/sound/songs/midi/mus_b_tower.mid b/sound/songs/midi/mus_b_tower.mid
index 8e0de8968..a8294614f 100644
--- a/sound/songs/midi/mus_b_tower.mid
+++ b/sound/songs/midi/mus_b_tower.mid
diff --git a/sound/songs/midi/mus_b_tower_rs.mid b/sound/songs/midi/mus_b_tower_rs.mid
new file mode 100644
index 000000000..8e0de8968
--- /dev/null
+++ b/sound/songs/midi/mus_b_tower_rs.mid
diff --git a/sound/songs/midi/mus_odamaki.mid b/sound/songs/midi/mus_birch_lab.mid
index ac4226f98..ac4226f98 100644
--- a/sound/songs/midi/mus_odamaki.mid
+++ b/sound/songs/midi/mus_birch_lab.mid
diff --git a/sound/songs/midi/mus_pcc.mid b/sound/songs/midi/mus_c_comm_center.mid
index 15417549f..15417549f 100644
--- a/sound/songs/midi/mus_pcc.mid
+++ b/sound/songs/midi/mus_c_comm_center.mid
diff --git a/sound/songs/midi/mus_suikun.mid b/sound/songs/midi/mus_c_vs_legend_beast.mid
index afb9742d5..afb9742d5 100644
--- a/sound/songs/midi/mus_suikun.mid
+++ b/sound/songs/midi/mus_c_vs_legend_beast.mid
diff --git a/sound/songs/midi/mus_ropeway.mid b/sound/songs/midi/mus_cable_car.mid
index 5aa3a411a..5aa3a411a 100644
--- a/sound/songs/midi/mus_ropeway.mid
+++ b/sound/songs/midi/mus_cable_car.mid
diff --git a/sound/songs/midi/mus_kachi22.mid b/sound/songs/midi/mus_caught.mid
index 30b40c946..30b40c946 100644
--- a/sound/songs/midi/mus_kachi22.mid
+++ b/sound/songs/midi/mus_caught.mid
diff --git a/sound/songs/midi/mus_dan03.mid b/sound/songs/midi/mus_cave_of_origin.mid
index e0dbcff4b..e0dbcff4b 100644
--- a/sound/songs/midi/mus_dan03.mid
+++ b/sound/songs/midi/mus_cave_of_origin.mid
diff --git a/sound/songs/midi/mus_contest0.mid b/sound/songs/midi/mus_contest.mid
index b2946775b..b2946775b 100644
--- a/sound/songs/midi/mus_contest0.mid
+++ b/sound/songs/midi/mus_contest.mid
diff --git a/sound/songs/midi/mus_conlobby.mid b/sound/songs/midi/mus_contest_lobby.mid
index 680482e0c..680482e0c 100644
--- a/sound/songs/midi/mus_conlobby.mid
+++ b/sound/songs/midi/mus_contest_lobby.mid
diff --git a/sound/songs/midi/mus_con_k.mid b/sound/songs/midi/mus_contest_results.mid
index b45cd3ff5..b45cd3ff5 100644
--- a/sound/songs/midi/mus_con_k.mid
+++ b/sound/songs/midi/mus_contest_results.mid
diff --git a/sound/songs/midi/mus_con_fan.mid b/sound/songs/midi/mus_contest_winner.mid
index 1786fac50..1786fac50 100644
--- a/sound/songs/midi/mus_con_fan.mid
+++ b/sound/songs/midi/mus_contest_winner.mid
diff --git a/sound/songs/midi/mus_thankfor.mid b/sound/songs/midi/mus_credits.mid
index d4f9e1606..d4f9e1606 100644
--- a/sound/songs/midi/mus_thankfor.mid
+++ b/sound/songs/midi/mus_credits.mid
diff --git a/sound/songs/midi/mus_hightown.mid b/sound/songs/midi/mus_dewford.mid
index a437b3c34..a437b3c34 100644
--- a/sound/songs/midi/mus_hightown.mid
+++ b/sound/songs/midi/mus_dewford.mid
diff --git a/sound/songs/midi/mus_aqa_0.mid b/sound/songs/midi/mus_encounter_aqua.mid
index d5a2474bd..d5a2474bd 100644
--- a/sound/songs/midi/mus_aqa_0.mid
+++ b/sound/songs/midi/mus_encounter_aqua.mid
diff --git a/sound/songs/midi/mus_boy_sup.mid b/sound/songs/midi/mus_encounter_brendan.mid
index 366eb1db6..366eb1db6 100644
--- a/sound/songs/midi/mus_boy_sup.mid
+++ b/sound/songs/midi/mus_encounter_brendan.mid
diff --git a/sound/songs/midi/mus_daigo.mid b/sound/songs/midi/mus_encounter_champion.mid
index 750a31fe7..750a31fe7 100644
--- a/sound/songs/midi/mus_daigo.mid
+++ b/sound/songs/midi/mus_encounter_champion.mid
diff --git a/sound/songs/midi/mus_kakkoii.mid b/sound/songs/midi/mus_encounter_cool.mid
index c1a75663b..c1a75663b 100644
--- a/sound/songs/midi/mus_kakkoii.mid
+++ b/sound/songs/midi/mus_encounter_cool.mid
diff --git a/sound/songs/midi/mus_sitennou.mid b/sound/songs/midi/mus_encounter_elite_four.mid
index 21ba64b98..21ba64b98 100644
--- a/sound/songs/midi/mus_sitennou.mid
+++ b/sound/songs/midi/mus_encounter_elite_four.mid
diff --git a/sound/songs/midi/mus_girleye.mid b/sound/songs/midi/mus_encounter_female.mid
index a4015e70d..a4015e70d 100644
--- a/sound/songs/midi/mus_girleye.mid
+++ b/sound/songs/midi/mus_encounter_female.mid
diff --git a/sound/songs/midi/mus_syoujoeye.mid b/sound/songs/midi/mus_encounter_girl.mid
index 00226b287..00226b287 100644
--- a/sound/songs/midi/mus_syoujoeye.mid
+++ b/sound/songs/midi/mus_encounter_girl.mid
diff --git a/sound/songs/midi/mus_yama_eye.mid b/sound/songs/midi/mus_encounter_hiker.mid
index 0b58912f6..0b58912f6 100644
--- a/sound/songs/midi/mus_yama_eye.mid
+++ b/sound/songs/midi/mus_encounter_hiker.mid
diff --git a/sound/songs/midi/mus_hageshii.mid b/sound/songs/midi/mus_encounter_intense.mid
index 6b217a1fa..6b217a1fa 100644
--- a/sound/songs/midi/mus_hageshii.mid
+++ b/sound/songs/midi/mus_encounter_intense.mid
diff --git a/sound/songs/midi/mus_inter_v.mid b/sound/songs/midi/mus_encounter_interviewer.mid
index 504bf3df1..504bf3df1 100644
--- a/sound/songs/midi/mus_inter_v.mid
+++ b/sound/songs/midi/mus_encounter_interviewer.mid
diff --git a/sound/songs/midi/mus_mgm0.mid b/sound/songs/midi/mus_encounter_magma.mid
index 99f5c24a8..99f5c24a8 100644
--- a/sound/songs/midi/mus_mgm0.mid
+++ b/sound/songs/midi/mus_encounter_magma.mid
diff --git a/sound/songs/midi/mus_boyeye.mid b/sound/songs/midi/mus_encounter_male.mid
index bb6dcc0b9..bb6dcc0b9 100644
--- a/sound/songs/midi/mus_boyeye.mid
+++ b/sound/songs/midi/mus_encounter_male.mid
diff --git a/sound/songs/midi/mus_girl_sup.mid b/sound/songs/midi/mus_encounter_may.mid
index 8f05b2b43..8f05b2b43 100644
--- a/sound/songs/midi/mus_girl_sup.mid
+++ b/sound/songs/midi/mus_encounter_may.mid
diff --git a/sound/songs/midi/mus_test.mid b/sound/songs/midi/mus_encounter_rich.mid
index 913a4f89a..913a4f89a 100644
--- a/sound/songs/midi/mus_test.mid
+++ b/sound/songs/midi/mus_encounter_rich.mid
diff --git a/sound/songs/midi/mus_ayasii.mid b/sound/songs/midi/mus_encounter_suspicious.mid
index c9942e907..c9942e907 100644
--- a/sound/songs/midi/mus_ayasii.mid
+++ b/sound/songs/midi/mus_encounter_suspicious.mid
diff --git a/sound/songs/midi/mus_swimeye.mid b/sound/songs/midi/mus_encounter_swimmer.mid
index 4a376a928..4a376a928 100644
--- a/sound/songs/midi/mus_swimeye.mid
+++ b/sound/songs/midi/mus_encounter_swimmer.mid
diff --git a/sound/songs/midi/mus_hutago.mid b/sound/songs/midi/mus_encounter_twins.mid
index bc1b1da05..bc1b1da05 100644
--- a/sound/songs/midi/mus_hutago.mid
+++ b/sound/songs/midi/mus_encounter_twins.mid
diff --git a/sound/songs/midi/mus_rainbow.mid b/sound/songs/midi/mus_ever_grande.mid
index 8c1e20151..8c1e20151 100644
--- a/sound/songs/midi/mus_rainbow.mid
+++ b/sound/songs/midi/mus_ever_grande.mid
diff --git a/sound/songs/midi/mus_shinka.mid b/sound/songs/midi/mus_evolution.mid
index 375e6d5db..375e6d5db 100644
--- a/sound/songs/midi/mus_shinka.mid
+++ b/sound/songs/midi/mus_evolution.mid
diff --git a/sound/songs/midi/mus_me_shinka.mid b/sound/songs/midi/mus_evolution_intro.mid
index 231f25533..231f25533 100644
--- a/sound/songs/midi/mus_me_shinka.mid
+++ b/sound/songs/midi/mus_evolution_intro.mid
diff --git a/sound/songs/midi/mus_fanfa5.mid b/sound/songs/midi/mus_evolved.mid
index 8c94f1178..8c94f1178 100644
--- a/sound/songs/midi/mus_fanfa5.mid
+++ b/sound/songs/midi/mus_evolved.mid
diff --git a/sound/songs/midi/mus_tonekusa.mid b/sound/songs/midi/mus_fallarbor.mid
index ac11b5378..ac11b5378 100644
--- a/sound/songs/midi/mus_tonekusa.mid
+++ b/sound/songs/midi/mus_fallarbor.mid
diff --git a/sound/songs/midi/mus_tsuretek.mid b/sound/songs/midi/mus_follow_me.mid
index 82664c27a..82664c27a 100644
--- a/sound/songs/midi/mus_tsuretek.mid
+++ b/sound/songs/midi/mus_follow_me.mid
diff --git a/sound/songs/midi/mus_machi_s3.mid b/sound/songs/midi/mus_fortree.mid
index 65862625c..65862625c 100644
--- a/sound/songs/midi/mus_machi_s3.mid
+++ b/sound/songs/midi/mus_fortree.mid
diff --git a/sound/songs/midi/mus_casino.mid b/sound/songs/midi/mus_game_corner.mid
index 55548bf94..55548bf94 100644
--- a/sound/songs/midi/mus_casino.mid
+++ b/sound/songs/midi/mus_game_corner.mid
diff --git a/sound/songs/midi/mus_nibi.mid b/sound/songs/midi/mus_gsc_pewter.mid
index dc0df50f2..dc0df50f2 100644
--- a/sound/songs/midi/mus_nibi.mid
+++ b/sound/songs/midi/mus_gsc_pewter.mid
diff --git a/sound/songs/midi/mus_field13.mid b/sound/songs/midi/mus_gsc_route38.mid
index 8adfa4639..8adfa4639 100644
--- a/sound/songs/midi/mus_field13.mid
+++ b/sound/songs/midi/mus_gsc_route38.mid
diff --git a/sound/songs/midi/mus_gim.mid b/sound/songs/midi/mus_gym.mid
index 81db02876..81db02876 100644
--- a/sound/songs/midi/mus_gim.mid
+++ b/sound/songs/midi/mus_gym.mid
diff --git a/sound/songs/midi/mus_dendou.mid b/sound/songs/midi/mus_hall_of_fame.mid
index d743efcfb..d743efcfb 100644
--- a/sound/songs/midi/mus_dendou.mid
+++ b/sound/songs/midi/mus_hall_of_fame.mid
diff --git a/sound/songs/midi/mus_eikou_r.mid b/sound/songs/midi/mus_hall_of_fame_room.mid
index a3cad89cf..a3cad89cf 100644
--- a/sound/songs/midi/mus_eikou_r.mid
+++ b/sound/songs/midi/mus_hall_of_fame_room.mid
diff --git a/sound/songs/midi/mus_me_asa.mid b/sound/songs/midi/mus_heal.mid
index 0606aafa6..0606aafa6 100644
--- a/sound/songs/midi/mus_me_asa.mid
+++ b/sound/songs/midi/mus_heal.mid
diff --git a/sound/songs/midi/mus_event0.mid b/sound/songs/midi/mus_help.mid
index 9292a4ba7..9292a4ba7 100644
--- a/sound/songs/midi/mus_event0.mid
+++ b/sound/songs/midi/mus_help.mid
diff --git a/sound/songs/midi/mus_demo1.mid b/sound/songs/midi/mus_intro.mid
index 66d4e112c..66d4e112c 100644
--- a/sound/songs/midi/mus_demo1.mid
+++ b/sound/songs/midi/mus_intro.mid
diff --git a/sound/songs/midi/mus_t_battle.mid b/sound/songs/midi/mus_intro_battle.mid
index 43d2f4bc3..43d2f4bc3 100644
--- a/sound/songs/midi/mus_t_battle.mid
+++ b/sound/songs/midi/mus_intro_battle.mid
diff --git a/sound/songs/midi/mus_fanfa1.mid b/sound/songs/midi/mus_level_up.mid
index 54d014597..54d014597 100644
--- a/sound/songs/midi/mus_fanfa1.mid
+++ b/sound/songs/midi/mus_level_up.mid
diff --git a/sound/songs/midi/mus_minamo.mid b/sound/songs/midi/mus_lilycove.mid
index 5bcf80645..5bcf80645 100644
--- a/sound/songs/midi/mus_minamo.mid
+++ b/sound/songs/midi/mus_lilycove.mid
diff --git a/sound/songs/midi/mus_bijyutu.mid b/sound/songs/midi/mus_lilycove_museum.mid
index 6aedd3b33..6aedd3b33 100644
--- a/sound/songs/midi/mus_bijyutu.mid
+++ b/sound/songs/midi/mus_lilycove_museum.mid
diff --git a/sound/songs/midi/mus_test1.mid b/sound/songs/midi/mus_link_contest_p1.mid
index 36c297994..36c297994 100644
--- a/sound/songs/midi/mus_test1.mid
+++ b/sound/songs/midi/mus_link_contest_p1.mid
diff --git a/sound/songs/midi/mus_test2.mid b/sound/songs/midi/mus_link_contest_p2.mid
index b09281538..b09281538 100644
--- a/sound/songs/midi/mus_test2.mid
+++ b/sound/songs/midi/mus_link_contest_p2.mid
diff --git a/sound/songs/midi/mus_test3.mid b/sound/songs/midi/mus_link_contest_p3.mid
index 62a18480a..62a18480a 100644
--- a/sound/songs/midi/mus_test3.mid
+++ b/sound/songs/midi/mus_link_contest_p3.mid
diff --git a/sound/songs/midi/mus_test4.mid b/sound/songs/midi/mus_link_contest_p4.mid
index aec8e22ad..aec8e22ad 100644
--- a/sound/songs/midi/mus_test4.mid
+++ b/sound/songs/midi/mus_link_contest_p4.mid
diff --git a/sound/songs/midi/mus_mishiro.mid b/sound/songs/midi/mus_littleroot.mid
index 1fbaa5bfe..1fbaa5bfe 100644
--- a/sound/songs/midi/mus_mishiro.mid
+++ b/sound/songs/midi/mus_littleroot.mid
diff --git a/sound/songs/midi/mus_tetsuji.mid b/sound/songs/midi/mus_littleroot_test.mid
index e29e82560..e29e82560 100644
--- a/sound/songs/midi/mus_tetsuji.mid
+++ b/sound/songs/midi/mus_littleroot_test.mid
diff --git a/sound/songs/midi/mus_me_wasure.mid b/sound/songs/midi/mus_move_deleted.mid
index 16fe3e1a0..16fe3e1a0 100644
--- a/sound/songs/midi/mus_me_wasure.mid
+++ b/sound/songs/midi/mus_move_deleted.mid
diff --git a/sound/songs/midi/mus_tozan.mid b/sound/songs/midi/mus_mt_chimney.mid
index 07d5c9565..07d5c9565 100644
--- a/sound/songs/midi/mus_tozan.mid
+++ b/sound/songs/midi/mus_mt_chimney.mid
diff --git a/sound/songs/midi/mus_m_dungon.mid b/sound/songs/midi/mus_mt_pyre.mid
index 3de0494b3..3de0494b3 100644
--- a/sound/songs/midi/mus_m_dungon.mid
+++ b/sound/songs/midi/mus_mt_pyre.mid
diff --git a/sound/songs/midi/mus_machupi.mid b/sound/songs/midi/mus_mt_pyre_exterior.mid
index 0232634af..0232634af 100644
--- a/sound/songs/midi/mus_machupi.mid
+++ b/sound/songs/midi/mus_mt_pyre_exterior.mid
diff --git a/sound/songs/midi/mus_me_pointget.mid b/sound/songs/midi/mus_obtain_b_points.mid
index 4a3890647..4a3890647 100644
--- a/sound/songs/midi/mus_me_pointget.mid
+++ b/sound/songs/midi/mus_obtain_b_points.mid
diff --git a/sound/songs/midi/mus_me_bachi.mid b/sound/songs/midi/mus_obtain_badge.mid
index 05fe1516a..05fe1516a 100644
--- a/sound/songs/midi/mus_me_bachi.mid
+++ b/sound/songs/midi/mus_obtain_badge.mid
diff --git a/sound/songs/midi/mus_me_kinomi.mid b/sound/songs/midi/mus_obtain_berry.mid
index e7eb4afd1..e7eb4afd1 100644
--- a/sound/songs/midi/mus_me_kinomi.mid
+++ b/sound/songs/midi/mus_obtain_berry.mid
diff --git a/sound/songs/midi/mus_fanfa4.mid b/sound/songs/midi/mus_obtain_item.mid
index 42e617558..42e617558 100644
--- a/sound/songs/midi/mus_fanfa4.mid
+++ b/sound/songs/midi/mus_obtain_item.mid
diff --git a/sound/songs/midi/mus_me_symbolget.mid b/sound/songs/midi/mus_obtain_symbol.mid
index 76b83abcd..76b83abcd 100644
--- a/sound/songs/midi/mus_me_symbolget.mid
+++ b/sound/songs/midi/mus_obtain_symbol.mid
diff --git a/sound/songs/midi/mus_me_waza.mid b/sound/songs/midi/mus_obtain_tmhm.mid
index 40f9c2ed8..40f9c2ed8 100644
--- a/sound/songs/midi/mus_me_waza.mid
+++ b/sound/songs/midi/mus_obtain_tmhm.mid
diff --git a/sound/songs/midi/mus_fune_kan.mid b/sound/songs/midi/mus_oceanic_museum.mid
index c95ab1e8d..c95ab1e8d 100644
--- a/sound/songs/midi/mus_fune_kan.mid
+++ b/sound/songs/midi/mus_oceanic_museum.mid
diff --git a/sound/songs/midi/mus_machi_s4.mid b/sound/songs/midi/mus_oldale.mid
index 2ae43fe7e..2ae43fe7e 100644
--- a/sound/songs/midi/mus_machi_s4.mid
+++ b/sound/songs/midi/mus_oldale.mid
diff --git a/sound/songs/midi/mus_machi_s2.mid b/sound/songs/midi/mus_petalburg.mid
index a3c4a0a6a..a3c4a0a6a 100644
--- a/sound/songs/midi/mus_machi_s2.mid
+++ b/sound/songs/midi/mus_petalburg.mid
diff --git a/sound/songs/midi/mus_dan01.mid b/sound/songs/midi/mus_petalburg_woods.mid
index 96fc4732d..96fc4732d 100644
--- a/sound/songs/midi/mus_dan01.mid
+++ b/sound/songs/midi/mus_petalburg_woods.mid
diff --git a/sound/songs/midi/mus_pokecen.mid b/sound/songs/midi/mus_poke_center.mid
index e8cfb473a..e8cfb473a 100644
--- a/sound/songs/midi/mus_pokecen.mid
+++ b/sound/songs/midi/mus_poke_center.mid
diff --git a/sound/songs/midi/mus_friendly.mid b/sound/songs/midi/mus_poke_mart.mid
index 38567b2bf..38567b2bf 100644
--- a/sound/songs/midi/mus_friendly.mid
+++ b/sound/songs/midi/mus_poke_mart.mid
diff --git a/sound/songs/midi/mus_rekkuu_kourin.mid b/sound/songs/midi/mus_rayquaza_appears.mid
index a16b3f511..a16b3f511 100644
--- a/sound/songs/midi/mus_rekkuu_kourin.mid
+++ b/sound/songs/midi/mus_rayquaza_appears.mid
diff --git a/sound/songs/midi/mus_me_tore_eye.mid b/sound/songs/midi/mus_register_match_call.mid
index f2682bf32..f2682bf32 100644
--- a/sound/songs/midi/mus_me_tore_eye.mid
+++ b/sound/songs/midi/mus_register_match_call.mid
diff --git a/sound/songs/midi/mus_rg_kinomikui.mid b/sound/songs/midi/mus_rg_berry_pick.mid
index 5e16a57cd..5e16a57cd 100644
--- a/sound/songs/midi/mus_rg_kinomikui.mid
+++ b/sound/songs/midi/mus_rg_berry_pick.mid
diff --git a/sound/songs/midi/mus_rg_get_yasei.mid b/sound/songs/midi/mus_rg_caught.mid
index 6599ca6b0..6599ca6b0 100644
--- a/sound/songs/midi/mus_rg_get_yasei.mid
+++ b/sound/songs/midi/mus_rg_caught.mid
diff --git a/sound/songs/midi/mus_rg_fan6.mid b/sound/songs/midi/mus_rg_caught_intro.mid
index d2bc1feb3..d2bc1feb3 100644
--- a/sound/songs/midi/mus_rg_fan6.mid
+++ b/sound/songs/midi/mus_rg_caught_intro.mid
diff --git a/sound/songs/midi/mus_rg_tamamusi.mid b/sound/songs/midi/mus_rg_celadon.mid
index fa0d655eb..fa0d655eb 100644
--- a/sound/songs/midi/mus_rg_tamamusi.mid
+++ b/sound/songs/midi/mus_rg_celadon.mid
diff --git a/sound/songs/midi/mus_rg_guren.mid b/sound/songs/midi/mus_rg_cinnabar.mid
index a5748ac48..a5748ac48 100644
--- a/sound/songs/midi/mus_rg_guren.mid
+++ b/sound/songs/midi/mus_rg_cinnabar.mid
diff --git a/sound/songs/midi/mus_rg_ending.mid b/sound/songs/midi/mus_rg_credits.mid
index 1f5790542..1f5790542 100644
--- a/sound/songs/midi/mus_rg_ending.mid
+++ b/sound/songs/midi/mus_rg_credits.mid
diff --git a/sound/songs/midi/mus_rg_fan2.mid b/sound/songs/midi/mus_rg_dex_rating.mid
index 98300bce1..98300bce1 100644
--- a/sound/songs/midi/mus_rg_fan2.mid
+++ b/sound/songs/midi/mus_rg_dex_rating.mid
diff --git a/sound/songs/midi/mus_rg_shounen.mid b/sound/songs/midi/mus_rg_encounter_boy.mid
index 0820f00ca..0820f00ca 100644
--- a/sound/songs/midi/mus_rg_shounen.mid
+++ b/sound/songs/midi/mus_rg_encounter_boy.mid
diff --git a/sound/songs/midi/mus_rg_deoeye.mid b/sound/songs/midi/mus_rg_encounter_deoxys.mid
index d322b9a1a..d322b9a1a 100644
--- a/sound/songs/midi/mus_rg_deoeye.mid
+++ b/sound/songs/midi/mus_rg_encounter_deoxys.mid
diff --git a/sound/songs/midi/mus_rg_shoujo.mid b/sound/songs/midi/mus_rg_encounter_girl.mid
index 48ede9b4c..48ede9b4c 100644
--- a/sound/songs/midi/mus_rg_shoujo.mid
+++ b/sound/songs/midi/mus_rg_encounter_girl.mid
diff --git a/sound/songs/midi/mus_rg_exeye.mid b/sound/songs/midi/mus_rg_encounter_gym_leader.mid
index cb5fef487..cb5fef487 100644
--- a/sound/songs/midi/mus_rg_exeye.mid
+++ b/sound/songs/midi/mus_rg_encounter_gym_leader.mid
diff --git a/sound/songs/midi/mus_rg_rival1.mid b/sound/songs/midi/mus_rg_encounter_rival.mid
index 41fe40e94..41fe40e94 100644
--- a/sound/songs/midi/mus_rg_rival1.mid
+++ b/sound/songs/midi/mus_rg_encounter_rival.mid
diff --git a/sound/songs/midi/mus_rg_rocket.mid b/sound/songs/midi/mus_rg_encounter_rocket.mid
index 966e56962..966e56962 100644
--- a/sound/songs/midi/mus_rg_rocket.mid
+++ b/sound/songs/midi/mus_rg_encounter_rocket.mid
diff --git a/sound/songs/midi/mus_rg_annai.mid b/sound/songs/midi/mus_rg_follow_me.mid
index efea75d49..efea75d49 100644
--- a/sound/songs/midi/mus_rg_annai.mid
+++ b/sound/songs/midi/mus_rg_follow_me.mid
diff --git a/sound/songs/midi/mus_rg_hanada.mid b/sound/songs/midi/mus_rg_fuchsia.mid
index 4831631fc..4831631fc 100644
--- a/sound/songs/midi/mus_rg_hanada.mid
+++ b/sound/songs/midi/mus_rg_fuchsia.mid
diff --git a/sound/songs/midi/mus_rg_slot.mid b/sound/songs/midi/mus_rg_game_corner.mid
index 24668ec68..24668ec68 100644
--- a/sound/songs/midi/mus_rg_slot.mid
+++ b/sound/songs/midi/mus_rg_game_corner.mid
diff --git a/sound/songs/midi/mus_rg_titlerog.mid b/sound/songs/midi/mus_rg_game_freak.mid
index baef8d1d4..baef8d1d4 100644
--- a/sound/songs/midi/mus_rg_titlerog.mid
+++ b/sound/songs/midi/mus_rg_game_freak.mid
diff --git a/sound/songs/midi/mus_rg_dendou.mid b/sound/songs/midi/mus_rg_hall_of_fame.mid
index 9d7647ccd..9d7647ccd 100644
--- a/sound/songs/midi/mus_rg_dendou.mid
+++ b/sound/songs/midi/mus_rg_hall_of_fame.mid
diff --git a/sound/songs/midi/mus_rg_kaihuku.mid b/sound/songs/midi/mus_rg_heal.mid
index 50c96d7c6..50c96d7c6 100644
--- a/sound/songs/midi/mus_rg_kaihuku.mid
+++ b/sound/songs/midi/mus_rg_heal.mid
diff --git a/sound/songs/midi/mus_rg_demo.mid b/sound/songs/midi/mus_rg_intro_fight.mid
index f5320a273..f5320a273 100644
--- a/sound/songs/midi/mus_rg_demo.mid
+++ b/sound/songs/midi/mus_rg_intro_fight.mid
diff --git a/sound/songs/midi/mus_rg_purin.mid b/sound/songs/midi/mus_rg_jigglypuff.mid
index cc3405f3c..cc3405f3c 100644
--- a/sound/songs/midi/mus_rg_purin.mid
+++ b/sound/songs/midi/mus_rg_jigglypuff.mid
diff --git a/sound/songs/midi/mus_rg_shion.mid b/sound/songs/midi/mus_rg_lavender.mid
index b31831dfa..b31831dfa 100644
--- a/sound/songs/midi/mus_rg_shion.mid
+++ b/sound/songs/midi/mus_rg_lavender.mid
diff --git a/sound/songs/midi/mus_rg_otsukimi.mid b/sound/songs/midi/mus_rg_mt_moon.mid
index c7da3b036..c7da3b036 100644
--- a/sound/songs/midi/mus_rg_otsukimi.mid
+++ b/sound/songs/midi/mus_rg_mt_moon.mid
diff --git a/sound/songs/midi/mus_rg_okurimono.mid b/sound/songs/midi/mus_rg_mystery_gift.mid
index bfde1f175..bfde1f175 100644
--- a/sound/songs/midi/mus_rg_okurimono.mid
+++ b/sound/songs/midi/mus_rg_mystery_gift.mid
diff --git a/sound/songs/midi/mus_rg_network.mid b/sound/songs/midi/mus_rg_net_center.mid
index 292dad852..292dad852 100644
--- a/sound/songs/midi/mus_rg_network.mid
+++ b/sound/songs/midi/mus_rg_net_center.mid
diff --git a/sound/songs/midi/mus_rg_seibetu.mid b/sound/songs/midi/mus_rg_new_game_exit.mid
index 8c0a1d7ea..8c0a1d7ea 100644
--- a/sound/songs/midi/mus_rg_seibetu.mid
+++ b/sound/songs/midi/mus_rg_new_game_exit.mid
diff --git a/sound/songs/midi/mus_rg_sousa.mid b/sound/songs/midi/mus_rg_new_game_instruct.mid
index 0c936e8f6..0c936e8f6 100644
--- a/sound/songs/midi/mus_rg_sousa.mid
+++ b/sound/songs/midi/mus_rg_new_game_instruct.mid
diff --git a/sound/songs/midi/mus_rg_sekaikan.mid b/sound/songs/midi/mus_rg_new_game_intro.mid
index aec6a0240..aec6a0240 100644
--- a/sound/songs/midi/mus_rg_sekaikan.mid
+++ b/sound/songs/midi/mus_rg_new_game_intro.mid
diff --git a/sound/songs/midi/mus_rg_ohkido.mid b/sound/songs/midi/mus_rg_oak.mid
index fa4710a23..fa4710a23 100644
--- a/sound/songs/midi/mus_rg_ohkido.mid
+++ b/sound/songs/midi/mus_rg_oak.mid
diff --git a/sound/songs/midi/mus_rg_kenkyu.mid b/sound/songs/midi/mus_rg_oak_lab.mid
index 471a1baab..471a1baab 100644
--- a/sound/songs/midi/mus_rg_kenkyu.mid
+++ b/sound/songs/midi/mus_rg_oak_lab.mid
diff --git a/sound/songs/midi/mus_rg_fan5.mid b/sound/songs/midi/mus_rg_obtain_key_item.mid
index e9c01b132..e9c01b132 100644
--- a/sound/songs/midi/mus_rg_fan5.mid
+++ b/sound/songs/midi/mus_rg_obtain_key_item.mid
diff --git a/sound/songs/midi/mus_rg_masara.mid b/sound/songs/midi/mus_rg_pallet.mid
index fa5917387..fa5917387 100644
--- a/sound/songs/midi/mus_rg_masara.mid
+++ b/sound/songs/midi/mus_rg_pallet.mid
diff --git a/sound/songs/midi/mus_rg_nana123.mid b/sound/songs/midi/mus_rg_pewter.mid
index dd88863d4..dd88863d4 100644
--- a/sound/songs/midi/mus_rg_nana123.mid
+++ b/sound/songs/midi/mus_rg_pewter.mid
diff --git a/sound/songs/midi/mus_me_rg_photo.mid b/sound/songs/midi/mus_rg_photo.mid
index 76fce4af3..76fce4af3 100644
--- a/sound/songs/midi/mus_me_rg_photo.mid
+++ b/sound/songs/midi/mus_rg_photo.mid
diff --git a/sound/songs/midi/mus_rg_pokecen.mid b/sound/songs/midi/mus_rg_poke_center.mid
index cd905db38..cd905db38 100644
--- a/sound/songs/midi/mus_rg_pokecen.mid
+++ b/sound/songs/midi/mus_rg_poke_center.mid
diff --git a/sound/songs/midi/mus_rg_pokefue.mid b/sound/songs/midi/mus_rg_poke_flute.mid
index 02686a30b..02686a30b 100644
--- a/sound/songs/midi/mus_rg_pokefue.mid
+++ b/sound/songs/midi/mus_rg_poke_flute.mid
diff --git a/sound/songs/midi/mus_rg_jump.mid b/sound/songs/midi/mus_rg_poke_jump.mid
index 6e656a1f0..6e656a1f0 100644
--- a/sound/songs/midi/mus_rg_jump.mid
+++ b/sound/songs/midi/mus_rg_poke_jump.mid
diff --git a/sound/songs/midi/mus_rg_pokeyashi.mid b/sound/songs/midi/mus_rg_poke_mansion.mid
index e5ee78eb0..e5ee78eb0 100644
--- a/sound/songs/midi/mus_rg_pokeyashi.mid
+++ b/sound/songs/midi/mus_rg_poke_mansion.mid
diff --git a/sound/songs/midi/mus_rg_p_tower.mid b/sound/songs/midi/mus_rg_poke_tower.mid
index 0a537d191..0a537d191 100644
--- a/sound/songs/midi/mus_rg_p_tower.mid
+++ b/sound/songs/midi/mus_rg_poke_tower.mid
diff --git a/sound/songs/midi/mus_rg_rival2.mid b/sound/songs/midi/mus_rg_rival_exit.mid
index cae821245..cae821245 100644
--- a/sound/songs/midi/mus_rg_rival2.mid
+++ b/sound/songs/midi/mus_rg_rival_exit.mid
diff --git a/sound/songs/midi/mus_rg_ajito.mid b/sound/songs/midi/mus_rg_rocket_hideout.mid
index 1e1fff0f6..1e1fff0f6 100644
--- a/sound/songs/midi/mus_rg_ajito.mid
+++ b/sound/songs/midi/mus_rg_rocket_hideout.mid
diff --git a/sound/songs/midi/mus_rg_load01.mid b/sound/songs/midi/mus_rg_route1.mid
index 9d0ebcde6..9d0ebcde6 100644
--- a/sound/songs/midi/mus_rg_load01.mid
+++ b/sound/songs/midi/mus_rg_route1.mid
diff --git a/sound/songs/midi/mus_rg_load03.mid b/sound/songs/midi/mus_rg_route11.mid
index 3fe21c381..3fe21c381 100644
--- a/sound/songs/midi/mus_rg_load03.mid
+++ b/sound/songs/midi/mus_rg_route11.mid
diff --git a/sound/songs/midi/mus_rg_opening.mid b/sound/songs/midi/mus_rg_route24.mid
index c15773fff..c15773fff 100644
--- a/sound/songs/midi/mus_rg_opening.mid
+++ b/sound/songs/midi/mus_rg_route24.mid
diff --git a/sound/songs/midi/mus_rg_load02.mid b/sound/songs/midi/mus_rg_route3.mid
index 2af80a5a8..2af80a5a8 100644
--- a/sound/songs/midi/mus_rg_load02.mid
+++ b/sound/songs/midi/mus_rg_route3.mid
diff --git a/sound/songs/midi/mus_rg_nibi.mid b/sound/songs/midi/mus_rg_sevii_123.mid
index dd88863d4..dd88863d4 100644
--- a/sound/songs/midi/mus_rg_nibi.mid
+++ b/sound/songs/midi/mus_rg_sevii_123.mid
diff --git a/sound/songs/midi/mus_rg_nana45.mid b/sound/songs/midi/mus_rg_sevii_45.mid
index 98b581132..98b581132 100644
--- a/sound/songs/midi/mus_rg_nana45.mid
+++ b/sound/songs/midi/mus_rg_sevii_45.mid
diff --git a/sound/songs/midi/mus_rg_nana67.mid b/sound/songs/midi/mus_rg_sevii_67.mid
index 537e59a71..537e59a71 100644
--- a/sound/songs/midi/mus_rg_nana67.mid
+++ b/sound/songs/midi/mus_rg_sevii_67.mid
diff --git a/sound/songs/midi/mus_rg_nanadungeon.mid b/sound/songs/midi/mus_rg_sevii_cave.mid
index 7f32963c9..7f32963c9 100644
--- a/sound/songs/midi/mus_rg_nanadungeon.mid
+++ b/sound/songs/midi/mus_rg_sevii_cave.mid
diff --git a/sound/songs/midi/mus_rg_nanaiseki.mid b/sound/songs/midi/mus_rg_sevii_dungeon.mid
index 76d73039e..76d73039e 100644
--- a/sound/songs/midi/mus_rg_nanaiseki.mid
+++ b/sound/songs/midi/mus_rg_sevii_dungeon.mid
diff --git a/sound/songs/midi/mus_rg_nanashima.mid b/sound/songs/midi/mus_rg_sevii_route.mid
index d215f0122..d215f0122 100644
--- a/sound/songs/midi/mus_rg_nanashima.mid
+++ b/sound/songs/midi/mus_rg_sevii_route.mid
diff --git a/sound/songs/midi/mus_rg_shiruhu.mid b/sound/songs/midi/mus_rg_silph.mid
index 8f66ea874..8f66ea874 100644
--- a/sound/songs/midi/mus_rg_shiruhu.mid
+++ b/sound/songs/midi/mus_rg_silph.mid
diff --git a/sound/songs/midi/mus_rg_slowmasara.mid b/sound/songs/midi/mus_rg_slow_pallet.mid
index 441fb6348..441fb6348 100644
--- a/sound/songs/midi/mus_rg_slowmasara.mid
+++ b/sound/songs/midi/mus_rg_slow_pallet.mid
diff --git a/sound/songs/midi/mus_rg_santoan.mid b/sound/songs/midi/mus_rg_ss_anne.mid
index b843ca364..b843ca364 100644
--- a/sound/songs/midi/mus_rg_santoan.mid
+++ b/sound/songs/midi/mus_rg_ss_anne.mid
diff --git a/sound/songs/midi/mus_rg_naminori.mid b/sound/songs/midi/mus_rg_surf.mid
index 3ac684ac2..3ac684ac2 100644
--- a/sound/songs/midi/mus_rg_naminori.mid
+++ b/sound/songs/midi/mus_rg_surf.mid
diff --git a/sound/songs/midi/mus_rg_tvnoize.mid b/sound/songs/midi/mus_rg_teachy_tv_menu.mid
index b5d446098..b5d446098 100644
--- a/sound/songs/midi/mus_rg_tvnoize.mid
+++ b/sound/songs/midi/mus_rg_teachy_tv_menu.mid
diff --git a/sound/songs/midi/mus_rg_oshie_tv.mid b/sound/songs/midi/mus_rg_teachy_tv_show.mid
index efea75d49..efea75d49 100644
--- a/sound/songs/midi/mus_rg_oshie_tv.mid
+++ b/sound/songs/midi/mus_rg_teachy_tv_show.mid
diff --git a/sound/songs/midi/mus_rg_t_tower.mid b/sound/songs/midi/mus_rg_trainer_tower.mid
index 81db02876..81db02876 100644
--- a/sound/songs/midi/mus_rg_t_tower.mid
+++ b/sound/songs/midi/mus_rg_trainer_tower.mid
diff --git a/sound/songs/midi/mus_rg_union.mid b/sound/songs/midi/mus_rg_union_room.mid
index b484050fa..b484050fa 100644
--- a/sound/songs/midi/mus_rg_union.mid
+++ b/sound/songs/midi/mus_rg_union_room.mid
diff --git a/sound/songs/midi/mus_rg_kuchiba.mid b/sound/songs/midi/mus_rg_vermillion.mid
index 11cb67d1a..11cb67d1a 100644
--- a/sound/songs/midi/mus_rg_kuchiba.mid
+++ b/sound/songs/midi/mus_rg_vermillion.mid
diff --git a/sound/songs/midi/mus_kachi3.mid b/sound/songs/midi/mus_rg_victory_gym_leader.mid
index 1ce5dd13c..1ce5dd13c 100644
--- a/sound/songs/midi/mus_kachi3.mid
+++ b/sound/songs/midi/mus_rg_victory_gym_leader.mid
diff --git a/sound/songs/midi/mus_rg_champ_r.mid b/sound/songs/midi/mus_rg_victory_road.mid
index 6552b65bd..6552b65bd 100644
--- a/sound/songs/midi/mus_rg_champ_r.mid
+++ b/sound/songs/midi/mus_rg_victory_road.mid
diff --git a/sound/songs/midi/mus_rg_win_tre.mid b/sound/songs/midi/mus_rg_victory_trainer.mid
index 26fe06bf0..26fe06bf0 100644
--- a/sound/songs/midi/mus_rg_win_tre.mid
+++ b/sound/songs/midi/mus_rg_victory_trainer.mid
diff --git a/sound/songs/midi/mus_kachi2.mid b/sound/songs/midi/mus_rg_victory_wild.mid
index 51fad46fc..51fad46fc 100644
--- a/sound/songs/midi/mus_kachi2.mid
+++ b/sound/songs/midi/mus_rg_victory_wild.mid
diff --git a/sound/songs/midi/mus_rg_t_mori.mid b/sound/songs/midi/mus_rg_viridian_forest.mid
index 76d73039e..76d73039e 100644
--- a/sound/songs/midi/mus_rg_t_mori.mid
+++ b/sound/songs/midi/mus_rg_viridian_forest.mid
diff --git a/sound/songs/midi/mus_rg_vs_last.mid b/sound/songs/midi/mus_rg_vs_champion.mid
index e63d2eb45..e63d2eb45 100644
--- a/sound/songs/midi/mus_rg_vs_last.mid
+++ b/sound/songs/midi/mus_rg_vs_champion.mid
diff --git a/sound/songs/midi/mus_rg_vs_deo.mid b/sound/songs/midi/mus_rg_vs_deoxys.mid
index 1f9c00bb1..1f9c00bb1 100644
--- a/sound/songs/midi/mus_rg_vs_deo.mid
+++ b/sound/songs/midi/mus_rg_vs_deoxys.mid
diff --git a/sound/songs/midi/mus_rg_vs_gym.mid b/sound/songs/midi/mus_rg_vs_gym_leader.mid
index aa2da087f..aa2da087f 100644
--- a/sound/songs/midi/mus_rg_vs_gym.mid
+++ b/sound/songs/midi/mus_rg_vs_gym_leader.mid
diff --git a/sound/songs/midi/mus_rg_vs_den.mid b/sound/songs/midi/mus_rg_vs_legend.mid
index 93d3785be..93d3785be 100644
--- a/sound/songs/midi/mus_rg_vs_den.mid
+++ b/sound/songs/midi/mus_rg_vs_legend.mid
diff --git a/sound/songs/midi/mus_rg_vs_myu2.mid b/sound/songs/midi/mus_rg_vs_mewtwo.mid
index e6a578320..e6a578320 100644
--- a/sound/songs/midi/mus_rg_vs_myu2.mid
+++ b/sound/songs/midi/mus_rg_vs_mewtwo.mid
diff --git a/sound/songs/midi/mus_rg_vs_tore.mid b/sound/songs/midi/mus_rg_vs_trainer.mid
index 95172f63e..95172f63e 100644
--- a/sound/songs/midi/mus_rg_vs_tore.mid
+++ b/sound/songs/midi/mus_rg_vs_trainer.mid
diff --git a/sound/songs/midi/mus_rg_vs_yasei.mid b/sound/songs/midi/mus_rg_vs_wild.mid
index 835aff19b..835aff19b 100644
--- a/sound/songs/midi/mus_rg_vs_yasei.mid
+++ b/sound/songs/midi/mus_rg_vs_wild.mid
diff --git a/sound/songs/midi/mus_bd_time.mid b/sound/songs/midi/mus_roulette.mid
index 39fb08327..39fb08327 100644
--- a/sound/songs/midi/mus_bd_time.mid
+++ b/sound/songs/midi/mus_roulette.mid
diff --git a/sound/songs/midi/mus_dooro1.mid b/sound/songs/midi/mus_route101.mid
index 5c4f5d76a..5c4f5d76a 100644
--- a/sound/songs/midi/mus_dooro1.mid
+++ b/sound/songs/midi/mus_route101.mid
diff --git a/sound/songs/midi/mus_nextroad.mid b/sound/songs/midi/mus_route104.mid
index 571345f5a..571345f5a 100644
--- a/sound/songs/midi/mus_nextroad.mid
+++ b/sound/songs/midi/mus_route104.mid
diff --git a/sound/songs/midi/mus_dooro_x1.mid b/sound/songs/midi/mus_route110.mid
index 087682996..087682996 100644
--- a/sound/songs/midi/mus_dooro_x1.mid
+++ b/sound/songs/midi/mus_route110.mid
diff --git a/sound/songs/midi/mus_ashroad.mid b/sound/songs/midi/mus_route111.mid
index 4b7f71c09..4b7f71c09 100644
--- a/sound/songs/midi/mus_ashroad.mid
+++ b/sound/songs/midi/mus_route111.mid
diff --git a/sound/songs/midi/mus_kazanbai.mid b/sound/songs/midi/mus_route113.mid
index bddb3947c..bddb3947c 100644
--- a/sound/songs/midi/mus_kazanbai.mid
+++ b/sound/songs/midi/mus_route113.mid
diff --git a/sound/songs/midi/mus_granroad.mid b/sound/songs/midi/mus_route119.mid
index cb286982d..cb286982d 100644
--- a/sound/songs/midi/mus_granroad.mid
+++ b/sound/songs/midi/mus_route119.mid
diff --git a/sound/songs/midi/mus_dooro_x3.mid b/sound/songs/midi/mus_route120.mid
index ac1fef688..ac1fef688 100644
--- a/sound/songs/midi/mus_dooro_x3.mid
+++ b/sound/songs/midi/mus_route120.mid
diff --git a/sound/songs/midi/mus_dooro_x4.mid b/sound/songs/midi/mus_route122.mid
index 14e439359..14e439359 100644
--- a/sound/songs/midi/mus_dooro_x4.mid
+++ b/sound/songs/midi/mus_route122.mid
diff --git a/sound/songs/midi/mus_gotown.mid b/sound/songs/midi/mus_rustboro.mid
index 6a2ab5dea..6a2ab5dea 100644
--- a/sound/songs/midi/mus_gotown.mid
+++ b/sound/songs/midi/mus_rustboro.mid
diff --git a/sound/songs/midi/mus_safari.mid b/sound/songs/midi/mus_safari_zone.mid
index 95fab66a8..95fab66a8 100644
--- a/sound/songs/midi/mus_safari.mid
+++ b/sound/songs/midi/mus_safari_zone.mid
diff --git a/sound/songs/midi/mus_m_boat.mid b/sound/songs/midi/mus_sailing.mid
index 97c539a75..97c539a75 100644
--- a/sound/songs/midi/mus_m_boat.mid
+++ b/sound/songs/midi/mus_sailing.mid
diff --git a/sound/songs/midi/mus_sattower.mid b/sound/songs/midi/mus_sattower.mid
deleted file mode 100644
index a8294614f..000000000
--- a/sound/songs/midi/mus_sattower.mid
+++ /dev/null
diff --git a/sound/songs/midi/mus_p_school.mid b/sound/songs/midi/mus_school.mid
index 4e6fd3340..4e6fd3340 100644
--- a/sound/songs/midi/mus_p_school.mid
+++ b/sound/songs/midi/mus_school.mid
diff --git a/sound/songs/midi/mus_maborosi.mid b/sound/songs/midi/mus_sealed_chamber.mid
index c888c0d54..c888c0d54 100644
--- a/sound/songs/midi/mus_maborosi.mid
+++ b/sound/songs/midi/mus_sealed_chamber.mid
diff --git a/sound/songs/midi/mus_finecity.mid b/sound/songs/midi/mus_slateport.mid
index f83647287..f83647287 100644
--- a/sound/songs/midi/mus_finecity.mid
+++ b/sound/songs/midi/mus_slateport.mid
diff --git a/sound/songs/midi/mus_me_b_big.mid b/sound/songs/midi/mus_slots_jackpot.mid
index 150a669b4..150a669b4 100644
--- a/sound/songs/midi/mus_me_b_big.mid
+++ b/sound/songs/midi/mus_slots_jackpot.mid
diff --git a/sound/songs/midi/mus_me_b_small.mid b/sound/songs/midi/mus_slots_win.mid
index bf7aa33be..bf7aa33be 100644
--- a/sound/songs/midi/mus_me_b_small.mid
+++ b/sound/songs/midi/mus_slots_win.mid
diff --git a/sound/songs/midi/mus_runecity.mid b/sound/songs/midi/mus_sootopolis.mid
index 2e8c49c2f..2e8c49c2f 100644
--- a/sound/songs/midi/mus_runecity.mid
+++ b/sound/songs/midi/mus_sootopolis.mid
diff --git a/sound/songs/midi/mus_naminori.mid b/sound/songs/midi/mus_surf.mid
index 70813e343..70813e343 100644
--- a/sound/songs/midi/mus_naminori.mid
+++ b/sound/songs/midi/mus_surf.mid
diff --git a/sound/songs/midi/mus_title3.mid b/sound/songs/midi/mus_title.mid
index 1664a86b2..1664a86b2 100644
--- a/sound/songs/midi/mus_title3.mid
+++ b/sound/songs/midi/mus_title.mid
diff --git a/sound/songs/midi/mus_me_zannen.mid b/sound/songs/midi/mus_too_bad.mid
index 2d071d524..2d071d524 100644
--- a/sound/songs/midi/mus_me_zannen.mid
+++ b/sound/songs/midi/mus_too_bad.mid
diff --git a/sound/songs/midi/mus_karakuri.mid b/sound/songs/midi/mus_trick_house.mid
index d6c387ee3..d6c387ee3 100644
--- a/sound/songs/midi/mus_karakuri.mid
+++ b/sound/songs/midi/mus_trick_house.mid
diff --git a/sound/songs/midi/mus_deepdeep.mid b/sound/songs/midi/mus_underwater.mid
index 352c80cd7..352c80cd7 100644
--- a/sound/songs/midi/mus_deepdeep.mid
+++ b/sound/songs/midi/mus_underwater.mid
diff --git a/sound/songs/midi/mus_gomachi0.mid b/sound/songs/midi/mus_verdanturf.mid
index b41d157a3..b41d157a3 100644
--- a/sound/songs/midi/mus_gomachi0.mid
+++ b/sound/songs/midi/mus_verdanturf.mid
diff --git a/sound/songs/midi/mus_kachi4.mid b/sound/songs/midi/mus_victory_aqua_magma.mid
index 3b8cc422e..3b8cc422e 100644
--- a/sound/songs/midi/mus_kachi4.mid
+++ b/sound/songs/midi/mus_victory_aqua_magma.mid
diff --git a/sound/songs/midi/mus_rg_win_gym.mid b/sound/songs/midi/mus_victory_gym_leader.mid
index 1ce5dd13c..1ce5dd13c 100644
--- a/sound/songs/midi/mus_rg_win_gym.mid
+++ b/sound/songs/midi/mus_victory_gym_leader.mid
diff --git a/sound/songs/midi/mus_kachi5.mid b/sound/songs/midi/mus_victory_league.mid
index 94be2e4c7..94be2e4c7 100644
--- a/sound/songs/midi/mus_kachi5.mid
+++ b/sound/songs/midi/mus_victory_league.mid
diff --git a/sound/songs/midi/mus_c_road.mid b/sound/songs/midi/mus_victory_road.mid
index f1dfc2a93..f1dfc2a93 100644
--- a/sound/songs/midi/mus_c_road.mid
+++ b/sound/songs/midi/mus_victory_road.mid
diff --git a/sound/songs/midi/mus_kachi1.mid b/sound/songs/midi/mus_victory_trainer.mid
index 7d3f75009..7d3f75009 100644
--- a/sound/songs/midi/mus_kachi1.mid
+++ b/sound/songs/midi/mus_victory_trainer.mid
diff --git a/sound/songs/midi/mus_rg_win_yasei.mid b/sound/songs/midi/mus_victory_wild.mid
index 51fad46fc..51fad46fc 100644
--- a/sound/songs/midi/mus_rg_win_yasei.mid
+++ b/sound/songs/midi/mus_victory_wild.mid
diff --git a/sound/songs/midi/mus_battle31.mid b/sound/songs/midi/mus_vs_aqua_magma.mid
index e38085793..e38085793 100644
--- a/sound/songs/midi/mus_battle31.mid
+++ b/sound/songs/midi/mus_vs_aqua_magma.mid
diff --git a/sound/songs/midi/mus_battle30.mid b/sound/songs/midi/mus_vs_aqua_magma_leader.mid
index 3bd5e9e11..3bd5e9e11 100644
--- a/sound/songs/midi/mus_battle30.mid
+++ b/sound/songs/midi/mus_vs_aqua_magma_leader.mid
diff --git a/sound/songs/midi/mus_battle33.mid b/sound/songs/midi/mus_vs_champion.mid
index b16580d66..b16580d66 100644
--- a/sound/songs/midi/mus_battle33.mid
+++ b/sound/songs/midi/mus_vs_champion.mid
diff --git a/sound/songs/midi/mus_battle38.mid b/sound/songs/midi/mus_vs_elite_four.mid
index e4b1f34b9..e4b1f34b9 100644
--- a/sound/songs/midi/mus_battle38.mid
+++ b/sound/songs/midi/mus_vs_elite_four.mid
diff --git a/sound/songs/midi/mus_vs_front.mid b/sound/songs/midi/mus_vs_frontier_brain.mid
index 7e251430c..7e251430c 100644
--- a/sound/songs/midi/mus_vs_front.mid
+++ b/sound/songs/midi/mus_vs_frontier_brain.mid
diff --git a/sound/songs/midi/mus_battle32.mid b/sound/songs/midi/mus_vs_gym_leader.mid
index 0b7c49bd7..0b7c49bd7 100644
--- a/sound/songs/midi/mus_battle32.mid
+++ b/sound/songs/midi/mus_vs_gym_leader.mid
diff --git a/sound/songs/midi/mus_battle34.mid b/sound/songs/midi/mus_vs_kyogre_groudon.mid
index 2b4aced44..2b4aced44 100644
--- a/sound/songs/midi/mus_battle34.mid
+++ b/sound/songs/midi/mus_vs_kyogre_groudon.mid
diff --git a/sound/songs/midi/mus_vs_rekku.mid b/sound/songs/midi/mus_vs_rayquaza.mid
index 2b4aced44..2b4aced44 100644
--- a/sound/songs/midi/mus_vs_rekku.mid
+++ b/sound/songs/midi/mus_vs_rayquaza.mid
diff --git a/sound/songs/midi/mus_battle36.mid b/sound/songs/midi/mus_vs_regi.mid
index 2aab509a3..2aab509a3 100644
--- a/sound/songs/midi/mus_battle36.mid
+++ b/sound/songs/midi/mus_vs_regi.mid
diff --git a/sound/songs/midi/mus_battle35.mid b/sound/songs/midi/mus_vs_rival.mid
index 2d34a08b9..2d34a08b9 100644
--- a/sound/songs/midi/mus_battle35.mid
+++ b/sound/songs/midi/mus_vs_rival.mid
diff --git a/sound/songs/midi/mus_battle20.mid b/sound/songs/midi/mus_vs_trainer.mid
index 531b5fba1..531b5fba1 100644
--- a/sound/songs/midi/mus_battle20.mid
+++ b/sound/songs/midi/mus_vs_trainer.mid
diff --git a/sound/songs/midi/mus_battle27.mid b/sound/songs/midi/mus_vs_wild.mid
index 3d55c0181..3d55c0181 100644
--- a/sound/songs/midi/mus_battle27.mid
+++ b/sound/songs/midi/mus_vs_wild.mid
diff --git a/sound/songs/midi/mus_hideri.mid b/sound/songs/midi/mus_weather_groudon.mid
index 0ca75c2e9..0ca75c2e9 100644
--- a/sound/songs/midi/mus_hideri.mid
+++ b/sound/songs/midi/mus_weather_groudon.mid
diff --git a/sound/songs/midi/se_dendou.mid b/sound/songs/midi/se_applause.mid
index 4ab2a2212..4ab2a2212 100644
--- a/sound/songs/midi/se_dendou.mid
+++ b/sound/songs/midi/se_applause.mid
diff --git a/sound/songs/midi/se_hantei1.mid b/sound/songs/midi/se_arena_timeup1.mid
index 1f2855420..1f2855420 100644
--- a/sound/songs/midi/se_hantei1.mid
+++ b/sound/songs/midi/se_arena_timeup1.mid
diff --git a/sound/songs/midi/se_hantei2.mid b/sound/songs/midi/se_arena_timeup2.mid
index 06698dde9..06698dde9 100644
--- a/sound/songs/midi/se_hantei2.mid
+++ b/sound/songs/midi/se_arena_timeup2.mid
diff --git a/sound/songs/midi/se_bowa.mid b/sound/songs/midi/se_ball.mid
index 684ea618c..684ea618c 100644
--- a/sound/songs/midi/se_bowa.mid
+++ b/sound/songs/midi/se_ball.mid
diff --git a/sound/songs/midi/se_kon.mid b/sound/songs/midi/se_ball_bounce_1.mid
index 438d4b047..438d4b047 100644
--- a/sound/songs/midi/se_kon.mid
+++ b/sound/songs/midi/se_ball_bounce_1.mid
diff --git a/sound/songs/midi/se_kon2.mid b/sound/songs/midi/se_ball_bounce_2.mid
index 961d82642..961d82642 100644
--- a/sound/songs/midi/se_kon2.mid
+++ b/sound/songs/midi/se_ball_bounce_2.mid
diff --git a/sound/songs/midi/se_kon3.mid b/sound/songs/midi/se_ball_bounce_3.mid
index fc35f1931..fc35f1931 100644
--- a/sound/songs/midi/se_kon3.mid
+++ b/sound/songs/midi/se_ball_bounce_3.mid
diff --git a/sound/songs/midi/se_kon4.mid b/sound/songs/midi/se_ball_bounce_4.mid
index b0f5561b9..b0f5561b9 100644
--- a/sound/songs/midi/se_kon4.mid
+++ b/sound/songs/midi/se_ball_bounce_4.mid
diff --git a/sound/songs/midi/se_bowa2.mid b/sound/songs/midi/se_ball_open.mid
index 669bed700..669bed700 100644
--- a/sound/songs/midi/se_bowa2.mid
+++ b/sound/songs/midi/se_ball_open.mid
diff --git a/sound/songs/midi/se_nageru.mid b/sound/songs/midi/se_ball_throw.mid
index 171f45a5a..171f45a5a 100644
--- a/sound/songs/midi/se_nageru.mid
+++ b/sound/songs/midi/se_ball_throw.mid
diff --git a/sound/songs/midi/se_suikomu.mid b/sound/songs/midi/se_ball_trade.mid
index 871c8e5d3..871c8e5d3 100644
--- a/sound/songs/midi/se_suikomu.mid
+++ b/sound/songs/midi/se_ball_trade.mid
diff --git a/sound/songs/midi/se_tb_kon.mid b/sound/songs/midi/se_ball_tray_ball.mid
index 8526da9c6..8526da9c6 100644
--- a/sound/songs/midi/se_tb_kon.mid
+++ b/sound/songs/midi/se_ball_tray_ball.mid
diff --git a/sound/songs/midi/se_tb_start.mid b/sound/songs/midi/se_ball_tray_enter.mid
index c88e2a8ea..c88e2a8ea 100644
--- a/sound/songs/midi/se_tb_start.mid
+++ b/sound/songs/midi/se_ball_tray_enter.mid
diff --git a/sound/songs/midi/se_tb_kara.mid b/sound/songs/midi/se_ball_tray_exit.mid
index a4c2a51d7..a4c2a51d7 100644
--- a/sound/songs/midi/se_tb_kara.mid
+++ b/sound/songs/midi/se_ball_tray_exit.mid
diff --git a/sound/songs/midi/se_fuusen2.mid b/sound/songs/midi/se_balloon_blue.mid
index 4efc1a525..4efc1a525 100644
--- a/sound/songs/midi/se_fuusen2.mid
+++ b/sound/songs/midi/se_balloon_blue.mid
diff --git a/sound/songs/midi/se_fuusen1.mid b/sound/songs/midi/se_balloon_red.mid
index d22679a86..d22679a86 100644
--- a/sound/songs/midi/se_fuusen1.mid
+++ b/sound/songs/midi/se_balloon_red.mid
diff --git a/sound/songs/midi/se_fuusen3.mid b/sound/songs/midi/se_balloon_yellow.mid
index ae40e0008..ae40e0008 100644
--- a/sound/songs/midi/se_fuusen3.mid
+++ b/sound/songs/midi/se_balloon_yellow.mid
diff --git a/sound/songs/midi/se_ban.mid b/sound/songs/midi/se_bang.mid
index 0722a1c36..0722a1c36 100644
--- a/sound/songs/midi/se_ban.mid
+++ b/sound/songs/midi/se_bang.mid
diff --git a/sound/songs/midi/se_moter.mid b/sound/songs/midi/se_berry_blender.mid
index 8203333e5..8203333e5 100644
--- a/sound/songs/midi/se_moter.mid
+++ b/sound/songs/midi/se_berry_blender.mid
diff --git a/sound/songs/midi/se_jitensya.mid b/sound/songs/midi/se_bike_bell.mid
index 9d5de6cbd..9d5de6cbd 100644
--- a/sound/songs/midi/se_jitensya.mid
+++ b/sound/songs/midi/se_bike_bell.mid
diff --git a/sound/songs/midi/se_jite_pyoko.mid b/sound/songs/midi/se_bike_hop.mid
index 013be8590..013be8590 100644
--- a/sound/songs/midi/se_jite_pyoko.mid
+++ b/sound/songs/midi/se_bike_hop.mid
diff --git a/sound/songs/midi/se_toy_kabe.mid b/sound/songs/midi/se_breakable_door.mid
index c35be0c0d..c35be0c0d 100644
--- a/sound/songs/midi/se_toy_kabe.mid
+++ b/sound/songs/midi/se_breakable_door.mid
diff --git a/sound/songs/midi/se_hashi.mid b/sound/songs/midi/se_bridge_walk.mid
index fdd772c18..fdd772c18 100644
--- a/sound/songs/midi/se_hashi.mid
+++ b/sound/songs/midi/se_bridge_walk.mid
diff --git a/sound/songs/midi/se_tk_kasya.mid b/sound/songs/midi/se_click.mid
index baa73e0c6..baa73e0c6 100644
--- a/sound/songs/midi/se_tk_kasya.mid
+++ b/sound/songs/midi/se_click.mid
diff --git a/sound/songs/midi/se_fu_zaku2.mid b/sound/songs/midi/se_contest_condition_lose.mid
index 3fc903844..3fc903844 100644
--- a/sound/songs/midi/se_fu_zaku2.mid
+++ b/sound/songs/midi/se_contest_condition_lose.mid
diff --git a/sound/songs/midi/se_c_maku_d.mid b/sound/songs/midi/se_contest_curtain_fall.mid
index 04e2bfb11..04e2bfb11 100644
--- a/sound/songs/midi/se_c_maku_d.mid
+++ b/sound/songs/midi/se_contest_curtain_fall.mid
diff --git a/sound/songs/midi/se_c_maku_u.mid b/sound/songs/midi/se_contest_curtain_rise.mid
index 109f92322..109f92322 100644
--- a/sound/songs/midi/se_c_maku_u.mid
+++ b/sound/songs/midi/se_contest_curtain_rise.mid
diff --git a/sound/songs/midi/se_c_gaji.mid b/sound/songs/midi/se_contest_heart.mid
index 94b6389b7..94b6389b7 100644
--- a/sound/songs/midi/se_c_gaji.mid
+++ b/sound/songs/midi/se_contest_heart.mid
diff --git a/sound/songs/midi/se_c_pasi.mid b/sound/songs/midi/se_contest_icon_change.mid
index eea9c5707..eea9c5707 100644
--- a/sound/songs/midi/se_c_pasi.mid
+++ b/sound/songs/midi/se_contest_icon_change.mid
diff --git a/sound/songs/midi/se_c_syu.mid b/sound/songs/midi/se_contest_icon_clear.mid
index 3766d5f51..3766d5f51 100644
--- a/sound/songs/midi/se_c_syu.mid
+++ b/sound/songs/midi/se_contest_icon_clear.mid
diff --git a/sound/songs/midi/se_c_pikon.mid b/sound/songs/midi/se_contest_mons_turn.mid
index 718a61443..718a61443 100644
--- a/sound/songs/midi/se_c_pikon.mid
+++ b/sound/songs/midi/se_contest_mons_turn.mid
diff --git a/sound/songs/midi/se_jyuni.mid b/sound/songs/midi/se_contest_place.mid
index f68a31e46..f68a31e46 100644
--- a/sound/songs/midi/se_jyuni.mid
+++ b/sound/songs/midi/se_contest_place.mid
diff --git a/sound/songs/midi/se_z_search.mid b/sound/songs/midi/se_dex_search.mid
index 1869374af..1869374af 100644
--- a/sound/songs/midi/se_z_search.mid
+++ b/sound/songs/midi/se_dex_search.mid
diff --git a/sound/songs/midi/se_pinpon.mid b/sound/songs/midi/se_ding_dong.mid
index 924dafda5..924dafda5 100644
--- a/sound/songs/midi/se_pinpon.mid
+++ b/sound/songs/midi/se_ding_dong.mid
diff --git a/sound/songs/midi/se_t_ooame.mid b/sound/songs/midi/se_downpour.mid
index 3aedd4404..3aedd4404 100644
--- a/sound/songs/midi/se_t_ooame.mid
+++ b/sound/songs/midi/se_downpour.mid
diff --git a/sound/songs/midi/se_t_ooame_e.mid b/sound/songs/midi/se_downpour_stop.mid
index b73010142..b73010142 100644
--- a/sound/songs/midi/se_t_ooame_e.mid
+++ b/sound/songs/midi/se_downpour_stop.mid
diff --git a/sound/songs/midi/se_kouka_m.mid b/sound/songs/midi/se_effective.mid
index d98bd0027..d98bd0027 100644
--- a/sound/songs/midi/se_kouka_m.mid
+++ b/sound/songs/midi/se_effective.mid
diff --git a/sound/songs/midi/se_tamago.mid b/sound/songs/midi/se_egg_hatch.mid
index 67d3959eb..67d3959eb 100644
--- a/sound/songs/midi/se_tamago.mid
+++ b/sound/songs/midi/se_egg_hatch.mid
diff --git a/sound/songs/midi/se_elebeta.mid b/sound/songs/midi/se_elevator.mid
index 66ee5fd1f..66ee5fd1f 100644
--- a/sound/songs/midi/se_elebeta.mid
+++ b/sound/songs/midi/se_elevator.mid
diff --git a/sound/songs/midi/se_esuka.mid b/sound/songs/midi/se_escalator.mid
index 6a9e22a5b..6a9e22a5b 100644
--- a/sound/songs/midi/se_esuka.mid
+++ b/sound/songs/midi/se_escalator.mid
diff --git a/sound/songs/midi/se_kaidan.mid b/sound/songs/midi/se_exit.mid
index 575307d86..575307d86 100644
--- a/sound/songs/midi/se_kaidan.mid
+++ b/sound/songs/midi/se_exit.mid
diff --git a/sound/songs/midi/se_expmax.mid b/sound/songs/midi/se_exp_max.mid
index 8772e915e..8772e915e 100644
--- a/sound/songs/midi/se_expmax.mid
+++ b/sound/songs/midi/se_exp_max.mid
diff --git a/sound/songs/midi/se_hazure.mid b/sound/songs/midi/se_failure.mid
index c3c52f88f..c3c52f88f 100644
--- a/sound/songs/midi/se_hazure.mid
+++ b/sound/songs/midi/se_failure.mid
diff --git a/sound/songs/midi/se_poke_dead.mid b/sound/songs/midi/se_faint.mid
index b6a0df4c8..b6a0df4c8 100644
--- a/sound/songs/midi/se_poke_dead.mid
+++ b/sound/songs/midi/se_faint.mid
diff --git a/sound/songs/midi/se_ru_hyuu.mid b/sound/songs/midi/se_fall.mid
index 1adfc9268..1adfc9268 100644
--- a/sound/songs/midi/se_ru_hyuu.mid
+++ b/sound/songs/midi/se_fall.mid
diff --git a/sound/songs/midi/se_doku.mid b/sound/songs/midi/se_field_poison.mid
index 83841203a..83841203a 100644
--- a/sound/songs/midi/se_doku.mid
+++ b/sound/songs/midi/se_field_poison.mid
diff --git a/sound/songs/midi/se_nigeru.mid b/sound/songs/midi/se_flee.mid
index faf37d529..faf37d529 100644
--- a/sound/songs/midi/se_nigeru.mid
+++ b/sound/songs/midi/se_flee.mid
diff --git a/sound/songs/midi/se_bidoro.mid b/sound/songs/midi/se_glass_flute.mid
index a0b639ba4..a0b639ba4 100644
--- a/sound/songs/midi/se_bidoro.mid
+++ b/sound/songs/midi/se_glass_flute.mid
diff --git a/sound/songs/midi/se_ru_gasyan.mid b/sound/songs/midi/se_ice_break.mid
index 486eabb9b..486eabb9b 100644
--- a/sound/songs/midi/se_ru_gasyan.mid
+++ b/sound/songs/midi/se_ice_break.mid
diff --git a/sound/songs/midi/se_ru_bari.mid b/sound/songs/midi/se_ice_crack.mid
index 14b1991e6..14b1991e6 100644
--- a/sound/songs/midi/se_ru_bari.mid
+++ b/sound/songs/midi/se_ice_crack.mid
diff --git a/sound/songs/midi/se_ru_gashin.mid b/sound/songs/midi/se_ice_stairs.mid
index ae29a385b..ae29a385b 100644
--- a/sound/songs/midi/se_ru_gashin.mid
+++ b/sound/songs/midi/se_ice_stairs.mid
diff --git a/sound/songs/midi/se_op_basyu.mid b/sound/songs/midi/se_intro_blast.mid
index 4648741c2..4648741c2 100644
--- a/sound/songs/midi/se_op_basyu.mid
+++ b/sound/songs/midi/se_intro_blast.mid
diff --git a/sound/songs/midi/se_daugi.mid b/sound/songs/midi/se_itemfinder.mid
index 9b6538a70..9b6538a70 100644
--- a/sound/songs/midi/se_daugi.mid
+++ b/sound/songs/midi/se_itemfinder.mid
diff --git a/sound/songs/midi/se_fu_zuzuzu.mid b/sound/songs/midi/se_lavaridge_fall_warp.mid
index 962113ad3..962113ad3 100644
--- a/sound/songs/midi/se_fu_zuzuzu.mid
+++ b/sound/songs/midi/se_lavaridge_fall_warp.mid
diff --git a/sound/songs/midi/se_dansa.mid b/sound/songs/midi/se_ledge.mid
index 61eae0318..61eae0318 100644
--- a/sound/songs/midi/se_dansa.mid
+++ b/sound/songs/midi/se_ledge.mid
diff --git a/sound/songs/midi/se_hinsi.mid b/sound/songs/midi/se_low_health.mid
index 3676a4a04..3676a4a04 100644
--- a/sound/songs/midi/se_hinsi.mid
+++ b/sound/songs/midi/se_low_health.mid
diff --git a/sound/songs/midi/se_w020.mid b/sound/songs/midi/se_m_bind.mid
index eec8ccae9..eec8ccae9 100644
--- a/sound/songs/midi/se_w020.mid
+++ b/sound/songs/midi/se_m_bind.mid
diff --git a/sound/songs/midi/se_w004.mid b/sound/songs/midi/se_m_comet_punch.mid
index a27538d81..a27538d81 100644
--- a/sound/songs/midi/se_w004.mid
+++ b/sound/songs/midi/se_m_comet_punch.mid
diff --git a/sound/songs/midi/se_w015.mid b/sound/songs/midi/se_m_cut.mid
index 2f1b4e059..2f1b4e059 100644
--- a/sound/songs/midi/se_w015.mid
+++ b/sound/songs/midi/se_m_cut.mid
diff --git a/sound/songs/midi/se_w003.mid b/sound/songs/midi/se_m_double_slap.mid
index 80e7a52a7..80e7a52a7 100644
--- a/sound/songs/midi/se_w003.mid
+++ b/sound/songs/midi/se_m_double_slap.mid
diff --git a/sound/songs/midi/se_w007.mid b/sound/songs/midi/se_m_fire_punch.mid
index 2f75754f3..2f75754f3 100644
--- a/sound/songs/midi/se_w007.mid
+++ b/sound/songs/midi/se_m_fire_punch.mid
diff --git a/sound/songs/midi/se_w019.mid b/sound/songs/midi/se_m_fly.mid
index 6e63f48cc..6e63f48cc 100644
--- a/sound/songs/midi/se_w019.mid
+++ b/sound/songs/midi/se_m_fly.mid
diff --git a/sound/songs/midi/se_w016.mid b/sound/songs/midi/se_m_gust.mid
index 8bf167109..8bf167109 100644
--- a/sound/songs/midi/se_w016.mid
+++ b/sound/songs/midi/se_m_gust.mid
diff --git a/sound/songs/midi/se_w016b.mid b/sound/songs/midi/se_m_gust2.mid
index 6dd7020f9..6dd7020f9 100644
--- a/sound/songs/midi/se_w016b.mid
+++ b/sound/songs/midi/se_m_gust2.mid
diff --git a/sound/songs/midi/se_w029.mid b/sound/songs/midi/se_m_headbutt.mid
index 4cde4e2d5..4cde4e2d5 100644
--- a/sound/songs/midi/se_w029.mid
+++ b/sound/songs/midi/se_m_headbutt.mid
diff --git a/sound/songs/midi/se_w030.mid b/sound/songs/midi/se_m_horn_attack.mid
index 426cdfea4..426cdfea4 100644
--- a/sound/songs/midi/se_w030.mid
+++ b/sound/songs/midi/se_m_horn_attack.mid
diff --git a/sound/songs/midi/se_w026.mid b/sound/songs/midi/se_m_jump_kick.mid
index d43366801..d43366801 100644
--- a/sound/songs/midi/se_w026.mid
+++ b/sound/songs/midi/se_m_jump_kick.mid
diff --git a/sound/songs/midi/se_w043.mid b/sound/songs/midi/se_m_leer.mid
index b44876722..b44876722 100644
--- a/sound/songs/midi/se_w043.mid
+++ b/sound/songs/midi/se_m_leer.mid
diff --git a/sound/songs/midi/se_w025.mid b/sound/songs/midi/se_m_mega_kick.mid
index bcc9590b4..bcc9590b4 100644
--- a/sound/songs/midi/se_w025.mid
+++ b/sound/songs/midi/se_m_mega_kick.mid
diff --git a/sound/songs/midi/se_w025b.mid b/sound/songs/midi/se_m_mega_kick2.mid
index ac165424b..ac165424b 100644
--- a/sound/songs/midi/se_w025b.mid
+++ b/sound/songs/midi/se_m_mega_kick2.mid
diff --git a/sound/songs/midi/se_w006.mid b/sound/songs/midi/se_m_pay_day.mid
index 5f59591be..5f59591be 100644
--- a/sound/songs/midi/se_w006.mid
+++ b/sound/songs/midi/se_m_pay_day.mid
diff --git a/sound/songs/midi/se_w013.mid b/sound/songs/midi/se_m_razor_wind.mid
index ae94dafa2..ae94dafa2 100644
--- a/sound/songs/midi/se_w013.mid
+++ b/sound/songs/midi/se_m_razor_wind.mid
diff --git a/sound/songs/midi/se_w013b.mid b/sound/songs/midi/se_m_razor_wind2.mid
index 09e8d4c5d..09e8d4c5d 100644
--- a/sound/songs/midi/se_w013b.mid
+++ b/sound/songs/midi/se_m_razor_wind2.mid
diff --git a/sound/songs/midi/se_w028.mid b/sound/songs/midi/se_m_sand_attack.mid
index 7a053f799..7a053f799 100644
--- a/sound/songs/midi/se_w028.mid
+++ b/sound/songs/midi/se_m_sand_attack.mid
diff --git a/sound/songs/midi/se_w010.mid b/sound/songs/midi/se_m_scratch.mid
index 4b3c1cfcf..4b3c1cfcf 100644
--- a/sound/songs/midi/se_w010.mid
+++ b/sound/songs/midi/se_m_scratch.mid
diff --git a/sound/songs/midi/se_w014.mid b/sound/songs/midi/se_m_swords_dance.mid
index 8b17c79a9..8b17c79a9 100644
--- a/sound/songs/midi/se_w014.mid
+++ b/sound/songs/midi/se_m_swords_dance.mid
diff --git a/sound/songs/midi/se_w039.mid b/sound/songs/midi/se_m_tail_whip.mid
index 771581ce0..771581ce0 100644
--- a/sound/songs/midi/se_w039.mid
+++ b/sound/songs/midi/se_m_tail_whip.mid
diff --git a/sound/songs/midi/se_w036.mid b/sound/songs/midi/se_m_take_down.mid
index e5427c8df..e5427c8df 100644
--- a/sound/songs/midi/se_w036.mid
+++ b/sound/songs/midi/se_m_take_down.mid
diff --git a/sound/songs/midi/se_w011.mid b/sound/songs/midi/se_m_vicegrip.mid
index 703ae492b..703ae492b 100644
--- a/sound/songs/midi/se_w011.mid
+++ b/sound/songs/midi/se_m_vicegrip.mid
diff --git a/sound/songs/midi/se_w017.mid b/sound/songs/midi/se_m_wing_attack.mid
index 459e72406..459e72406 100644
--- a/sound/songs/midi/se_w017.mid
+++ b/sound/songs/midi/se_m_wing_attack.mid
diff --git a/sound/songs/midi/se_toy_dango.mid b/sound/songs/midi/se_mud_ball.mid
index baa1ed24e..baa1ed24e 100644
--- a/sound/songs/midi/se_toy_dango.mid
+++ b/sound/songs/midi/se_mud_ball.mid
diff --git a/sound/songs/midi/se_bt_start.mid b/sound/songs/midi/se_mugshot.mid
index 8c13783e9..8c13783e9 100644
--- a/sound/songs/midi/se_bt_start.mid
+++ b/sound/songs/midi/se_mugshot.mid
diff --git a/sound/songs/midi/se_kouka_l.mid b/sound/songs/midi/se_not_effective.mid
index 34aafbb18..34aafbb18 100644
--- a/sound/songs/midi/se_kouka_l.mid
+++ b/sound/songs/midi/se_not_effective.mid
diff --git a/sound/songs/midi/se_toy_a.mid b/sound/songs/midi/se_note_a.mid
index b6d5b6159..b6d5b6159 100644
--- a/sound/songs/midi/se_toy_a.mid
+++ b/sound/songs/midi/se_note_a.mid
diff --git a/sound/songs/midi/se_toy_b.mid b/sound/songs/midi/se_note_b.mid
index 9e27e72e7..9e27e72e7 100644
--- a/sound/songs/midi/se_toy_b.mid
+++ b/sound/songs/midi/se_note_b.mid
diff --git a/sound/songs/midi/se_toy_c.mid b/sound/songs/midi/se_note_c.mid
index 3d10dc6cb..3d10dc6cb 100644
--- a/sound/songs/midi/se_toy_c.mid
+++ b/sound/songs/midi/se_note_c.mid
diff --git a/sound/songs/midi/se_toy_c1.mid b/sound/songs/midi/se_note_c_high.mid
index 345925255..345925255 100644
--- a/sound/songs/midi/se_toy_c1.mid
+++ b/sound/songs/midi/se_note_c_high.mid
diff --git a/sound/songs/midi/se_toy_d.mid b/sound/songs/midi/se_note_d.mid
index 0de257ee5..0de257ee5 100644
--- a/sound/songs/midi/se_toy_d.mid
+++ b/sound/songs/midi/se_note_d.mid
diff --git a/sound/songs/midi/se_toy_e.mid b/sound/songs/midi/se_note_e.mid
index 214b32bca..214b32bca 100644
--- a/sound/songs/midi/se_toy_e.mid
+++ b/sound/songs/midi/se_note_e.mid
diff --git a/sound/songs/midi/se_toy_f.mid b/sound/songs/midi/se_note_f.mid
index 780e162e0..780e162e0 100644
--- a/sound/songs/midi/se_toy_f.mid
+++ b/sound/songs/midi/se_note_f.mid
diff --git a/sound/songs/midi/se_toy_g.mid b/sound/songs/midi/se_note_g.mid
index 73dae55a5..73dae55a5 100644
--- a/sound/songs/midi/se_toy_g.mid
+++ b/sound/songs/midi/se_note_g.mid
diff --git a/sound/songs/midi/se_tama.mid b/sound/songs/midi/se_orb.mid
index aa9fc7889..aa9fc7889 100644
--- a/sound/songs/midi/se_tama.mid
+++ b/sound/songs/midi/se_orb.mid
diff --git a/sound/songs/midi/se_curtain.mid b/sound/songs/midi/se_pike_curtain_close.mid
index 88c684318..88c684318 100644
--- a/sound/songs/midi/se_curtain.mid
+++ b/sound/songs/midi/se_pike_curtain_close.mid
diff --git a/sound/songs/midi/se_curtain1.mid b/sound/songs/midi/se_pike_curtain_open.mid
index 0a40e158e..0a40e158e 100644
--- a/sound/songs/midi/se_curtain1.mid
+++ b/sound/songs/midi/se_pike_curtain_open.mid
diff --git a/sound/songs/midi/se_toreeye.mid b/sound/songs/midi/se_pokenav_call.mid
index e25a9ac74..e25a9ac74 100644
--- a/sound/songs/midi/se_toreeye.mid
+++ b/sound/songs/midi/se_pokenav_call.mid
diff --git a/sound/songs/midi/se_toreoff.mid b/sound/songs/midi/se_pokenav_hang_up.mid
index 391f23a3d..391f23a3d 100644
--- a/sound/songs/midi/se_toreoff.mid
+++ b/sound/songs/midi/se_pokenav_hang_up.mid
diff --git a/sound/songs/midi/se_pn_off.mid b/sound/songs/midi/se_pokenav_off.mid
index 2fba0d159..2fba0d159 100644
--- a/sound/songs/midi/se_pn_off.mid
+++ b/sound/songs/midi/se_pokenav_off.mid
diff --git a/sound/songs/midi/se_pn_on.mid b/sound/songs/midi/se_pokenav_on.mid
index dfe850794..dfe850794 100644
--- a/sound/songs/midi/se_pn_on.mid
+++ b/sound/songs/midi/se_pokenav_on.mid
diff --git a/sound/songs/midi/se_mizu.mid b/sound/songs/midi/se_puddle.mid
index dfdc85619..dfdc85619 100644
--- a/sound/songs/midi/se_mizu.mid
+++ b/sound/songs/midi/se_puddle.mid
diff --git a/sound/songs/midi/se_t_koame.mid b/sound/songs/midi/se_rain.mid
index d8491b293..d8491b293 100644
--- a/sound/songs/midi/se_t_koame.mid
+++ b/sound/songs/midi/se_rain.mid
diff --git a/sound/songs/midi/se_t_koame_e.mid b/sound/songs/midi/se_rain_stop.mid
index 4a04f73f9..4a04f73f9 100644
--- a/sound/songs/midi/se_t_koame_e.mid
+++ b/sound/songs/midi/se_rain_stop.mid
diff --git a/sound/songs/midi/se_tu_saa.mid b/sound/songs/midi/se_repel.mid
index c84b176cb..c84b176cb 100644
--- a/sound/songs/midi/se_tu_saa.mid
+++ b/sound/songs/midi/se_repel.mid
diff --git a/sound/songs/midi/se_rg_bag1.mid b/sound/songs/midi/se_rg_bag_cursor.mid
index ac783bd38..ac783bd38 100644
--- a/sound/songs/midi/se_rg_bag1.mid
+++ b/sound/songs/midi/se_rg_bag_cursor.mid
diff --git a/sound/songs/midi/se_rg_bag2.mid b/sound/songs/midi/se_rg_bag_pocket.mid
index 97a5b32df..97a5b32df 100644
--- a/sound/songs/midi/se_rg_bag2.mid
+++ b/sound/songs/midi/se_rg_bag_pocket.mid
diff --git a/sound/songs/midi/se_rg_getting.mid b/sound/songs/midi/se_rg_ball_click.mid
index f8bf4b38f..f8bf4b38f 100644
--- a/sound/songs/midi/se_rg_getting.mid
+++ b/sound/songs/midi/se_rg_ball_click.mid
diff --git a/sound/songs/midi/se_rg_card1.mid b/sound/songs/midi/se_rg_card_flip.mid
index 22a50e6df..22a50e6df 100644
--- a/sound/songs/midi/se_rg_card1.mid
+++ b/sound/songs/midi/se_rg_card_flip.mid
diff --git a/sound/songs/midi/se_rg_card2.mid b/sound/songs/midi/se_rg_card_flipping.mid
index 02276b2ad..02276b2ad 100644
--- a/sound/songs/midi/se_rg_card2.mid
+++ b/sound/songs/midi/se_rg_card_flipping.mid
diff --git a/sound/songs/midi/se_rg_card3.mid b/sound/songs/midi/se_rg_card_open.mid
index 47cc451d0..47cc451d0 100644
--- a/sound/songs/midi/se_rg_card3.mid
+++ b/sound/songs/midi/se_rg_card_open.mid
diff --git a/sound/songs/midi/se_rg_deomov.mid b/sound/songs/midi/se_rg_deoxys_move.mid
index 0149d29db..0149d29db 100644
--- a/sound/songs/midi/se_rg_deomov.mid
+++ b/sound/songs/midi/se_rg_deoxys_move.mid
diff --git a/sound/songs/midi/se_rg_w_door.mid b/sound/songs/midi/se_rg_door.mid
index e0b6ba957..e0b6ba957 100644
--- a/sound/songs/midi/se_rg_w_door.mid
+++ b/sound/songs/midi/se_rg_door.mid
diff --git a/sound/songs/midi/se_rg_help_cl.mid b/sound/songs/midi/se_rg_help_close.mid
index 09b151631..09b151631 100644
--- a/sound/songs/midi/se_rg_help_cl.mid
+++ b/sound/songs/midi/se_rg_help_close.mid
diff --git a/sound/songs/midi/se_rg_help_ng.mid b/sound/songs/midi/se_rg_help_error.mid
index f9597632a..f9597632a 100644
--- a/sound/songs/midi/se_rg_help_ng.mid
+++ b/sound/songs/midi/se_rg_help_error.mid
diff --git a/sound/songs/midi/se_rg_help_op.mid b/sound/songs/midi/se_rg_help_open.mid
index 79b6c53a8..79b6c53a8 100644
--- a/sound/songs/midi/se_rg_help_op.mid
+++ b/sound/songs/midi/se_rg_help_open.mid
diff --git a/sound/songs/midi/se_rg_nawamiss.mid b/sound/songs/midi/se_rg_poke_jump_failure.mid
index c3c52f88f..c3c52f88f 100644
--- a/sound/songs/midi/se_rg_nawamiss.mid
+++ b/sound/songs/midi/se_rg_poke_jump_failure.mid
diff --git a/sound/songs/midi/se_rg_excellent.mid b/sound/songs/midi/se_rg_poke_jump_success.mid
index 8f7c267c4..8f7c267c4 100644
--- a/sound/songs/midi/se_rg_excellent.mid
+++ b/sound/songs/midi/se_rg_poke_jump_success.mid
diff --git a/sound/songs/midi/se_rg_kiteki.mid b/sound/songs/midi/se_rg_ss_anne_horn.mid
index 07e19663a..07e19663a 100644
--- a/sound/songs/midi/se_rg_kiteki.mid
+++ b/sound/songs/midi/se_rg_ss_anne_horn.mid
diff --git a/sound/songs/midi/se_hi_turun.mid b/sound/songs/midi/se_rotating_gate.mid
index 2a09f6c55..2a09f6c55 100644
--- a/sound/songs/midi/se_hi_turun.mid
+++ b/sound/songs/midi/se_rotating_gate.mid
diff --git a/sound/songs/midi/se_tamakoro.mid b/sound/songs/midi/se_roulette_ball.mid
index c6dce2865..c6dce2865 100644
--- a/sound/songs/midi/se_tamakoro.mid
+++ b/sound/songs/midi/se_roulette_ball.mid
diff --git a/sound/songs/midi/se_tamakoro_e.mid b/sound/songs/midi/se_roulette_ball2.mid
index 13675c690..13675c690 100644
--- a/sound/songs/midi/se_tamakoro_e.mid
+++ b/sound/songs/midi/se_roulette_ball2.mid
diff --git a/sound/songs/midi/se_reapoke.mid b/sound/songs/midi/se_shiny.mid
index b9a4fe810..b9a4fe810 100644
--- a/sound/songs/midi/se_reapoke.mid
+++ b/sound/songs/midi/se_shiny.mid
diff --git a/sound/songs/midi/se_naminori.mid b/sound/songs/midi/se_ship.mid
index ba2aa4931..ba2aa4931 100644
--- a/sound/songs/midi/se_naminori.mid
+++ b/sound/songs/midi/se_ship.mid
diff --git a/sound/songs/midi/se_regi.mid b/sound/songs/midi/se_shop.mid
index 28b727cb5..28b727cb5 100644
--- a/sound/songs/midi/se_regi.mid
+++ b/sound/songs/midi/se_shop.mid
diff --git a/sound/songs/midi/se_jido_doa.mid b/sound/songs/midi/se_sliding_door.mid
index 62fa8c911..62fa8c911 100644
--- a/sound/songs/midi/se_jido_doa.mid
+++ b/sound/songs/midi/se_sliding_door.mid
diff --git a/sound/songs/midi/se_seikai.mid b/sound/songs/midi/se_success.mid
index 32bfa07a8..32bfa07a8 100644
--- a/sound/songs/midi/se_seikai.mid
+++ b/sound/songs/midi/se_success.mid
diff --git a/sound/songs/midi/se_ussoki.mid b/sound/songs/midi/se_sudowoodo_shake.mid
index c5be0de8d..c5be0de8d 100644
--- a/sound/songs/midi/se_ussoki.mid
+++ b/sound/songs/midi/se_sudowoodo_shake.mid
diff --git a/sound/songs/midi/se_kouka_h.mid b/sound/songs/midi/se_super_effective.mid
index e70b12901..e70b12901 100644
--- a/sound/songs/midi/se_kouka_h.mid
+++ b/sound/songs/midi/se_super_effective.mid
diff --git a/sound/songs/midi/se_mu_pachi.mid b/sound/songs/midi/se_switch.mid
index 3d909dadb..3d909dadb 100644
--- a/sound/songs/midi/se_mu_pachi.mid
+++ b/sound/songs/midi/se_switch.mid
diff --git a/sound/songs/midi/se_basabasa.mid b/sound/songs/midi/se_taillow_wing_flap.mid
index 7a965abf5..7a965abf5 100644
--- a/sound/songs/midi/se_basabasa.mid
+++ b/sound/songs/midi/se_taillow_wing_flap.mid
diff --git a/sound/songs/midi/se_t_kami.mid b/sound/songs/midi/se_thunder.mid
index 71d8163bd..71d8163bd 100644
--- a/sound/songs/midi/se_t_kami.mid
+++ b/sound/songs/midi/se_thunder.mid
diff --git a/sound/songs/midi/se_t_kami2.mid b/sound/songs/midi/se_thunder2.mid
index c47731b94..c47731b94 100644
--- a/sound/songs/midi/se_t_kami2.mid
+++ b/sound/songs/midi/se_thunder2.mid
diff --git a/sound/songs/midi/se_t_ame.mid b/sound/songs/midi/se_thunderstorm.mid
index 9e15434cd..9e15434cd 100644
--- a/sound/songs/midi/se_t_ame.mid
+++ b/sound/songs/midi/se_thunderstorm.mid
diff --git a/sound/songs/midi/se_t_ame_e.mid b/sound/songs/midi/se_thunderstorm_stop.mid
index 2397eea64..2397eea64 100644
--- a/sound/songs/midi/se_t_ame_e.mid
+++ b/sound/songs/midi/se_thunderstorm_stop.mid
diff --git a/sound/songs/midi/se_track_door.mid b/sound/songs/midi/se_truck_door.mid
index 5cc1dbad8..5cc1dbad8 100644
--- a/sound/songs/midi/se_track_door.mid
+++ b/sound/songs/midi/se_truck_door.mid
diff --git a/sound/songs/midi/se_track_move.mid b/sound/songs/midi/se_truck_move.mid
index ced96f83a..ced96f83a 100644
--- a/sound/songs/midi/se_track_move.mid
+++ b/sound/songs/midi/se_truck_move.mid
diff --git a/sound/songs/midi/se_track_stop.mid b/sound/songs/midi/se_truck_stop.mid
index 509b2dd8e..509b2dd8e 100644
--- a/sound/songs/midi/se_track_stop.mid
+++ b/sound/songs/midi/se_truck_stop.mid
diff --git a/sound/songs/midi/se_track_haiki.mid b/sound/songs/midi/se_truck_unload.mid
index 42db7fd0e..42db7fd0e 100644
--- a/sound/songs/midi/se_track_haiki.mid
+++ b/sound/songs/midi/se_truck_unload.mid
diff --git a/sound/songs/midi/se_ki_gasyan.mid b/sound/songs/midi/se_unlock.mid
index 8a57132d9..8a57132d9 100644
--- a/sound/songs/midi/se_ki_gasyan.mid
+++ b/sound/songs/midi/se_unlock.mid
diff --git a/sound/songs/midi/se_kaifuku.mid b/sound/songs/midi/se_use_item.mid
index 4375a705d..4375a705d 100644
--- a/sound/songs/midi/se_kaifuku.mid
+++ b/sound/songs/midi/se_use_item.mid
diff --git a/sound/songs/midi/se_jihanki.mid b/sound/songs/midi/se_vend.mid
index ac6436d72..ac6436d72 100644
--- a/sound/songs/midi/se_jihanki.mid
+++ b/sound/songs/midi/se_vend.mid
diff --git a/sound/songs/midi/se_tk_warpin.mid b/sound/songs/midi/se_warp_in.mid
index e47d3df4d..e47d3df4d 100644
--- a/sound/songs/midi/se_tk_warpin.mid
+++ b/sound/songs/midi/se_warp_in.mid
diff --git a/sound/songs/midi/se_tk_warpout.mid b/sound/songs/midi/se_warp_out.mid
index 5072e6448..5072e6448 100644
--- a/sound/songs/midi/se_tk_warpout.mid
+++ b/sound/songs/midi/se_warp_out.mid
diff --git a/sound/songs/se_z_page.s b/sound/songs/se_dex_page.s
index a767bf5ad..884f0d12a 100644
--- a/sound/songs/se_z_page.s
+++ b/sound/songs/se_dex_page.s
@@ -1,28 +1,28 @@
 	.include "MPlayDef.s"
 
-	.equ	se_z_page_grp, voicegroup127
-	.equ	se_z_page_pri, 5
-	.equ	se_z_page_rev, reverb_set+50
-	.equ	se_z_page_mvl, 127
-	.equ	se_z_page_key, 0
-	.equ	se_z_page_tbs, 1
-	.equ	se_z_page_exg, 0
-	.equ	se_z_page_cmp, 1
+	.equ	se_dex_page_grp, voicegroup127
+	.equ	se_dex_page_pri, 5
+	.equ	se_dex_page_rev, reverb_set+50
+	.equ	se_dex_page_mvl, 127
+	.equ	se_dex_page_key, 0
+	.equ	se_dex_page_tbs, 1
+	.equ	se_dex_page_exg, 0
+	.equ	se_dex_page_cmp, 1
 
 	.section .rodata
-	.global	se_z_page
+	.global	se_dex_page
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_z_page_1:
-	.byte	KEYSH , se_z_page_key+0
-	.byte	TEMPO , 100*se_z_page_tbs/2
+se_dex_page_1:
+	.byte	KEYSH , se_dex_page_key+0
+	.byte	TEMPO , 100*se_dex_page_tbs/2
 	.byte		VOICE , 4
 	.byte		BENDR , 12
 	.byte		XCMD  , xIECV , 10
 	.byte		        xIECL , 8
-	.byte		VOL   , 90*se_z_page_mvl/mxv
+	.byte		VOL   , 90*se_dex_page_mvl/mxv
 	.byte		BEND  , c_v+4
 	.byte		N01   , Cn5 , v064
 	.byte	W01
@@ -41,14 +41,14 @@ se_z_page_1:
 @******************************************************@
 	.align	2
 
-se_z_page:
+se_dex_page:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_z_page_pri	@ Priority
-	.byte	se_z_page_rev	@ Reverb.
+	.byte	se_dex_page_pri	@ Priority
+	.byte	se_dex_page_rev	@ Reverb.
 
-	.word	se_z_page_grp
+	.word	se_dex_page_grp
 
-	.word	se_z_page_1
+	.word	se_dex_page_1
 
 	.end
diff --git a/sound/songs/se_dex_scroll.s b/sound/songs/se_dex_scroll.s
new file mode 100644
index 000000000..6c7ad7746
--- /dev/null
+++ b/sound/songs/se_dex_scroll.s
@@ -0,0 +1,46 @@
+	.include "MPlayDef.s"
+
+	.equ	se_dex_scroll_grp, voicegroup127
+	.equ	se_dex_scroll_pri, 5
+	.equ	se_dex_scroll_rev, reverb_set+50
+	.equ	se_dex_scroll_mvl, 127
+	.equ	se_dex_scroll_key, 0
+	.equ	se_dex_scroll_tbs, 1
+	.equ	se_dex_scroll_exg, 0
+	.equ	se_dex_scroll_cmp, 1
+
+	.section .rodata
+	.global	se_dex_scroll
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_dex_scroll_1:
+	.byte	KEYSH , se_dex_scroll_key+0
+	.byte	TEMPO , 100*se_dex_scroll_tbs/2
+	.byte		VOICE , 4
+	.byte		BENDR , 12
+	.byte		XCMD  , xIECV , 10
+	.byte		        xIECL , 8
+	.byte		VOL   , 40*se_dex_scroll_mvl/mxv
+	.byte		BEND  , c_v+4
+	.byte		N01   , Gn4 , v127
+	.byte	W01
+	.byte		        Gn4 , v020
+	.byte	W02
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_dex_scroll:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_dex_scroll_pri	@ Priority
+	.byte	se_dex_scroll_rev	@ Reverb.
+
+	.word	se_dex_scroll_grp
+
+	.word	se_dex_scroll_1
+
+	.end
diff --git a/sound/songs/se_w071.s b/sound/songs/se_m_absorb.s
index 3f1e008b9..35213fdaa 100644
--- a/sound/songs/se_w071.s
+++ b/sound/songs/se_m_absorb.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w071_grp, voicegroup128
-	.equ	se_w071_pri, 4
-	.equ	se_w071_rev, reverb_set+50
-	.equ	se_w071_mvl, 127
-	.equ	se_w071_key, 0
-	.equ	se_w071_tbs, 1
-	.equ	se_w071_exg, 0
-	.equ	se_w071_cmp, 1
+	.equ	se_m_absorb_grp, voicegroup128
+	.equ	se_m_absorb_pri, 4
+	.equ	se_m_absorb_rev, reverb_set+50
+	.equ	se_m_absorb_mvl, 127
+	.equ	se_m_absorb_key, 0
+	.equ	se_m_absorb_tbs, 1
+	.equ	se_m_absorb_exg, 0
+	.equ	se_m_absorb_cmp, 1
 
 	.section .rodata
-	.global	se_w071
+	.global	se_m_absorb
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w071_1:
-	.byte	KEYSH , se_w071_key+0
-	.byte	TEMPO , 150*se_w071_tbs/2
+se_m_absorb_1:
+	.byte	KEYSH , se_m_absorb_key+0
+	.byte	TEMPO , 150*se_m_absorb_tbs/2
 	.byte		VOICE , 24
-	.byte		VOL   , 110*se_w071_mvl/mxv
+	.byte		VOL   , 110*se_m_absorb_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -28,30 +28,30 @@ se_w071_1:
 	.byte		        Gn6 , v112
 	.byte	W01
 	.byte		VOICE , 38
-	.byte		VOL   , 58*se_w071_mvl/mxv
+	.byte		VOL   , 58*se_m_absorb_mvl/mxv
 	.byte		N08   , Gn4 
 	.byte	W01
-	.byte		VOL   , 68*se_w071_mvl/mxv
+	.byte		VOL   , 68*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v+8
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 75*se_w071_mvl/mxv
+	.byte		VOL   , 75*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v-48
 	.byte	W02
-	.byte		VOL   , 83*se_w071_mvl/mxv
+	.byte		VOL   , 83*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v+8
 	.byte		BEND  , c_v-18
 	.byte	W01
-	.byte		VOL   , 90*se_w071_mvl/mxv
+	.byte		VOL   , 90*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v+10
 	.byte	W01
-	.byte		VOL   , 101*se_w071_mvl/mxv
+	.byte		VOL   , 101*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte		BEND  , c_v+39
 	.byte	W01
-	.byte		VOL   , 110*se_w071_mvl/mxv
+	.byte		VOL   , 110*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v+63
 	.byte	W03
@@ -60,14 +60,14 @@ se_w071_1:
 @******************************************************@
 	.align	2
 
-se_w071:
+se_m_absorb:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w071_pri	@ Priority
-	.byte	se_w071_rev	@ Reverb.
+	.byte	se_m_absorb_pri	@ Priority
+	.byte	se_m_absorb_rev	@ Reverb.
 
-	.word	se_w071_grp
+	.word	se_m_absorb_grp
 
-	.word	se_w071_1
+	.word	se_m_absorb_1
 
 	.end
diff --git a/sound/songs/se_w071b.s b/sound/songs/se_m_absorb_2.s
index 81d8fe8c7..3f9df6dc4 100644
--- a/sound/songs/se_w071b.s
+++ b/sound/songs/se_m_absorb_2.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w071b_grp, voicegroup128
-	.equ	se_w071b_pri, 4
-	.equ	se_w071b_rev, reverb_set+50
-	.equ	se_w071b_mvl, 127
-	.equ	se_w071b_key, 0
-	.equ	se_w071b_tbs, 1
-	.equ	se_w071b_exg, 0
-	.equ	se_w071b_cmp, 1
+	.equ	se_m_absorb_2_grp, voicegroup128
+	.equ	se_m_absorb_2_pri, 4
+	.equ	se_m_absorb_2_rev, reverb_set+50
+	.equ	se_m_absorb_2_mvl, 127
+	.equ	se_m_absorb_2_key, 0
+	.equ	se_m_absorb_2_tbs, 1
+	.equ	se_m_absorb_2_exg, 0
+	.equ	se_m_absorb_2_cmp, 1
 
 	.section .rodata
-	.global	se_w071b
+	.global	se_m_absorb_2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w071b_1:
-	.byte	KEYSH , se_w071b_key+0
-	.byte	TEMPO , 150*se_w071b_tbs/2
+se_m_absorb_2_1:
+	.byte	KEYSH , se_m_absorb_2_key+0
+	.byte	TEMPO , 150*se_m_absorb_2_tbs/2
 	.byte		VOICE , 46
-	.byte		VOL   , 110*se_w071b_mvl/mxv
+	.byte		VOL   , 110*se_m_absorb_2_mvl/mxv
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
@@ -81,11 +81,11 @@ se_w071b_1:
 
 @********************** Track  2 **********************@
 
-se_w071b_2:
-	.byte	KEYSH , se_w071b_key+0
+se_m_absorb_2_2:
+	.byte	KEYSH , se_m_absorb_2_key+0
 	.byte		VOICE , 53
 	.byte		BENDR , 2
-	.byte		VOL   , 43*se_w071b_mvl/mxv
+	.byte		VOL   , 43*se_m_absorb_2_mvl/mxv
 	.byte		BEND  , c_v+15
 	.byte		N02   , An6 , v112
 	.byte	W02
@@ -141,15 +141,15 @@ se_w071b_2:
 @******************************************************@
 	.align	2
 
-se_w071b:
+se_m_absorb_2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w071b_pri	@ Priority
-	.byte	se_w071b_rev	@ Reverb.
+	.byte	se_m_absorb_2_pri	@ Priority
+	.byte	se_m_absorb_2_rev	@ Reverb.
 
-	.word	se_w071b_grp
+	.word	se_m_absorb_2_grp
 
-	.word	se_w071b_1
-	.word	se_w071b_2
+	.word	se_m_absorb_2_1
+	.word	se_m_absorb_2_2
 
 	.end
diff --git a/sound/songs/se_w151.s b/sound/songs/se_m_acid_armor.s
index c012b2d5f..c7f350a9b 100644
--- a/sound/songs/se_w151.s
+++ b/sound/songs/se_m_acid_armor.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w151_grp, voicegroup128
-	.equ	se_w151_pri, 4
-	.equ	se_w151_rev, reverb_set+50
-	.equ	se_w151_mvl, 127
-	.equ	se_w151_key, 0
-	.equ	se_w151_tbs, 1
-	.equ	se_w151_exg, 0
-	.equ	se_w151_cmp, 1
+	.equ	se_m_acid_armor_grp, voicegroup128
+	.equ	se_m_acid_armor_pri, 4
+	.equ	se_m_acid_armor_rev, reverb_set+50
+	.equ	se_m_acid_armor_mvl, 127
+	.equ	se_m_acid_armor_key, 0
+	.equ	se_m_acid_armor_tbs, 1
+	.equ	se_m_acid_armor_exg, 0
+	.equ	se_m_acid_armor_cmp, 1
 
 	.section .rodata
-	.global	se_w151
+	.global	se_m_acid_armor
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w151_1:
-	.byte	KEYSH , se_w151_key+0
-	.byte	TEMPO , 150*se_w151_tbs/2
+se_m_acid_armor_1:
+	.byte	KEYSH , se_m_acid_armor_key+0
+	.byte	TEMPO , 150*se_m_acid_armor_tbs/2
 	.byte		VOICE , 31
-	.byte		VOL   , 110*se_w151_mvl/mxv
+	.byte		VOL   , 110*se_m_acid_armor_mvl/mxv
 	.byte		BENDR , 24
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-37
@@ -189,14 +189,14 @@ se_w151_1:
 @******************************************************@
 	.align	2
 
-se_w151:
+se_m_acid_armor:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w151_pri	@ Priority
-	.byte	se_w151_rev	@ Reverb.
+	.byte	se_m_acid_armor_pri	@ Priority
+	.byte	se_m_acid_armor_rev	@ Reverb.
 
-	.word	se_w151_grp
+	.word	se_m_acid_armor_grp
 
-	.word	se_w151_1
+	.word	se_m_acid_armor_1
 
 	.end
diff --git a/sound/songs/se_w213.s b/sound/songs/se_m_attract.s
index b35e17038..8e18c16dc 100644
--- a/sound/songs/se_w213.s
+++ b/sound/songs/se_m_attract.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w213_grp, voicegroup128
-	.equ	se_w213_pri, 4
-	.equ	se_w213_rev, reverb_set+50
-	.equ	se_w213_mvl, 127
-	.equ	se_w213_key, 0
-	.equ	se_w213_tbs, 1
-	.equ	se_w213_exg, 0
-	.equ	se_w213_cmp, 1
+	.equ	se_m_attract_grp, voicegroup128
+	.equ	se_m_attract_pri, 4
+	.equ	se_m_attract_rev, reverb_set+50
+	.equ	se_m_attract_mvl, 127
+	.equ	se_m_attract_key, 0
+	.equ	se_m_attract_tbs, 1
+	.equ	se_m_attract_exg, 0
+	.equ	se_m_attract_cmp, 1
 
 	.section .rodata
-	.global	se_w213
+	.global	se_m_attract
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w213_1:
-	.byte	KEYSH , se_w213_key+0
-	.byte	TEMPO , 210*se_w213_tbs/2
+se_m_attract_1:
+	.byte	KEYSH , se_m_attract_key+0
+	.byte	TEMPO , 210*se_m_attract_tbs/2
 	.byte		VOICE , 46
-	.byte		VOL   , 95*se_w213_mvl/mxv
+	.byte		VOL   , 95*se_m_attract_mvl/mxv
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
@@ -67,11 +67,11 @@ se_w213_1:
 
 @********************** Track  2 **********************@
 
-se_w213_2:
-	.byte	KEYSH , se_w213_key+0
+se_m_attract_2:
+	.byte	KEYSH , se_m_attract_key+0
 	.byte		VOICE , 53
 	.byte		BENDR , 2
-	.byte		VOL   , 43*se_w213_mvl/mxv
+	.byte		VOL   , 43*se_m_attract_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
 	.byte		N06   , Cn5 , v120
@@ -112,15 +112,15 @@ se_w213_2:
 @******************************************************@
 	.align	2
 
-se_w213:
+se_m_attract:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w213_pri	@ Priority
-	.byte	se_w213_rev	@ Reverb.
+	.byte	se_m_attract_pri	@ Priority
+	.byte	se_m_attract_rev	@ Reverb.
 
-	.word	se_w213_grp
+	.word	se_m_attract_grp
 
-	.word	se_w213_1
-	.word	se_w213_2
+	.word	se_m_attract_1
+	.word	se_m_attract_2
 
 	.end
diff --git a/sound/songs/se_w213b.s b/sound/songs/se_m_attract2.s
index b7da4378e..7d3d6f3c5 100644
--- a/sound/songs/se_w213b.s
+++ b/sound/songs/se_m_attract2.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w213b_grp, voicegroup128
-	.equ	se_w213b_pri, 4
-	.equ	se_w213b_rev, reverb_set+50
-	.equ	se_w213b_mvl, 127
-	.equ	se_w213b_key, 0
-	.equ	se_w213b_tbs, 1
-	.equ	se_w213b_exg, 0
-	.equ	se_w213b_cmp, 1
+	.equ	se_m_attract2_grp, voicegroup128
+	.equ	se_m_attract2_pri, 4
+	.equ	se_m_attract2_rev, reverb_set+50
+	.equ	se_m_attract2_mvl, 127
+	.equ	se_m_attract2_key, 0
+	.equ	se_m_attract2_tbs, 1
+	.equ	se_m_attract2_exg, 0
+	.equ	se_m_attract2_cmp, 1
 
 	.section .rodata
-	.global	se_w213b
+	.global	se_m_attract2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w213b_1:
-	.byte	KEYSH , se_w213b_key+0
-	.byte	TEMPO , 150*se_w213b_tbs/2
+se_m_attract2_1:
+	.byte	KEYSH , se_m_attract2_key+0
+	.byte	TEMPO , 150*se_m_attract2_tbs/2
 	.byte		VOICE , 61
 	.byte		BENDR , 44
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w213b_mvl/mxv
+	.byte		VOL   , 110*se_m_attract2_mvl/mxv
 	.byte		MOD   , 30
 	.byte		BEND  , c_v+2
 	.byte		N54   , Dn4 , v080
@@ -69,11 +69,11 @@ se_w213b_1:
 
 @********************** Track  2 **********************@
 
-se_w213b_2:
-	.byte	KEYSH , se_w213b_key+0
+se_m_attract2_2:
+	.byte	KEYSH , se_m_attract2_key+0
 	.byte		VOICE , 62
 	.byte		BENDR , 44
-	.byte		VOL   , 110*se_w213b_mvl/mxv
+	.byte		VOL   , 110*se_m_attract2_mvl/mxv
 	.byte		MOD   , 30
 	.byte		PAN   , c_v+1
 	.byte		BEND  , c_v+1
@@ -113,15 +113,15 @@ se_w213b_2:
 @******************************************************@
 	.align	2
 
-se_w213b:
+se_m_attract2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w213b_pri	@ Priority
-	.byte	se_w213b_rev	@ Reverb.
+	.byte	se_m_attract2_pri	@ Priority
+	.byte	se_m_attract2_rev	@ Reverb.
 
-	.word	se_w213b_grp
+	.word	se_m_attract2_grp
 
-	.word	se_w213b_1
-	.word	se_w213b_2
+	.word	se_m_attract2_1
+	.word	se_m_attract2_2
 
 	.end
diff --git a/sound/songs/se_m_barrier.s b/sound/songs/se_m_barrier.s
new file mode 100644
index 000000000..54d57700f
--- /dev/null
+++ b/sound/songs/se_m_barrier.s
@@ -0,0 +1,276 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_barrier_grp, voicegroup128
+	.equ	se_m_barrier_pri, 4
+	.equ	se_m_barrier_rev, reverb_set+50
+	.equ	se_m_barrier_mvl, 127
+	.equ	se_m_barrier_key, 0
+	.equ	se_m_barrier_tbs, 1
+	.equ	se_m_barrier_exg, 0
+	.equ	se_m_barrier_cmp, 1
+
+	.section .rodata
+	.global	se_m_barrier
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_barrier_1:
+	.byte	KEYSH , se_m_barrier_key+0
+	.byte	TEMPO , 150*se_m_barrier_tbs/2
+	.byte		VOICE , 19
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v+3
+	.byte		N06   , Cn6 , v088
+	.byte	W01
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-8
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-17
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-34
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-45
+	.byte	W02
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N06   , Cn6 , v084
+	.byte	W01
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-11
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-20
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-37
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-47
+	.byte	W02
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-1
+	.byte		N06   , Cn6 , v076
+	.byte	W01
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-11
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-21
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-38
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-48
+	.byte	W02
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-1
+	.byte		N06   , Cn6 , v064
+	.byte	W01
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-11
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-21
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-38
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-48
+	.byte	W02
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-2
+	.byte		N06   , Cn6 , v056
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-12
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-22
+	.byte	W01
+	.byte		PAN   , c_v+8
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-39
+	.byte	W01
+	.byte		PAN   , c_v-10
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-49
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-2
+	.byte		N06   , Cn6 , v044
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-12
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-22
+	.byte	W01
+	.byte		PAN   , c_v+8
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-39
+	.byte	W01
+	.byte		PAN   , c_v-10
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-49
+	.byte	W02
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-2
+	.byte		N06   , Cn6 , v036
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-13
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-22
+	.byte	W01
+	.byte		PAN   , c_v+8
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-39
+	.byte	W01
+	.byte		PAN   , c_v-10
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-49
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-2
+	.byte		N06   , Cn6 , v028
+	.byte	W01
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-13
+	.byte	W01
+	.byte		PAN   , c_v-6
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-22
+	.byte	W01
+	.byte		PAN   , c_v+8
+	.byte		VOL   , 24*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-39
+	.byte	W01
+	.byte		PAN   , c_v-10
+	.byte		VOL   , 11*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-49
+	.byte	W02
+	.byte	W06
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_barrier_2:
+	.byte	KEYSH , se_m_barrier_key+0
+	.byte		VOICE , 53
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 95*se_m_barrier_mvl/mxv
+	.byte		BEND  , c_v-5
+	.byte	W02
+	.byte		N06   , An5 , v064
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+	.byte		        56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_barrier_mvl/mxv
+	.byte		N06   , An5 , v056
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+se_m_barrier_2_000:
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_barrier_mvl/mxv
+	.byte		N06   , An5 , v052
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+	.byte	PEND
+	.byte	PATT
+	 .word	se_m_barrier_2_000
+	.byte		VOL   , 56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_barrier_mvl/mxv
+	.byte		N06   , An5 , v048
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+	.byte		        56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_barrier_mvl/mxv
+	.byte		N06   , An5 , v044
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+	.byte		        56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_barrier_mvl/mxv
+	.byte		N06   , An5 , v040
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+	.byte		        56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_barrier_mvl/mxv
+	.byte		N06   , An5 , v036
+	.byte	W02
+	.byte		VOL   , 88*se_m_barrier_mvl/mxv
+	.byte	W02
+	.byte		        56*se_m_barrier_mvl/mxv
+	.byte	W01
+	.byte		        24*se_m_barrier_mvl/mxv
+	.byte	W05
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_barrier:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_barrier_pri	@ Priority
+	.byte	se_m_barrier_rev	@ Reverb.
+
+	.word	se_m_barrier_grp
+
+	.word	se_m_barrier_1
+	.word	se_m_barrier_2
+
+	.end
diff --git a/sound/songs/se_w226.s b/sound/songs/se_m_baton_pass.s
index fe6c6d05e..30027e5b6 100644
--- a/sound/songs/se_w226.s
+++ b/sound/songs/se_m_baton_pass.s
@@ -1,43 +1,43 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w226_grp, voicegroup128
-	.equ	se_w226_pri, 4
-	.equ	se_w226_rev, reverb_set+50
-	.equ	se_w226_mvl, 127
-	.equ	se_w226_key, 0
-	.equ	se_w226_tbs, 1
-	.equ	se_w226_exg, 0
-	.equ	se_w226_cmp, 1
+	.equ	se_m_baton_pass_grp, voicegroup128
+	.equ	se_m_baton_pass_pri, 4
+	.equ	se_m_baton_pass_rev, reverb_set+50
+	.equ	se_m_baton_pass_mvl, 127
+	.equ	se_m_baton_pass_key, 0
+	.equ	se_m_baton_pass_tbs, 1
+	.equ	se_m_baton_pass_exg, 0
+	.equ	se_m_baton_pass_cmp, 1
 
 	.section .rodata
-	.global	se_w226
+	.global	se_m_baton_pass
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w226_1:
-	.byte	KEYSH , se_w226_key+0
+se_m_baton_pass_1:
+	.byte	KEYSH , se_m_baton_pass_key+0
 	.byte		VOICE , 19
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 12*se_w226_mvl/mxv
+	.byte		VOL   , 12*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+49
 	.byte		N06   , Gn4 , v080
 	.byte	W01
-	.byte		VOL   , 44*se_w226_mvl/mxv
+	.byte		VOL   , 44*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+22
 	.byte	W01
-	.byte		VOL   , 62*se_w226_mvl/mxv
+	.byte		VOL   , 62*se_m_baton_pass_mvl/mxv
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 75*se_w226_mvl/mxv
+	.byte		VOL   , 75*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+20
 	.byte	W01
-	.byte		VOL   , 87*se_w226_mvl/mxv
+	.byte		VOL   , 87*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+33
 	.byte	W01
-	.byte		VOL   , 96*se_w226_mvl/mxv
+	.byte		VOL   , 96*se_m_baton_pass_mvl/mxv
 	.byte		PAN   , c_v-7
-	.byte		VOL   , 100*se_w226_mvl/mxv
+	.byte		VOL   , 100*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+54
 	.byte	W01
 	.byte		        c_v+63
@@ -51,18 +51,18 @@ se_w226_1:
 	.byte		VOICE , 45
 	.byte		MOD   , 30
 	.byte		BENDR , 24
-	.byte		VOL   , 54*se_w226_mvl/mxv
+	.byte		VOL   , 54*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , Gn3 , v108
 	.byte	W01
-	.byte		VOL   , 70*se_w226_mvl/mxv
+	.byte		VOL   , 70*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+4
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 80*se_w226_mvl/mxv
+	.byte		VOL   , 80*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+9
 	.byte	W01
-	.byte		VOL   , 100*se_w226_mvl/mxv
+	.byte		VOL   , 100*se_m_baton_pass_mvl/mxv
 	.byte		BEND  , c_v+16
 	.byte	W01
 	.byte		        c_v+24
@@ -123,17 +123,17 @@ se_w226_1:
 
 @********************** Track  2 **********************@
 
-se_w226_2:
-	.byte	KEYSH , se_w226_key+0
+se_m_baton_pass_2:
+	.byte	KEYSH , se_m_baton_pass_key+0
 	.byte		VOICE , 57
-	.byte		VOL   , 59*se_w226_mvl/mxv
+	.byte		VOL   , 59*se_m_baton_pass_mvl/mxv
 	.byte		N06   , Gs4 , v052
 	.byte	W01
-	.byte		VOL   , 72*se_w226_mvl/mxv
+	.byte		VOL   , 72*se_m_baton_pass_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w226_mvl/mxv
+	.byte		        90*se_m_baton_pass_mvl/mxv
 	.byte	W01
-	.byte		        100*se_w226_mvl/mxv
+	.byte		        100*se_m_baton_pass_mvl/mxv
 	.byte	W03
 	.byte	W02
 	.byte		N04   , Gs4 , v024
@@ -155,15 +155,15 @@ se_w226_2:
 @******************************************************@
 	.align	2
 
-se_w226:
+se_m_baton_pass:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w226_pri	@ Priority
-	.byte	se_w226_rev	@ Reverb.
+	.byte	se_m_baton_pass_pri	@ Priority
+	.byte	se_m_baton_pass_rev	@ Reverb.
 
-	.word	se_w226_grp
+	.word	se_m_baton_pass_grp
 
-	.word	se_w226_1
-	.word	se_w226_2
+	.word	se_m_baton_pass_1
+	.word	se_m_baton_pass_2
 
 	.end
diff --git a/sound/songs/se_m_belly_drum.s b/sound/songs/se_m_belly_drum.s
new file mode 100644
index 000000000..919c02b16
--- /dev/null
+++ b/sound/songs/se_m_belly_drum.s
@@ -0,0 +1,72 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_belly_drum_grp, voicegroup128
+	.equ	se_m_belly_drum_pri, 4
+	.equ	se_m_belly_drum_rev, reverb_set+50
+	.equ	se_m_belly_drum_mvl, 127
+	.equ	se_m_belly_drum_key, 0
+	.equ	se_m_belly_drum_tbs, 1
+	.equ	se_m_belly_drum_exg, 0
+	.equ	se_m_belly_drum_cmp, 1
+
+	.section .rodata
+	.global	se_m_belly_drum
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_belly_drum_1:
+	.byte	KEYSH , se_m_belly_drum_key+0
+	.byte	TEMPO , 150*se_m_belly_drum_tbs/2
+	.byte		VOICE , 6
+	.byte		BENDR , 12
+	.byte		VOL   , 115*se_m_belly_drum_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+0
+	.byte		N19   , An2 , v127
+	.byte	W01
+	.byte		BEND  , c_v-6
+	.byte	W01
+	.byte		        c_v-10
+	.byte	W01
+	.byte		        c_v-14
+	.byte	W01
+	.byte		        c_v-12
+	.byte	W02
+	.byte		        c_v-14
+	.byte	W01
+	.byte		        c_v-18
+	.byte	W01
+	.byte		VOL   , 108*se_m_belly_drum_mvl/mxv
+	.byte		BEND  , c_v-20
+	.byte	W01
+	.byte		        c_v-22
+	.byte	W01
+	.byte		VOL   , 94*se_m_belly_drum_mvl/mxv
+	.byte	W03
+	.byte		        78*se_m_belly_drum_mvl/mxv
+	.byte	W01
+	.byte		        62*se_m_belly_drum_mvl/mxv
+	.byte	W01
+	.byte		        40*se_m_belly_drum_mvl/mxv
+	.byte	W01
+	.byte		        27*se_m_belly_drum_mvl/mxv
+	.byte	W02
+	.byte		        12*se_m_belly_drum_mvl/mxv
+	.byte	W06
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_belly_drum:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_belly_drum_pri	@ Priority
+	.byte	se_m_belly_drum_rev	@ Reverb.
+
+	.word	se_m_belly_drum_grp
+
+	.word	se_m_belly_drum_1
+
+	.end
diff --git a/sound/songs/se_w044.s b/sound/songs/se_m_bite.s
index ad706d93f..3c51a8f2f 100644
--- a/sound/songs/se_w044.s
+++ b/sound/songs/se_m_bite.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w044_grp, voicegroup128
-	.equ	se_w044_pri, 4
-	.equ	se_w044_rev, reverb_set+50
-	.equ	se_w044_mvl, 127
-	.equ	se_w044_key, 0
-	.equ	se_w044_tbs, 1
-	.equ	se_w044_exg, 0
-	.equ	se_w044_cmp, 1
+	.equ	se_m_bite_grp, voicegroup128
+	.equ	se_m_bite_pri, 4
+	.equ	se_m_bite_rev, reverb_set+50
+	.equ	se_m_bite_mvl, 127
+	.equ	se_m_bite_key, 0
+	.equ	se_m_bite_tbs, 1
+	.equ	se_m_bite_exg, 0
+	.equ	se_m_bite_cmp, 1
 
 	.section .rodata
-	.global	se_w044
+	.global	se_m_bite
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w044_1:
-	.byte	KEYSH , se_w044_key+0
-	.byte	TEMPO , 220*se_w044_tbs/2
+se_m_bite_1:
+	.byte	KEYSH , se_m_bite_key+0
+	.byte	TEMPO , 220*se_m_bite_tbs/2
 	.byte		VOICE , 26
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+6
-	.byte		VOL   , 110*se_w044_mvl/mxv
+	.byte		VOL   , 110*se_m_bite_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N02   , Gn3 , v112
 	.byte	W02
@@ -70,10 +70,10 @@ se_w044_1:
 
 @********************** Track  2 **********************@
 
-se_w044_2:
-	.byte	KEYSH , se_w044_key+0
+se_m_bite_2:
+	.byte	KEYSH , se_m_bite_key+0
 	.byte		VOICE , 27
-	.byte		VOL   , 110*se_w044_mvl/mxv
+	.byte		VOL   , 110*se_m_bite_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte	W10
@@ -86,15 +86,15 @@ se_w044_2:
 @******************************************************@
 	.align	2
 
-se_w044:
+se_m_bite:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w044_pri	@ Priority
-	.byte	se_w044_rev	@ Reverb.
+	.byte	se_m_bite_pri	@ Priority
+	.byte	se_m_bite_rev	@ Reverb.
 
-	.word	se_w044_grp
+	.word	se_m_bite_grp
 
-	.word	se_w044_1
-	.word	se_w044_2
+	.word	se_m_bite_1
+	.word	se_m_bite_2
 
 	.end
diff --git a/sound/songs/se_w059.s b/sound/songs/se_m_blizzard.s
index 6b163ef7e..6bce3c987 100644
--- a/sound/songs/se_w059.s
+++ b/sound/songs/se_m_blizzard.s
@@ -1,49 +1,49 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w059_grp, voicegroup128
-	.equ	se_w059_pri, 4
-	.equ	se_w059_rev, reverb_set+50
-	.equ	se_w059_mvl, 127
-	.equ	se_w059_key, 0
-	.equ	se_w059_tbs, 1
-	.equ	se_w059_exg, 0
-	.equ	se_w059_cmp, 1
+	.equ	se_m_blizzard_grp, voicegroup128
+	.equ	se_m_blizzard_pri, 4
+	.equ	se_m_blizzard_rev, reverb_set+50
+	.equ	se_m_blizzard_mvl, 127
+	.equ	se_m_blizzard_key, 0
+	.equ	se_m_blizzard_tbs, 1
+	.equ	se_m_blizzard_exg, 0
+	.equ	se_m_blizzard_cmp, 1
 
 	.section .rodata
-	.global	se_w059
+	.global	se_m_blizzard
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w059_1:
-	.byte	KEYSH , se_w059_key+0
-	.byte	TEMPO , 150*se_w059_tbs/2
+se_m_blizzard_1:
+	.byte	KEYSH , se_m_blizzard_key+0
+	.byte	TEMPO , 150*se_m_blizzard_tbs/2
 	.byte		VOICE , 22
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 64*se_w059_mvl/mxv
+	.byte		VOL   , 64*se_m_blizzard_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N24   , Gn3 , v108
 	.byte	W03
-	.byte		VOL   , 79*se_w059_mvl/mxv
+	.byte		VOL   , 79*se_m_blizzard_mvl/mxv
 	.byte		BEND  , c_v+22
 	.byte	W02
 	.byte		        c_v+8
 	.byte	W01
-	.byte		VOL   , 84*se_w059_mvl/mxv
+	.byte		VOL   , 84*se_m_blizzard_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte	W03
-	.byte		VOL   , 91*se_w059_mvl/mxv
+	.byte		VOL   , 91*se_m_blizzard_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte	W03
-	.byte		VOL   , 100*se_w059_mvl/mxv
+	.byte		VOL   , 100*se_m_blizzard_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte	W03
-	.byte		VOL   , 110*se_w059_mvl/mxv
+	.byte		VOL   , 110*se_m_blizzard_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-12
 	.byte	W06
-se_w059_1_B1:
+se_m_blizzard_1_B1:
 	.byte		PAN   , c_v-17
 	.byte		BEND  , c_v+0
 	.byte		N48   , Gn3 , v108
@@ -84,20 +84,20 @@ se_w059_1_B1:
 	.byte		PAN   , c_v-11
 	.byte	W03
 	.byte	GOTO
-	 .word	se_w059_1_B1
+	 .word	se_m_blizzard_1_B1
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w059:
+se_m_blizzard:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w059_pri	@ Priority
-	.byte	se_w059_rev	@ Reverb.
+	.byte	se_m_blizzard_pri	@ Priority
+	.byte	se_m_blizzard_rev	@ Reverb.
 
-	.word	se_w059_grp
+	.word	se_m_blizzard_grp
 
-	.word	se_w059_1
+	.word	se_m_blizzard_1
 
 	.end
diff --git a/sound/songs/se_m_blizzard2.s b/sound/songs/se_m_blizzard2.s
new file mode 100644
index 000000000..8c1518e63
--- /dev/null
+++ b/sound/songs/se_m_blizzard2.s
@@ -0,0 +1,72 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_blizzard2_grp, voicegroup128
+	.equ	se_m_blizzard2_pri, 4
+	.equ	se_m_blizzard2_rev, reverb_set+50
+	.equ	se_m_blizzard2_mvl, 127
+	.equ	se_m_blizzard2_key, 0
+	.equ	se_m_blizzard2_tbs, 1
+	.equ	se_m_blizzard2_exg, 0
+	.equ	se_m_blizzard2_cmp, 1
+
+	.section .rodata
+	.global	se_m_blizzard2
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_blizzard2_1:
+	.byte	KEYSH , se_m_blizzard2_key+0
+	.byte	TEMPO , 150*se_m_blizzard2_tbs/2
+	.byte		VOICE , 22
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 110*se_m_blizzard2_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N24   , Gn3 , v108
+	.byte	W02
+	.byte		PAN   , c_v-19
+	.byte	W04
+	.byte		        c_v+0
+	.byte	W01
+	.byte		VOL   , 97*se_m_blizzard2_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+16
+	.byte	W01
+	.byte		VOL   , 84*se_m_blizzard2_mvl/mxv
+	.byte	W03
+	.byte		        76*se_m_blizzard2_mvl/mxv
+	.byte		PAN   , c_v+2
+	.byte	W02
+	.byte		VOL   , 55*se_m_blizzard2_mvl/mxv
+	.byte		PAN   , c_v-8
+	.byte	W02
+	.byte		VOL   , 39*se_m_blizzard2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 25*se_m_blizzard2_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+8
+	.byte	W01
+	.byte		VOL   , 13*se_m_blizzard2_mvl/mxv
+	.byte	W03
+	.byte		        7*se_m_blizzard2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W24
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_blizzard2:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_blizzard2_pri	@ Priority
+	.byte	se_m_blizzard2_rev	@ Reverb.
+
+	.word	se_m_blizzard2_grp
+
+	.word	se_m_blizzard2_1
+
+	.end
diff --git a/sound/songs/se_w155.s b/sound/songs/se_m_bonemerang.s
index 29508b608..11f035347 100644
--- a/sound/songs/se_w155.s
+++ b/sound/songs/se_m_bonemerang.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w155_grp, voicegroup128
-	.equ	se_w155_pri, 4
-	.equ	se_w155_rev, reverb_set+50
-	.equ	se_w155_mvl, 127
-	.equ	se_w155_key, 0
-	.equ	se_w155_tbs, 1
-	.equ	se_w155_exg, 0
-	.equ	se_w155_cmp, 1
+	.equ	se_m_bonemerang_grp, voicegroup128
+	.equ	se_m_bonemerang_pri, 4
+	.equ	se_m_bonemerang_rev, reverb_set+50
+	.equ	se_m_bonemerang_mvl, 127
+	.equ	se_m_bonemerang_key, 0
+	.equ	se_m_bonemerang_tbs, 1
+	.equ	se_m_bonemerang_exg, 0
+	.equ	se_m_bonemerang_cmp, 1
 
 	.section .rodata
-	.global	se_w155
+	.global	se_m_bonemerang
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w155_1:
-	.byte	KEYSH , se_w155_key+0
-	.byte	TEMPO , 150*se_w155_tbs/2
+se_m_bonemerang_1:
+	.byte	KEYSH , se_m_bonemerang_key+0
+	.byte	TEMPO , 150*se_m_bonemerang_tbs/2
 	.byte		VOICE , 24
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w155_mvl/mxv
+	.byte		VOL   , 110*se_m_bonemerang_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N01   , Cn5 , v127
 	.byte	W01
@@ -44,14 +44,14 @@ se_w155_1:
 @******************************************************@
 	.align	2
 
-se_w155:
+se_m_bonemerang:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w155_pri	@ Priority
-	.byte	se_w155_rev	@ Reverb.
+	.byte	se_m_bonemerang_pri	@ Priority
+	.byte	se_m_bonemerang_rev	@ Reverb.
 
-	.word	se_w155_grp
+	.word	se_m_bonemerang_grp
 
-	.word	se_w155_1
+	.word	se_m_bonemerang_1
 
 	.end
diff --git a/sound/songs/se_w280.s b/sound/songs/se_m_brick_break.s
index 19d383176..08058089f 100644
--- a/sound/songs/se_w280.s
+++ b/sound/songs/se_m_brick_break.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w280_grp, voicegroup128
-	.equ	se_w280_pri, 4
-	.equ	se_w280_rev, reverb_set+50
-	.equ	se_w280_mvl, 127
-	.equ	se_w280_key, 0
-	.equ	se_w280_tbs, 1
-	.equ	se_w280_exg, 0
-	.equ	se_w280_cmp, 1
+	.equ	se_m_brick_break_grp, voicegroup128
+	.equ	se_m_brick_break_pri, 4
+	.equ	se_m_brick_break_rev, reverb_set+50
+	.equ	se_m_brick_break_mvl, 127
+	.equ	se_m_brick_break_key, 0
+	.equ	se_m_brick_break_tbs, 1
+	.equ	se_m_brick_break_exg, 0
+	.equ	se_m_brick_break_cmp, 1
 
 	.section .rodata
-	.global	se_w280
+	.global	se_m_brick_break
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w280_1:
-	.byte	KEYSH , se_w280_key+0
-	.byte	TEMPO , 150*se_w280_tbs/2
+se_m_brick_break_1:
+	.byte	KEYSH , se_m_brick_break_key+0
+	.byte	TEMPO , 150*se_m_brick_break_tbs/2
 	.byte		VOICE , 41
-	.byte		VOL   , 110*se_w280_mvl/mxv
+	.byte		VOL   , 110*se_m_brick_break_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , Cn4 , v127
 	.byte	W01
@@ -56,10 +56,10 @@ se_w280_1:
 
 @********************** Track  2 **********************@
 
-se_w280_2:
-	.byte	KEYSH , se_w280_key+0
+se_m_brick_break_2:
+	.byte	KEYSH , se_m_brick_break_key+0
 	.byte		VOICE , 4
-	.byte		VOL   , 110*se_w280_mvl/mxv
+	.byte		VOL   , 110*se_m_brick_break_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , Cn3 , v064
 	.byte	W01
@@ -86,15 +86,15 @@ se_w280_2:
 @******************************************************@
 	.align	2
 
-se_w280:
+se_m_brick_break:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w280_pri	@ Priority
-	.byte	se_w280_rev	@ Reverb.
+	.byte	se_m_brick_break_pri	@ Priority
+	.byte	se_m_brick_break_rev	@ Reverb.
 
-	.word	se_w280_grp
+	.word	se_m_brick_break_grp
 
-	.word	se_w280_1
-	.word	se_w280_2
+	.word	se_m_brick_break_1
+	.word	se_m_brick_break_2
 
 	.end
diff --git a/sound/songs/se_w145.s b/sound/songs/se_m_bubble.s
index bb7d87a2d..ee31a176b 100644
--- a/sound/songs/se_w145.s
+++ b/sound/songs/se_m_bubble.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w145_grp, voicegroup128
-	.equ	se_w145_pri, 4
-	.equ	se_w145_rev, reverb_set+50
-	.equ	se_w145_mvl, 127
-	.equ	se_w145_key, 0
-	.equ	se_w145_tbs, 1
-	.equ	se_w145_exg, 0
-	.equ	se_w145_cmp, 1
+	.equ	se_m_bubble_grp, voicegroup128
+	.equ	se_m_bubble_pri, 4
+	.equ	se_m_bubble_rev, reverb_set+50
+	.equ	se_m_bubble_mvl, 127
+	.equ	se_m_bubble_key, 0
+	.equ	se_m_bubble_tbs, 1
+	.equ	se_m_bubble_exg, 0
+	.equ	se_m_bubble_cmp, 1
 
 	.section .rodata
-	.global	se_w145
+	.global	se_m_bubble
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w145_1:
-	.byte	KEYSH , se_w145_key+0
-	.byte	TEMPO , 220*se_w145_tbs/2
+se_m_bubble_1:
+	.byte	KEYSH , se_m_bubble_key+0
+	.byte	TEMPO , 220*se_m_bubble_tbs/2
 	.byte		VOICE , 23
-	.byte		VOL   , 95*se_w145_mvl/mxv
+	.byte		VOL   , 95*se_m_bubble_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -44,14 +44,14 @@ se_w145_1:
 @******************************************************@
 	.align	2
 
-se_w145:
+se_m_bubble:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w145_pri	@ Priority
-	.byte	se_w145_rev	@ Reverb.
+	.byte	se_m_bubble_pri	@ Priority
+	.byte	se_m_bubble_rev	@ Reverb.
 
-	.word	se_w145_grp
+	.word	se_m_bubble_grp
 
-	.word	se_w145_1
+	.word	se_m_bubble_1
 
 	.end
diff --git a/sound/songs/se_m_bubble2.s b/sound/songs/se_m_bubble2.s
new file mode 100644
index 000000000..97e7cbbf8
--- /dev/null
+++ b/sound/songs/se_m_bubble2.s
@@ -0,0 +1,60 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_bubble2_grp, voicegroup128
+	.equ	se_m_bubble2_pri, 4
+	.equ	se_m_bubble2_rev, reverb_set+50
+	.equ	se_m_bubble2_mvl, 127
+	.equ	se_m_bubble2_key, 0
+	.equ	se_m_bubble2_tbs, 1
+	.equ	se_m_bubble2_exg, 0
+	.equ	se_m_bubble2_cmp, 1
+
+	.section .rodata
+	.global	se_m_bubble2
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_bubble2_1:
+	.byte	KEYSH , se_m_bubble2_key+0
+	.byte	TEMPO , 220*se_m_bubble2_tbs/2
+	.byte		VOICE , 24
+	.byte		VOL   , 110*se_m_bubble2_mvl/mxv
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+0
+	.byte	W03
+	.byte		N09   , Gn4 , v127
+	.byte	W02
+	.byte		BEND  , c_v+31
+	.byte	W02
+	.byte		        c_v-34
+	.byte	W17
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_bubble2_2:
+	.byte	KEYSH , se_m_bubble2_key+0
+	.byte		VOICE , 4
+	.byte		VOL   , 110*se_m_bubble2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		N01   , Cn4 , v044
+	.byte	W24
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_bubble2:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_bubble2_pri	@ Priority
+	.byte	se_m_bubble2_rev	@ Reverb.
+
+	.word	se_m_bubble2_grp
+
+	.word	se_m_bubble2_1
+	.word	se_m_bubble2_2
+
+	.end
diff --git a/sound/songs/se_w145c.s b/sound/songs/se_m_bubble3.s
index 61bf7fa0d..c14badb5a 100644
--- a/sound/songs/se_w145c.s
+++ b/sound/songs/se_m_bubble3.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w145c_grp, voicegroup128
-	.equ	se_w145c_pri, 4
-	.equ	se_w145c_rev, reverb_set+50
-	.equ	se_w145c_mvl, 127
-	.equ	se_w145c_key, 0
-	.equ	se_w145c_tbs, 1
-	.equ	se_w145c_exg, 0
-	.equ	se_w145c_cmp, 1
+	.equ	se_m_bubble3_grp, voicegroup128
+	.equ	se_m_bubble3_pri, 4
+	.equ	se_m_bubble3_rev, reverb_set+50
+	.equ	se_m_bubble3_mvl, 127
+	.equ	se_m_bubble3_key, 0
+	.equ	se_m_bubble3_tbs, 1
+	.equ	se_m_bubble3_exg, 0
+	.equ	se_m_bubble3_cmp, 1
 
 	.section .rodata
-	.global	se_w145c
+	.global	se_m_bubble3
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w145c_1:
-	.byte	KEYSH , se_w145c_key+0
-	.byte	TEMPO , 220*se_w145c_tbs/2
+se_m_bubble3_1:
+	.byte	KEYSH , se_m_bubble3_key+0
+	.byte	TEMPO , 220*se_m_bubble3_tbs/2
 	.byte		VOICE , 23
-	.byte		VOL   , 95*se_w145c_mvl/mxv
+	.byte		VOL   , 95*se_m_bubble3_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -49,14 +49,14 @@ se_w145c_1:
 @******************************************************@
 	.align	2
 
-se_w145c:
+se_m_bubble3:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w145c_pri	@ Priority
-	.byte	se_w145c_rev	@ Reverb.
+	.byte	se_m_bubble3_pri	@ Priority
+	.byte	se_m_bubble3_rev	@ Reverb.
 
-	.word	se_w145c_grp
+	.word	se_m_bubble3_grp
 
-	.word	se_w145c_1
+	.word	se_m_bubble3_1
 
 	.end
diff --git a/sound/songs/se_w062.s b/sound/songs/se_m_bubble_beam.s
index 58de81e57..621882b03 100644
--- a/sound/songs/se_w062.s
+++ b/sound/songs/se_m_bubble_beam.s
@@ -1,56 +1,56 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w062_grp, voicegroup128
-	.equ	se_w062_pri, 4
-	.equ	se_w062_rev, reverb_set+50
-	.equ	se_w062_mvl, 127
-	.equ	se_w062_key, 0
-	.equ	se_w062_tbs, 1
-	.equ	se_w062_exg, 0
-	.equ	se_w062_cmp, 1
+	.equ	se_m_bubble_beam_grp, voicegroup128
+	.equ	se_m_bubble_beam_pri, 4
+	.equ	se_m_bubble_beam_rev, reverb_set+50
+	.equ	se_m_bubble_beam_mvl, 127
+	.equ	se_m_bubble_beam_key, 0
+	.equ	se_m_bubble_beam_tbs, 1
+	.equ	se_m_bubble_beam_exg, 0
+	.equ	se_m_bubble_beam_cmp, 1
 
 	.section .rodata
-	.global	se_w062
+	.global	se_m_bubble_beam
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w062_1:
-	.byte	KEYSH , se_w062_key+0
-	.byte	TEMPO , 150*se_w062_tbs/2
+se_m_bubble_beam_1:
+	.byte	KEYSH , se_m_bubble_beam_key+0
+	.byte	TEMPO , 150*se_m_bubble_beam_tbs/2
 	.byte		VOICE , 9
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 24*se_w062_mvl/mxv
+	.byte		VOL   , 24*se_m_bubble_beam_mvl/mxv
 	.byte		BEND  , c_v-17
 	.byte		N78   , Bn4 , v080
 	.byte	W01
-	.byte		VOL   , 32*se_w062_mvl/mxv
+	.byte		VOL   , 32*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte	W01
-	.byte		VOL   , 38*se_w062_mvl/mxv
+	.byte		VOL   , 38*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte	W01
-	.byte		VOL   , 48*se_w062_mvl/mxv
+	.byte		VOL   , 48*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte	W01
-	.byte		VOL   , 66*se_w062_mvl/mxv
+	.byte		VOL   , 66*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v-13
 	.byte	W02
-	.byte		VOL   , 78*se_w062_mvl/mxv
+	.byte		VOL   , 78*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte	W01
-	.byte		VOL   , 94*se_w062_mvl/mxv
+	.byte		VOL   , 94*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte	W01
-	.byte		VOL   , 110*se_w062_mvl/mxv
+	.byte		VOL   , 110*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+6
 	.byte	W01
 	.byte		        c_v-7
 	.byte	W02
-se_w062_1_000:
+se_m_bubble_beam_1_000:
 	.byte		PAN   , c_v+9
 	.byte	W01
 	.byte		        c_v-13
@@ -62,7 +62,7 @@ se_w062_1_000:
 	.byte		        c_v+0
 	.byte	W02
 	.byte	PEND
-se_w062_1_001:
+se_m_bubble_beam_1_001:
 	.byte		PAN   , c_v+6
 	.byte	W01
 	.byte		        c_v-7
@@ -125,34 +125,34 @@ se_w062_1_001:
 	.byte		        c_v-7
 	.byte	W02
 	.byte	PATT
-	 .word	se_w062_1_000
+	 .word	se_m_bubble_beam_1_000
 	.byte	PATT
-	 .word	se_w062_1_001
+	 .word	se_m_bubble_beam_1_001
 	.byte		PAN   , c_v-6
 	.byte	W01
 	.byte		        c_v+0
 	.byte	W01
 	.byte		        c_v+6
 	.byte	W01
-	.byte		VOL   , 103*se_w062_mvl/mxv
+	.byte		VOL   , 103*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte	W01
-	.byte		VOL   , 91*se_w062_mvl/mxv
+	.byte		VOL   , 91*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte	W02
-	.byte		VOL   , 72*se_w062_mvl/mxv
+	.byte		VOL   , 72*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v-13
 	.byte	W01
-	.byte		VOL   , 58*se_w062_mvl/mxv
+	.byte		VOL   , 58*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte	W01
-	.byte		VOL   , 38*se_w062_mvl/mxv
+	.byte		VOL   , 38*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte	W01
-	.byte		VOL   , 15*se_w062_mvl/mxv
+	.byte		VOL   , 15*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 7*se_w062_mvl/mxv
+	.byte		VOL   , 7*se_m_bubble_beam_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte	W02
 	.byte	FINE
@@ -160,14 +160,14 @@ se_w062_1_001:
 @******************************************************@
 	.align	2
 
-se_w062:
+se_m_bubble_beam:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w062_pri	@ Priority
-	.byte	se_w062_rev	@ Reverb.
+	.byte	se_m_bubble_beam_pri	@ Priority
+	.byte	se_m_bubble_beam_rev	@ Reverb.
 
-	.word	se_w062_grp
+	.word	se_m_bubble_beam_grp
 
-	.word	se_w062_1
+	.word	se_m_bubble_beam_1
 
 	.end
diff --git a/sound/songs/se_m_bubble_beam2.s b/sound/songs/se_m_bubble_beam2.s
new file mode 100644
index 000000000..0e8cbf5e4
--- /dev/null
+++ b/sound/songs/se_m_bubble_beam2.s
@@ -0,0 +1,131 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_bubble_beam2_grp, voicegroup128
+	.equ	se_m_bubble_beam2_pri, 4
+	.equ	se_m_bubble_beam2_rev, reverb_set+50
+	.equ	se_m_bubble_beam2_mvl, 127
+	.equ	se_m_bubble_beam2_key, 0
+	.equ	se_m_bubble_beam2_tbs, 1
+	.equ	se_m_bubble_beam2_exg, 0
+	.equ	se_m_bubble_beam2_cmp, 1
+
+	.section .rodata
+	.global	se_m_bubble_beam2
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_bubble_beam2_1:
+	.byte	KEYSH , se_m_bubble_beam2_key+0
+	.byte	TEMPO , 150*se_m_bubble_beam2_tbs/2
+	.byte		VOICE , 9
+	.byte		BENDR , 2
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 26*se_m_bubble_beam2_mvl/mxv
+	.byte		BEND  , c_v-23
+	.byte		N09   , Dn5 , v127
+	.byte	W01
+	.byte		VOL   , 34*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v-20
+	.byte	W01
+	.byte		VOL   , 42*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-7
+	.byte		BEND  , c_v-16
+	.byte	W01
+	.byte		VOL   , 52*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+9
+	.byte	W01
+	.byte		VOL   , 72*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-13
+	.byte		BEND  , c_v-18
+	.byte	W02
+	.byte		VOL   , 85*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v-21
+	.byte	W01
+	.byte		VOL   , 102*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-6
+	.byte		BEND  , c_v-23
+	.byte	W01
+	.byte		VOL   , 120*se_m_bubble_beam2_mvl/mxv
+	.byte		BEND  , c_v-24
+	.byte	W02
+	.byte		VOL   , 26*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-23
+	.byte		N09   , Dn5 , v100
+	.byte	W02
+	.byte		VOL   , 34*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v-20
+	.byte	W01
+	.byte		VOL   , 42*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-7
+	.byte		BEND  , c_v-16
+	.byte	W01
+	.byte		VOL   , 52*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+9
+	.byte	W01
+	.byte		VOL   , 72*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-13
+	.byte		BEND  , c_v-18
+	.byte	W01
+	.byte		VOL   , 85*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v-21
+	.byte	W02
+	.byte		VOL   , 102*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-6
+	.byte		BEND  , c_v-23
+	.byte	W01
+	.byte		VOL   , 120*se_m_bubble_beam2_mvl/mxv
+	.byte		BEND  , c_v-24
+	.byte	W02
+	.byte		VOL   , 26*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-23
+	.byte		N09   , Dn5 , v080
+	.byte	W01
+	.byte		VOL   , 34*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v-20
+	.byte	W02
+	.byte		VOL   , 42*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-7
+	.byte		BEND  , c_v-16
+	.byte	W01
+	.byte		VOL   , 52*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+9
+	.byte	W01
+	.byte		VOL   , 72*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-13
+	.byte		BEND  , c_v-18
+	.byte	W01
+	.byte		VOL   , 85*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v-21
+	.byte	W01
+	.byte		VOL   , 102*se_m_bubble_beam2_mvl/mxv
+	.byte		PAN   , c_v-6
+	.byte		BEND  , c_v-23
+	.byte	W02
+	.byte		VOL   , 120*se_m_bubble_beam2_mvl/mxv
+	.byte		BEND  , c_v-24
+	.byte	W06
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_bubble_beam2:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_bubble_beam2_pri	@ Priority
+	.byte	se_m_bubble_beam2_rev	@ Reverb.
+
+	.word	se_m_bubble_beam2_grp
+
+	.word	se_m_bubble_beam2_1
+
+	.end
diff --git a/sound/songs/se_w268.s b/sound/songs/se_m_charge.s
index c2c9ee9f7..47d70a4bf 100644
--- a/sound/songs/se_w268.s
+++ b/sound/songs/se_m_charge.s
@@ -1,56 +1,56 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w268_grp, voicegroup128
-	.equ	se_w268_pri, 4
-	.equ	se_w268_rev, reverb_set+50
-	.equ	se_w268_mvl, 127
-	.equ	se_w268_key, 0
-	.equ	se_w268_tbs, 1
-	.equ	se_w268_exg, 0
-	.equ	se_w268_cmp, 1
+	.equ	se_m_charge_grp, voicegroup128
+	.equ	se_m_charge_pri, 4
+	.equ	se_m_charge_rev, reverb_set+50
+	.equ	se_m_charge_mvl, 127
+	.equ	se_m_charge_key, 0
+	.equ	se_m_charge_tbs, 1
+	.equ	se_m_charge_exg, 0
+	.equ	se_m_charge_cmp, 1
 
 	.section .rodata
-	.global	se_w268
+	.global	se_m_charge
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w268_1:
-	.byte	KEYSH , se_w268_key+0
-	.byte	TEMPO , 150*se_w268_tbs/2
+se_m_charge_1:
+	.byte	KEYSH , se_m_charge_key+0
+	.byte	TEMPO , 150*se_m_charge_tbs/2
 	.byte		VOICE , 18
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 34*se_w268_mvl/mxv
+	.byte		VOL   , 34*se_m_charge_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N66   , Cn5 , v127
 	.byte	W01
 	.byte		PAN   , c_v-2
 	.byte	W01
-	.byte		VOL   , 43*se_w268_mvl/mxv
+	.byte		VOL   , 43*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+2
 	.byte		BEND  , c_v-2
 	.byte	W01
-	.byte		VOL   , 58*se_w268_mvl/mxv
+	.byte		VOL   , 58*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W02
 	.byte		        c_v-2
 	.byte	W01
-	.byte		VOL   , 70*se_w268_mvl/mxv
+	.byte		VOL   , 70*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v-4
 	.byte	W01
 	.byte		PAN   , c_v-2
 	.byte	W01
-	.byte		VOL   , 76*se_w268_mvl/mxv
+	.byte		VOL   , 76*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+2
 	.byte		BEND  , c_v-6
 	.byte	W02
-	.byte		VOL   , 90*se_w268_mvl/mxv
+	.byte		VOL   , 90*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte	W01
 	.byte		        c_v+2
@@ -118,14 +118,14 @@ se_w268_1:
 	.byte	W01
 	.byte		PAN   , c_v+2
 	.byte	W01
-	.byte		VOL   , 84*se_w268_mvl/mxv
+	.byte		VOL   , 84*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+0
 	.byte	W02
 	.byte		        c_v-2
 	.byte	W01
-	.byte		VOL   , 78*se_w268_mvl/mxv
+	.byte		VOL   , 78*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+2
@@ -133,39 +133,39 @@ se_w268_1:
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 70*se_w268_mvl/mxv
+	.byte		VOL   , 70*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W02
 	.byte		        c_v-4
 	.byte	W01
-	.byte		VOL   , 55*se_w268_mvl/mxv
+	.byte		VOL   , 55*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte		BEND  , c_v-29
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 46*se_w268_mvl/mxv
+	.byte		VOL   , 46*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+2
 	.byte	W01
 	.byte		        c_v+4
 	.byte		BEND  , c_v-31
 	.byte	W02
-	.byte		VOL   , 36*se_w268_mvl/mxv
+	.byte		VOL   , 36*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+2
 	.byte	W01
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 24*se_w268_mvl/mxv
+	.byte		VOL   , 24*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-36
 	.byte	W01
 	.byte		PAN   , c_v-2
 	.byte	W01
-	.byte		VOL   , 13*se_w268_mvl/mxv
+	.byte		VOL   , 13*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-42
 	.byte	W02
-	.byte		VOL   , 5*se_w268_mvl/mxv
+	.byte		VOL   , 5*se_m_charge_mvl/mxv
 	.byte		PAN   , c_v+2
 	.byte	W06
 	.byte	FINE
@@ -173,14 +173,14 @@ se_w268_1:
 @******************************************************@
 	.align	2
 
-se_w268:
+se_m_charge:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w268_pri	@ Priority
-	.byte	se_w268_rev	@ Reverb.
+	.byte	se_m_charge_pri	@ Priority
+	.byte	se_m_charge_rev	@ Reverb.
 
-	.word	se_w268_grp
+	.word	se_m_charge_grp
 
-	.word	se_w268_1
+	.word	se_m_charge_1
 
 	.end
diff --git a/sound/songs/se_w204.s b/sound/songs/se_m_charm.s
index 1e66392ac..ef10cb3e3 100644
--- a/sound/songs/se_w204.s
+++ b/sound/songs/se_m_charm.s
@@ -1,52 +1,52 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w204_grp, voicegroup128
-	.equ	se_w204_pri, 4
-	.equ	se_w204_rev, reverb_set+50
-	.equ	se_w204_mvl, 127
-	.equ	se_w204_key, 0
-	.equ	se_w204_tbs, 1
-	.equ	se_w204_exg, 0
-	.equ	se_w204_cmp, 1
+	.equ	se_m_charm_grp, voicegroup128
+	.equ	se_m_charm_pri, 4
+	.equ	se_m_charm_rev, reverb_set+50
+	.equ	se_m_charm_mvl, 127
+	.equ	se_m_charm_key, 0
+	.equ	se_m_charm_tbs, 1
+	.equ	se_m_charm_exg, 0
+	.equ	se_m_charm_cmp, 1
 
 	.section .rodata
-	.global	se_w204
+	.global	se_m_charm
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w204_1:
-	.byte	KEYSH , se_w204_key+0
-	.byte	TEMPO , 150*se_w204_tbs/2
+se_m_charm_1:
+	.byte	KEYSH , se_m_charm_key+0
+	.byte	TEMPO , 150*se_m_charm_tbs/2
 	.byte		VOICE , 37
 	.byte		BENDR , 24
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 25*se_w204_mvl/mxv
+	.byte		VOL   , 25*se_m_charm_mvl/mxv
 	.byte		BEND  , c_v+11
 	.byte		N02   , Fn4 , v127
 	.byte	W01
-	.byte		VOL   , 42*se_w204_mvl/mxv
+	.byte		VOL   , 42*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+5
 	.byte	W01
-	.byte		VOL   , 62*se_w204_mvl/mxv
+	.byte		VOL   , 62*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+0
 	.byte		N15   
 	.byte	W01
-	.byte		VOL   , 77*se_w204_mvl/mxv
+	.byte		VOL   , 77*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+5
 	.byte	W01
-	.byte		VOL   , 84*se_w204_mvl/mxv
+	.byte		VOL   , 84*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+12
 	.byte	W02
-	.byte		VOL   , 96*se_w204_mvl/mxv
+	.byte		VOL   , 96*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+20
 	.byte	W01
-	.byte		VOL   , 100*se_w204_mvl/mxv
+	.byte		VOL   , 100*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+25
 	.byte	W01
@@ -59,22 +59,22 @@ se_w204_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+40
 	.byte	W02
-	.byte		VOL   , 94*se_w204_mvl/mxv
+	.byte		VOL   , 94*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte	W01
-	.byte		VOL   , 85*se_w204_mvl/mxv
+	.byte		VOL   , 85*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+37
 	.byte	W01
-	.byte		VOL   , 66*se_w204_mvl/mxv
+	.byte		VOL   , 66*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+36
 	.byte	W01
-	.byte		VOL   , 49*se_w204_mvl/mxv
+	.byte		VOL   , 49*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+34
 	.byte	W01
-	.byte		VOL   , 32*se_w204_mvl/mxv
+	.byte		VOL   , 32*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+32
 	.byte	W02
@@ -83,14 +83,14 @@ se_w204_1:
 @******************************************************@
 	.align	2
 
-se_w204:
+se_m_charm:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w204_pri	@ Priority
-	.byte	se_w204_rev	@ Reverb.
+	.byte	se_m_charm_pri	@ Priority
+	.byte	se_m_charm_rev	@ Reverb.
 
-	.word	se_w204_grp
+	.word	se_m_charm_grp
 
-	.word	se_w204_1
+	.word	se_m_charm_1
 
 	.end
diff --git a/sound/songs/se_w109.s b/sound/songs/se_m_confuse_ray.s
index 1f43988eb..12aea8ab8 100644
--- a/sound/songs/se_w109.s
+++ b/sound/songs/se_m_confuse_ray.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w109_grp, voicegroup128
-	.equ	se_w109_pri, 4
-	.equ	se_w109_rev, reverb_set+50
-	.equ	se_w109_mvl, 127
-	.equ	se_w109_key, 0
-	.equ	se_w109_tbs, 1
-	.equ	se_w109_exg, 0
-	.equ	se_w109_cmp, 1
+	.equ	se_m_confuse_ray_grp, voicegroup128
+	.equ	se_m_confuse_ray_pri, 4
+	.equ	se_m_confuse_ray_rev, reverb_set+50
+	.equ	se_m_confuse_ray_mvl, 127
+	.equ	se_m_confuse_ray_key, 0
+	.equ	se_m_confuse_ray_tbs, 1
+	.equ	se_m_confuse_ray_exg, 0
+	.equ	se_m_confuse_ray_cmp, 1
 
 	.section .rodata
-	.global	se_w109
+	.global	se_m_confuse_ray
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w109_1:
-	.byte	KEYSH , se_w109_key+0
-	.byte	TEMPO , 220*se_w109_tbs/2
+se_m_confuse_ray_1:
+	.byte	KEYSH , se_m_confuse_ray_key+0
+	.byte	TEMPO , 220*se_m_confuse_ray_tbs/2
 	.byte		VOICE , 52
-	.byte		VOL   , 127*se_w109_mvl/mxv
+	.byte		VOL   , 127*se_m_confuse_ray_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -104,14 +104,14 @@ se_w109_1:
 @******************************************************@
 	.align	2
 
-se_w109:
+se_m_confuse_ray:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w109_pri	@ Priority
-	.byte	se_w109_rev	@ Reverb.
+	.byte	se_m_confuse_ray_pri	@ Priority
+	.byte	se_m_confuse_ray_rev	@ Reverb.
 
-	.word	se_w109_grp
+	.word	se_m_confuse_ray_grp
 
-	.word	se_w109_1
+	.word	se_m_confuse_ray_1
 
 	.end
diff --git a/sound/songs/se_w322.s b/sound/songs/se_m_cosmic_power.s
index 2f48ff968..76812478b 100644
--- a/sound/songs/se_w322.s
+++ b/sound/songs/se_m_cosmic_power.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w322_grp, voicegroup128
-	.equ	se_w322_pri, 4
-	.equ	se_w322_rev, reverb_set+50
-	.equ	se_w322_mvl, 127
-	.equ	se_w322_key, 0
-	.equ	se_w322_tbs, 1
-	.equ	se_w322_exg, 0
-	.equ	se_w322_cmp, 1
+	.equ	se_m_cosmic_power_grp, voicegroup128
+	.equ	se_m_cosmic_power_pri, 4
+	.equ	se_m_cosmic_power_rev, reverb_set+50
+	.equ	se_m_cosmic_power_mvl, 127
+	.equ	se_m_cosmic_power_key, 0
+	.equ	se_m_cosmic_power_tbs, 1
+	.equ	se_m_cosmic_power_exg, 0
+	.equ	se_m_cosmic_power_cmp, 1
 
 	.section .rodata
-	.global	se_w322
+	.global	se_m_cosmic_power
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w322_1:
-	.byte	KEYSH , se_w322_key+0
-	.byte	TEMPO , 150*se_w322_tbs/2
+se_m_cosmic_power_1:
+	.byte	KEYSH , se_m_cosmic_power_key+0
+	.byte	TEMPO , 150*se_m_cosmic_power_tbs/2
 	.byte		VOICE , 46
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w322_mvl/mxv
+	.byte		VOL   , 110*se_m_cosmic_power_mvl/mxv
 	.byte		BEND  , c_v-4
 	.byte		N09   , As5 , v112
 	.byte	W06
@@ -117,12 +117,12 @@ se_w322_1:
 
 @********************** Track  2 **********************@
 
-se_w322_2:
-	.byte	KEYSH , se_w322_key+0
+se_m_cosmic_power_2:
+	.byte	KEYSH , se_m_cosmic_power_key+0
 	.byte		VOICE , 53
 	.byte		XCMD  , xIECV , 9
 	.byte		        xIECL , 8
-	.byte		VOL   , 43*se_w322_mvl/mxv
+	.byte		VOL   , 43*se_m_cosmic_power_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte	W04
 	.byte		N08   , Fn5 , v112
@@ -194,15 +194,15 @@ se_w322_2:
 @******************************************************@
 	.align	2
 
-se_w322:
+se_m_cosmic_power:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w322_pri	@ Priority
-	.byte	se_w322_rev	@ Reverb.
+	.byte	se_m_cosmic_power_pri	@ Priority
+	.byte	se_m_cosmic_power_rev	@ Reverb.
 
-	.word	se_w322_grp
+	.word	se_m_cosmic_power_grp
 
-	.word	se_w322_1
-	.word	se_w322_2
+	.word	se_m_cosmic_power_1
+	.word	se_m_cosmic_power_2
 
 	.end
diff --git a/sound/songs/se_w152.s b/sound/songs/se_m_crabhammer.s
index dc03fe76c..6333150dc 100644
--- a/sound/songs/se_w152.s
+++ b/sound/songs/se_m_crabhammer.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w152_grp, voicegroup128
-	.equ	se_w152_pri, 4
-	.equ	se_w152_rev, reverb_set+50
-	.equ	se_w152_mvl, 127
-	.equ	se_w152_key, 0
-	.equ	se_w152_tbs, 1
-	.equ	se_w152_exg, 0
-	.equ	se_w152_cmp, 1
+	.equ	se_m_crabhammer_grp, voicegroup128
+	.equ	se_m_crabhammer_pri, 4
+	.equ	se_m_crabhammer_rev, reverb_set+50
+	.equ	se_m_crabhammer_mvl, 127
+	.equ	se_m_crabhammer_key, 0
+	.equ	se_m_crabhammer_tbs, 1
+	.equ	se_m_crabhammer_exg, 0
+	.equ	se_m_crabhammer_cmp, 1
 
 	.section .rodata
-	.global	se_w152
+	.global	se_m_crabhammer
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w152_1:
-	.byte	KEYSH , se_w152_key+0
-	.byte	TEMPO , 150*se_w152_tbs/2
+se_m_crabhammer_1:
+	.byte	KEYSH , se_m_crabhammer_key+0
+	.byte	TEMPO , 150*se_m_crabhammer_tbs/2
 	.byte		VOICE , 23
-	.byte		VOL   , 100*se_w152_mvl/mxv
+	.byte		VOL   , 100*se_m_crabhammer_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+2
@@ -45,14 +45,14 @@ se_w152_1:
 @******************************************************@
 	.align	2
 
-se_w152:
+se_m_crabhammer:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w152_pri	@ Priority
-	.byte	se_w152_rev	@ Reverb.
+	.byte	se_m_crabhammer_pri	@ Priority
+	.byte	se_m_crabhammer_rev	@ Reverb.
 
-	.word	se_w152_grp
+	.word	se_m_crabhammer_grp
 
-	.word	se_w152_1
+	.word	se_m_crabhammer_1
 
 	.end
diff --git a/sound/songs/se_w197.s b/sound/songs/se_m_detect.s
index 619b81b40..181fb4079 100644
--- a/sound/songs/se_w197.s
+++ b/sound/songs/se_m_detect.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w197_grp, voicegroup128
-	.equ	se_w197_pri, 4
-	.equ	se_w197_rev, reverb_set+50
-	.equ	se_w197_mvl, 127
-	.equ	se_w197_key, 0
-	.equ	se_w197_tbs, 1
-	.equ	se_w197_exg, 0
-	.equ	se_w197_cmp, 1
+	.equ	se_m_detect_grp, voicegroup128
+	.equ	se_m_detect_pri, 4
+	.equ	se_m_detect_rev, reverb_set+50
+	.equ	se_m_detect_mvl, 127
+	.equ	se_m_detect_key, 0
+	.equ	se_m_detect_tbs, 1
+	.equ	se_m_detect_exg, 0
+	.equ	se_m_detect_cmp, 1
 
 	.section .rodata
-	.global	se_w197
+	.global	se_m_detect
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w197_1:
-	.byte	KEYSH , se_w197_key+0
-	.byte	TEMPO , 220*se_w197_tbs/2
+se_m_detect_1:
+	.byte	KEYSH , se_m_detect_key+0
+	.byte	TEMPO , 220*se_m_detect_tbs/2
 	.byte		VOICE , 54
-	.byte		VOL   , 100*se_w197_mvl/mxv
+	.byte		VOL   , 100*se_m_detect_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+1
@@ -82,14 +82,14 @@ se_w197_1:
 @******************************************************@
 	.align	2
 
-se_w197:
+se_m_detect:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w197_pri	@ Priority
-	.byte	se_w197_rev	@ Reverb.
+	.byte	se_m_detect_pri	@ Priority
+	.byte	se_m_detect_rev	@ Reverb.
 
-	.word	se_w197_grp
+	.word	se_m_detect_grp
 
-	.word	se_w197_1
+	.word	se_m_detect_1
 
 	.end
diff --git a/sound/songs/se_w091.s b/sound/songs/se_m_dig.s
index 953edf429..42fed8ab5 100644
--- a/sound/songs/se_w091.s
+++ b/sound/songs/se_m_dig.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w091_grp, voicegroup128
-	.equ	se_w091_pri, 4
-	.equ	se_w091_rev, reverb_set+50
-	.equ	se_w091_mvl, 127
-	.equ	se_w091_key, 0
-	.equ	se_w091_tbs, 1
-	.equ	se_w091_exg, 0
-	.equ	se_w091_cmp, 1
+	.equ	se_m_dig_grp, voicegroup128
+	.equ	se_m_dig_pri, 4
+	.equ	se_m_dig_rev, reverb_set+50
+	.equ	se_m_dig_mvl, 127
+	.equ	se_m_dig_key, 0
+	.equ	se_m_dig_tbs, 1
+	.equ	se_m_dig_exg, 0
+	.equ	se_m_dig_cmp, 1
 
 	.section .rodata
-	.global	se_w091
+	.global	se_m_dig
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w091_1:
-	.byte	KEYSH , se_w091_key+0
-	.byte	TEMPO , 150*se_w091_tbs/2
+se_m_dig_1:
+	.byte	KEYSH , se_m_dig_key+0
+	.byte	TEMPO , 150*se_m_dig_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 115*se_w091_mvl/mxv
+	.byte		VOL   , 115*se_m_dig_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N01   , Cn2 , v112
 	.byte	W01
@@ -53,14 +53,14 @@ se_w091_1:
 @******************************************************@
 	.align	2
 
-se_w091:
+se_m_dig:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w091_pri	@ Priority
-	.byte	se_w091_rev	@ Reverb.
+	.byte	se_m_dig_pri	@ Priority
+	.byte	se_m_dig_rev	@ Reverb.
 
-	.word	se_w091_grp
+	.word	se_m_dig_grp
 
-	.word	se_w091_1
+	.word	se_m_dig_1
 
 	.end
diff --git a/sound/songs/se_w291.s b/sound/songs/se_m_dive.s
index ae8d11134..2313667fc 100644
--- a/sound/songs/se_w291.s
+++ b/sound/songs/se_m_dive.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w291_grp, voicegroup128
-	.equ	se_w291_pri, 4
-	.equ	se_w291_rev, reverb_set+50
-	.equ	se_w291_mvl, 127
-	.equ	se_w291_key, 0
-	.equ	se_w291_tbs, 1
-	.equ	se_w291_exg, 0
-	.equ	se_w291_cmp, 1
+	.equ	se_m_dive_grp, voicegroup128
+	.equ	se_m_dive_pri, 4
+	.equ	se_m_dive_rev, reverb_set+50
+	.equ	se_m_dive_mvl, 127
+	.equ	se_m_dive_key, 0
+	.equ	se_m_dive_tbs, 1
+	.equ	se_m_dive_exg, 0
+	.equ	se_m_dive_cmp, 1
 
 	.section .rodata
-	.global	se_w291
+	.global	se_m_dive
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w291_1:
-	.byte	KEYSH , se_w291_key+0
-	.byte	TEMPO , 150*se_w291_tbs/2
+se_m_dive_1:
+	.byte	KEYSH , se_m_dive_key+0
+	.byte	TEMPO , 150*se_m_dive_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 105*se_w291_mvl/mxv
+	.byte		VOL   , 105*se_m_dive_mvl/mxv
 	.byte		BEND  , c_v-18
 	.byte		N06   , Fn2 , v127
 	.byte	W03
@@ -43,39 +43,39 @@ se_w291_1:
 	.byte		PAN   , c_v-3
 	.byte		BEND  , c_v-5
 	.byte	W02
-	.byte		VOL   , 100*se_w291_mvl/mxv
+	.byte		VOL   , 100*se_m_dive_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v-2
 	.byte	W03
-	.byte		VOL   , 94*se_w291_mvl/mxv
+	.byte		VOL   , 94*se_m_dive_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-3
 	.byte		BEND  , c_v+1
 	.byte	W02
-	.byte		VOL   , 84*se_w291_mvl/mxv
+	.byte		VOL   , 84*se_m_dive_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+4
 	.byte	W04
 	.byte		PAN   , c_v+3
-	.byte		VOL   , 72*se_w291_mvl/mxv
+	.byte		VOL   , 72*se_m_dive_mvl/mxv
 	.byte		BEND  , c_v+2
 	.byte	W04
 	.byte		PAN   , c_v+6
-	.byte		VOL   , 57*se_w291_mvl/mxv
+	.byte		VOL   , 57*se_m_dive_mvl/mxv
 	.byte		BEND  , c_v-3
 	.byte	W03
 	.byte		PAN   , c_v+3
-	.byte		VOL   , 37*se_w291_mvl/mxv
+	.byte		VOL   , 37*se_m_dive_mvl/mxv
 	.byte		BEND  , c_v-7
 	.byte	W03
-	.byte		VOL   , 20*se_w291_mvl/mxv
+	.byte		VOL   , 20*se_m_dive_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-11
 	.byte	W01
-	.byte		VOL   , 7*se_w291_mvl/mxv
+	.byte		VOL   , 7*se_m_dive_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-3
 	.byte		BEND  , c_v-16
@@ -84,10 +84,10 @@ se_w291_1:
 
 @********************** Track  2 **********************@
 
-se_w291_2:
-	.byte	KEYSH , se_w291_key+0
+se_m_dive_2:
+	.byte	KEYSH , se_m_dive_key+0
 	.byte		VOICE , 25
-	.byte		VOL   , 105*se_w291_mvl/mxv
+	.byte		VOL   , 105*se_m_dive_mvl/mxv
 	.byte		N06   , An2 , v040
 	.byte	W06
 	.byte		        Gn2 
@@ -109,15 +109,15 @@ se_w291_2:
 @******************************************************@
 	.align	2
 
-se_w291:
+se_m_dive:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w291_pri	@ Priority
-	.byte	se_w291_rev	@ Reverb.
+	.byte	se_m_dive_pri	@ Priority
+	.byte	se_m_dive_rev	@ Reverb.
 
-	.word	se_w291_grp
+	.word	se_m_dive_grp
 
-	.word	se_w291_1
-	.word	se_w291_2
+	.word	se_m_dive_1
+	.word	se_m_dive_2
 
 	.end
diff --git a/sound/songs/se_m_dizzy_punch.s b/sound/songs/se_m_dizzy_punch.s
new file mode 100644
index 000000000..886a4bc4e
--- /dev/null
+++ b/sound/songs/se_m_dizzy_punch.s
@@ -0,0 +1,79 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_dizzy_punch_grp, voicegroup128
+	.equ	se_m_dizzy_punch_pri, 4
+	.equ	se_m_dizzy_punch_rev, reverb_set+50
+	.equ	se_m_dizzy_punch_mvl, 127
+	.equ	se_m_dizzy_punch_key, 0
+	.equ	se_m_dizzy_punch_tbs, 1
+	.equ	se_m_dizzy_punch_exg, 0
+	.equ	se_m_dizzy_punch_cmp, 1
+
+	.section .rodata
+	.global	se_m_dizzy_punch
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_dizzy_punch_1:
+	.byte	KEYSH , se_m_dizzy_punch_key+0
+	.byte	TEMPO , 150*se_m_dizzy_punch_tbs/2
+	.byte		VOICE , 19
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 5*se_m_dizzy_punch_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N07   , Bn5 , v080
+	.byte	W01
+	.byte		VOL   , 55*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v+11
+	.byte		BEND  , c_v+3
+	.byte	W01
+	.byte		VOL   , 67*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v+22
+	.byte		BEND  , c_v+0
+	.byte	W01
+	.byte		VOL   , 90*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-6
+	.byte	W01
+	.byte		PAN   , c_v-12
+	.byte		BEND  , c_v-14
+	.byte	W02
+	.byte		VOL   , 4*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v-22
+	.byte		BEND  , c_v-23
+	.byte	W01
+	.byte		PAN   , c_v-13
+	.byte		BEND  , c_v+0
+	.byte		N04   , Cn6 
+	.byte	W01
+	.byte		VOL   , 66*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+1
+	.byte	W01
+	.byte		VOL   , 90*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v+11
+	.byte		BEND  , c_v+3
+	.byte	W01
+	.byte		VOL   , 4*se_m_dizzy_punch_mvl/mxv
+	.byte		PAN   , c_v+21
+	.byte		BEND  , c_v+5
+	.byte	W14
+	.byte		VOL   , 90*se_m_dizzy_punch_mvl/mxv
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_dizzy_punch:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_dizzy_punch_pri	@ Priority
+	.byte	se_m_dizzy_punch_rev	@ Reverb.
+
+	.word	se_m_dizzy_punch_grp
+
+	.word	se_m_dizzy_punch_1
+
+	.end
diff --git a/sound/songs/se_m_double_team.s b/sound/songs/se_m_double_team.s
new file mode 100644
index 000000000..49bcfb13d
--- /dev/null
+++ b/sound/songs/se_m_double_team.s
@@ -0,0 +1,71 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_double_team_grp, voicegroup128
+	.equ	se_m_double_team_pri, 4
+	.equ	se_m_double_team_rev, reverb_set+50
+	.equ	se_m_double_team_mvl, 127
+	.equ	se_m_double_team_key, 0
+	.equ	se_m_double_team_tbs, 1
+	.equ	se_m_double_team_exg, 0
+	.equ	se_m_double_team_cmp, 1
+
+	.section .rodata
+	.global	se_m_double_team
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_double_team_1:
+	.byte	KEYSH , se_m_double_team_key+0
+	.byte	TEMPO , 150*se_m_double_team_tbs/2
+	.byte		VOICE , 22
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 110*se_m_double_team_mvl/mxv
+	.byte		BEND  , c_v-18
+	.byte		N19   , Dn3 , v108
+	.byte	W02
+	.byte		BEND  , c_v-7
+	.byte	W01
+	.byte		VOL   , 101*se_m_double_team_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v-9
+	.byte		BEND  , c_v+8
+	.byte	W02
+	.byte		VOL   , 84*se_m_double_team_mvl/mxv
+	.byte		BEND  , c_v+4
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 64*se_m_double_team_mvl/mxv
+	.byte		BEND  , c_v-13
+	.byte	W01
+	.byte		PAN   , c_v+8
+	.byte	W02
+	.byte		VOL   , 45*se_m_double_team_mvl/mxv
+	.byte		BEND  , c_v-31
+	.byte	W02
+	.byte		VOL   , 32*se_m_double_team_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOICE , 2
+	.byte	W01
+	.byte		VOL   , 13*se_m_double_team_mvl/mxv
+	.byte		BEND  , c_v-52
+	.byte	W08
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_double_team:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_double_team_pri	@ Priority
+	.byte	se_m_double_team_rev	@ Reverb.
+
+	.word	se_m_double_team_grp
+
+	.word	se_m_double_team_1
+
+	.end
diff --git a/sound/songs/se_m_dragon_rage.s b/sound/songs/se_m_dragon_rage.s
new file mode 100644
index 000000000..e9eaefca0
--- /dev/null
+++ b/sound/songs/se_m_dragon_rage.s
@@ -0,0 +1,150 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_dragon_rage_grp, voicegroup128
+	.equ	se_m_dragon_rage_pri, 4
+	.equ	se_m_dragon_rage_rev, reverb_set+50
+	.equ	se_m_dragon_rage_mvl, 127
+	.equ	se_m_dragon_rage_key, 0
+	.equ	se_m_dragon_rage_tbs, 1
+	.equ	se_m_dragon_rage_exg, 0
+	.equ	se_m_dragon_rage_cmp, 1
+
+	.section .rodata
+	.global	se_m_dragon_rage
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_dragon_rage_1:
+	.byte	KEYSH , se_m_dragon_rage_key+0
+	.byte	TEMPO , 150*se_m_dragon_rage_tbs/2
+	.byte		VOICE , 29
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 21*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N10   , An2 , v127
+	.byte	W02
+	.byte		VOL   , 47*se_m_dragon_rage_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 88*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte	W01
+	.byte		VOL   , 120*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 21*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+10
+	.byte		N10   , Bn2 
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte	W01
+	.byte		VOL   , 47*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 88*se_m_dragon_rage_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v-5
+	.byte		VOL   , 120*se_m_dragon_rage_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v-2
+	.byte		VOL   , 21*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+18
+	.byte		N10   , Cs3 
+	.byte	W03
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 47*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		        88*se_m_dragon_rage_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 120*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte	W02
+	.byte		VOL   , 20*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+29
+	.byte		N10   , Dn3 
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 47*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte	W01
+	.byte		VOL   , 88*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 120*se_m_dragon_rage_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v-5
+	.byte	W01
+	.byte		VOL   , 21*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+37
+	.byte		N10   , En3 
+	.byte	W02
+	.byte		PAN   , c_v-2
+	.byte		VOL   , 46*se_m_dragon_rage_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 102*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		        120*se_m_dragon_rage_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		        c_v-5
+	.byte		VOL   , 20*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+42
+	.byte		N20   , Fs3 
+	.byte	W02
+	.byte		VOL   , 47*se_m_dragon_rage_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 88*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte	W01
+	.byte		VOL   , 120*se_m_dragon_rage_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 99*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+50
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte	W01
+	.byte		VOL   , 74*se_m_dragon_rage_mvl/mxv
+	.byte	W01
+	.byte		BEND  , c_v+56
+	.byte	W01
+	.byte		PAN   , c_v-2
+	.byte		VOL   , 53*se_m_dragon_rage_mvl/mxv
+	.byte	W03
+	.byte		        34*se_m_dragon_rage_mvl/mxv
+	.byte		BEND  , c_v+63
+	.byte	W01
+	.byte		VOL   , 15*se_m_dragon_rage_mvl/mxv
+	.byte	W23
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_dragon_rage:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_dragon_rage_pri	@ Priority
+	.byte	se_m_dragon_rage_rev	@ Reverb.
+
+	.word	se_m_dragon_rage_grp
+
+	.word	se_m_dragon_rage_1
+
+	.end
diff --git a/sound/songs/se_w089.s b/sound/songs/se_m_earthquake.s
index 081988ee9..104eb1bef 100644
--- a/sound/songs/se_w089.s
+++ b/sound/songs/se_m_earthquake.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w089_grp, voicegroup128
-	.equ	se_w089_pri, 4
-	.equ	se_w089_rev, reverb_set+50
-	.equ	se_w089_mvl, 127
-	.equ	se_w089_key, 0
-	.equ	se_w089_tbs, 1
-	.equ	se_w089_exg, 0
-	.equ	se_w089_cmp, 1
+	.equ	se_m_earthquake_grp, voicegroup128
+	.equ	se_m_earthquake_pri, 4
+	.equ	se_m_earthquake_rev, reverb_set+50
+	.equ	se_m_earthquake_mvl, 127
+	.equ	se_m_earthquake_key, 0
+	.equ	se_m_earthquake_tbs, 1
+	.equ	se_m_earthquake_exg, 0
+	.equ	se_m_earthquake_cmp, 1
 
 	.section .rodata
-	.global	se_w089
+	.global	se_m_earthquake
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w089_1:
-	.byte	KEYSH , se_w089_key+0
-	.byte	TEMPO , 150*se_w089_tbs/2
+se_m_earthquake_1:
+	.byte	KEYSH , se_m_earthquake_key+0
+	.byte	TEMPO , 150*se_m_earthquake_tbs/2
 	.byte		VOICE , 26
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w089_mvl/mxv
+	.byte		VOL   , 110*se_m_earthquake_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N03   , Cs2 , v127
 	.byte	W03
@@ -35,13 +35,13 @@ se_w089_1:
 	.byte		PAN   , c_v+11
 	.byte		N03   , Cn2 , v112
 	.byte	W02
-se_w089_1_000:
+se_m_earthquake_1_000:
 	.byte	W02
 	.byte		PAN   , c_v-11
 	.byte		N03   , Cs2 , v108
 	.byte	W04
 	.byte	PEND
-se_w089_1_001:
+se_m_earthquake_1_001:
 	.byte		PAN   , c_v+0
 	.byte		N03   , Cn2 , v100
 	.byte	W03
@@ -49,7 +49,7 @@ se_w089_1_001:
 	.byte		N03   , Cs2 , v116
 	.byte	W03
 	.byte	PEND
-se_w089_1_002:
+se_m_earthquake_1_002:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		N03   , Cn2 , v112
@@ -58,13 +58,13 @@ se_w089_1_002:
 	.byte		N03   , Cs2 , v108
 	.byte	W02
 	.byte	PEND
-se_w089_1_003:
+se_m_earthquake_1_003:
 	.byte	W02
 	.byte		PAN   , c_v-11
 	.byte		N03   , Cn2 , v100
 	.byte	W04
 	.byte	PEND
-se_w089_1_004:
+se_m_earthquake_1_004:
 	.byte		PAN   , c_v+0
 	.byte		N03   , Cs2 , v116
 	.byte	W03
@@ -72,7 +72,7 @@ se_w089_1_004:
 	.byte		N03   , Cn2 , v112
 	.byte	W03
 	.byte	PEND
-se_w089_1_005:
+se_m_earthquake_1_005:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		N03   , Cs2 , v108
@@ -81,7 +81,7 @@ se_w089_1_005:
 	.byte		N03   , Cn2 , v100
 	.byte	W02
 	.byte	PEND
-se_w089_1_006:
+se_m_earthquake_1_006:
 	.byte	W02
 	.byte		PAN   , c_v-11
 	.byte		N03   , Cs2 , v116
@@ -104,7 +104,7 @@ se_w089_1_006:
 	.byte		PAN   , c_v-11
 	.byte		N03   , Cn2 , v112
 	.byte	W04
-se_w089_1_007:
+se_m_earthquake_1_007:
 	.byte		PAN   , c_v+0
 	.byte		N03   , Cs2 , v108
 	.byte	W03
@@ -112,7 +112,7 @@ se_w089_1_007:
 	.byte		N03   , Cn2 , v100
 	.byte	W03
 	.byte	PEND
-se_w089_1_008:
+se_m_earthquake_1_008:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		N03   , Cs2 , v116
@@ -122,91 +122,91 @@ se_w089_1_008:
 	.byte	W02
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w089_1_000
+	 .word	se_m_earthquake_1_000
 	.byte	PATT
-	 .word	se_w089_1_001
+	 .word	se_m_earthquake_1_001
 	.byte	PATT
-	 .word	se_w089_1_002
+	 .word	se_m_earthquake_1_002
 	.byte	PATT
-	 .word	se_w089_1_003
+	 .word	se_m_earthquake_1_003
 	.byte	PATT
-	 .word	se_w089_1_007
+	 .word	se_m_earthquake_1_007
 	.byte	PATT
-	 .word	se_w089_1_008
+	 .word	se_m_earthquake_1_008
 	.byte	PATT
-	 .word	se_w089_1_000
+	 .word	se_m_earthquake_1_000
 	.byte	PATT
-	 .word	se_w089_1_001
+	 .word	se_m_earthquake_1_001
 	.byte	PATT
-	 .word	se_w089_1_002
+	 .word	se_m_earthquake_1_002
 	.byte	PATT
-	 .word	se_w089_1_003
+	 .word	se_m_earthquake_1_003
 	.byte	PATT
-	 .word	se_w089_1_004
+	 .word	se_m_earthquake_1_004
 	.byte	PATT
-	 .word	se_w089_1_005
+	 .word	se_m_earthquake_1_005
 	.byte	PATT
-	 .word	se_w089_1_006
-	.byte		VOL   , 106*se_w089_mvl/mxv
+	 .word	se_m_earthquake_1_006
+	.byte		VOL   , 106*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N03   , Cn2 , v112
 	.byte	W03
-	.byte		VOL   , 103*se_w089_mvl/mxv
+	.byte		VOL   , 103*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		N03   , Cs2 , v108
 	.byte	W03
 	.byte	W01
-	.byte		VOL   , 97*se_w089_mvl/mxv
+	.byte		VOL   , 97*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		N03   , Cn2 , v100
 	.byte	W03
-	.byte		VOL   , 89*se_w089_mvl/mxv
+	.byte		VOL   , 89*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+11
 	.byte		N03   , Cs2 , v116
 	.byte	W02
 	.byte	W02
-	.byte		VOL   , 85*se_w089_mvl/mxv
+	.byte		VOL   , 85*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v-11
 	.byte		N03   , Cn2 , v112
 	.byte	W04
-	.byte		VOL   , 78*se_w089_mvl/mxv
+	.byte		VOL   , 78*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N03   , Cs2 , v108
 	.byte	W03
-	.byte		VOL   , 72*se_w089_mvl/mxv
+	.byte		VOL   , 72*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		N03   , Cn2 , v100
 	.byte	W03
 	.byte	W01
-	.byte		VOL   , 66*se_w089_mvl/mxv
+	.byte		VOL   , 66*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		N03   , Cs2 , v116
 	.byte	W03
-	.byte		VOL   , 58*se_w089_mvl/mxv
+	.byte		VOL   , 58*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+11
 	.byte		N03   , Cn2 , v112
 	.byte	W02
 	.byte	W02
-	.byte		VOL   , 46*se_w089_mvl/mxv
+	.byte		VOL   , 46*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v-11
 	.byte		N03   , Cs2 , v108
 	.byte	W04
-	.byte		VOL   , 30*se_w089_mvl/mxv
+	.byte		VOL   , 30*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N03   , Cn2 , v100
 	.byte	W03
-	.byte		VOL   , 12*se_w089_mvl/mxv
+	.byte		VOL   , 12*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte	W03
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w089_2:
-	.byte	KEYSH , se_w089_key+0
+se_m_earthquake_2:
+	.byte	KEYSH , se_m_earthquake_key+0
 	.byte		VOICE , 5
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w089_mvl/mxv
+	.byte		VOL   , 110*se_m_earthquake_mvl/mxv
 	.byte		N02   , Fn2 , v072
 	.byte	W02
 	.byte		N01   
@@ -218,7 +218,7 @@ se_w089_2:
 	.byte		VOICE , 27
 	.byte		N06   , Bn1 , v080
 	.byte	W06
-se_w089_2_000:
+se_m_earthquake_2_000:
 	.byte		PAN   , c_v+0
 	.byte		N06   , Bn1 , v080
 	.byte	W06
@@ -228,99 +228,99 @@ se_w089_2_000:
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
 	.byte	PATT
-	 .word	se_w089_2_000
+	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte		N06   
 	.byte	W06
-	.byte		VOL   , 106*se_w089_mvl/mxv
+	.byte		VOL   , 106*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N06   
 	.byte	W03
-	.byte		VOL   , 103*se_w089_mvl/mxv
+	.byte		VOL   , 103*se_m_earthquake_mvl/mxv
 	.byte	W03
 	.byte		N06   
 	.byte	W01
-	.byte		VOL   , 97*se_w089_mvl/mxv
+	.byte		VOL   , 97*se_m_earthquake_mvl/mxv
 	.byte	W03
-	.byte		        89*se_w089_mvl/mxv
+	.byte		        89*se_m_earthquake_mvl/mxv
 	.byte	W02
 	.byte		N06   
 	.byte	W02
-	.byte		VOL   , 85*se_w089_mvl/mxv
+	.byte		VOL   , 85*se_m_earthquake_mvl/mxv
 	.byte	W04
-	.byte		        78*se_w089_mvl/mxv
+	.byte		        78*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N06   
 	.byte	W03
-	.byte		VOL   , 72*se_w089_mvl/mxv
+	.byte		VOL   , 72*se_m_earthquake_mvl/mxv
 	.byte	W03
 	.byte		N06   
 	.byte	W01
-	.byte		VOL   , 66*se_w089_mvl/mxv
+	.byte		VOL   , 66*se_m_earthquake_mvl/mxv
 	.byte	W03
-	.byte		        58*se_w089_mvl/mxv
+	.byte		        58*se_m_earthquake_mvl/mxv
 	.byte	W02
 	.byte		N06   
 	.byte	W02
-	.byte		VOL   , 46*se_w089_mvl/mxv
+	.byte		VOL   , 46*se_m_earthquake_mvl/mxv
 	.byte	W04
-	.byte		        30*se_w089_mvl/mxv
+	.byte		        30*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N06   
 	.byte	W03
-	.byte		VOL   , 12*se_w089_mvl/mxv
+	.byte		VOL   , 12*se_m_earthquake_mvl/mxv
 	.byte	W03
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w089:
+se_m_earthquake:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w089_pri	@ Priority
-	.byte	se_w089_rev	@ Reverb.
+	.byte	se_m_earthquake_pri	@ Priority
+	.byte	se_m_earthquake_rev	@ Reverb.
 
-	.word	se_w089_grp
+	.word	se_m_earthquake_grp
 
-	.word	se_w089_1
-	.word	se_w089_2
+	.word	se_m_earthquake_1
+	.word	se_m_earthquake_2
 
 	.end
diff --git a/sound/songs/se_m_ember.s b/sound/songs/se_m_ember.s
new file mode 100644
index 000000000..a685ca24c
--- /dev/null
+++ b/sound/songs/se_m_ember.s
@@ -0,0 +1,61 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_ember_grp, voicegroup128
+	.equ	se_m_ember_pri, 4
+	.equ	se_m_ember_rev, reverb_set+50
+	.equ	se_m_ember_mvl, 127
+	.equ	se_m_ember_key, 0
+	.equ	se_m_ember_tbs, 1
+	.equ	se_m_ember_exg, 0
+	.equ	se_m_ember_cmp, 1
+
+	.section .rodata
+	.global	se_m_ember
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_ember_1:
+	.byte	KEYSH , se_m_ember_key+0
+	.byte	TEMPO , 150*se_m_ember_tbs/2
+	.byte		VOICE , 29
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 61*se_m_ember_mvl/mxv
+	.byte		BEND  , c_v+8
+	.byte		N10   , Gn3 , v127
+	.byte	W01
+	.byte		VOL   , 84*se_m_ember_mvl/mxv
+	.byte	W01
+	.byte		        97*se_m_ember_mvl/mxv
+	.byte		BEND  , c_v+16
+	.byte	W01
+	.byte		VOL   , 110*se_m_ember_mvl/mxv
+	.byte	W01
+	.byte		BEND  , c_v+7
+	.byte	W02
+	.byte		        c_v-12
+	.byte	W01
+	.byte		VOL   , 89*se_m_ember_mvl/mxv
+	.byte	W01
+	.byte		        64*se_m_ember_mvl/mxv
+	.byte		BEND  , c_v-42
+	.byte	W01
+	.byte		VOL   , 34*se_m_ember_mvl/mxv
+	.byte	W15
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_ember:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_ember_pri	@ Priority
+	.byte	se_m_ember_rev	@ Reverb.
+
+	.word	se_m_ember_grp
+
+	.word	se_m_ember_1
+
+	.end
diff --git a/sound/songs/se_w227.s b/sound/songs/se_m_encore.s
index 7a6f87abc..cf13ab761 100644
--- a/sound/songs/se_w227.s
+++ b/sound/songs/se_m_encore.s
@@ -1,26 +1,26 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w227_grp, voicegroup128
-	.equ	se_w227_pri, 4
-	.equ	se_w227_rev, reverb_set+50
-	.equ	se_w227_mvl, 127
-	.equ	se_w227_key, 0
-	.equ	se_w227_tbs, 1
-	.equ	se_w227_exg, 0
-	.equ	se_w227_cmp, 1
+	.equ	se_m_encore_grp, voicegroup128
+	.equ	se_m_encore_pri, 4
+	.equ	se_m_encore_rev, reverb_set+50
+	.equ	se_m_encore_mvl, 127
+	.equ	se_m_encore_key, 0
+	.equ	se_m_encore_tbs, 1
+	.equ	se_m_encore_exg, 0
+	.equ	se_m_encore_cmp, 1
 
 	.section .rodata
-	.global	se_w227
+	.global	se_m_encore
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w227_1:
-	.byte	KEYSH , se_w227_key+0
-	.byte	TEMPO , 150*se_w227_tbs/2
+se_m_encore_1:
+	.byte	KEYSH , se_m_encore_key+0
+	.byte	TEMPO , 150*se_m_encore_tbs/2
 	.byte		VOICE , 59
 	.byte		BENDR , 12
-	.byte		VOL   , 110*se_w227_mvl/mxv
+	.byte		VOL   , 110*se_m_encore_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte		N06   , En3 , v127
@@ -45,14 +45,14 @@ se_w227_1:
 @******************************************************@
 	.align	2
 
-se_w227:
+se_m_encore:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w227_pri	@ Priority
-	.byte	se_w227_rev	@ Reverb.
+	.byte	se_m_encore_pri	@ Priority
+	.byte	se_m_encore_rev	@ Reverb.
 
-	.word	se_w227_grp
+	.word	se_m_encore_grp
 
-	.word	se_w227_1
+	.word	se_m_encore_1
 
 	.end
diff --git a/sound/songs/se_w227b.s b/sound/songs/se_m_encore2.s
index a3fa4adfe..9c53cdfe3 100644
--- a/sound/songs/se_w227b.s
+++ b/sound/songs/se_m_encore2.s
@@ -1,26 +1,26 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w227b_grp, voicegroup128
-	.equ	se_w227b_pri, 4
-	.equ	se_w227b_rev, reverb_set+50
-	.equ	se_w227b_mvl, 127
-	.equ	se_w227b_key, 0
-	.equ	se_w227b_tbs, 1
-	.equ	se_w227b_exg, 0
-	.equ	se_w227b_cmp, 1
+	.equ	se_m_encore2_grp, voicegroup128
+	.equ	se_m_encore2_pri, 4
+	.equ	se_m_encore2_rev, reverb_set+50
+	.equ	se_m_encore2_mvl, 127
+	.equ	se_m_encore2_key, 0
+	.equ	se_m_encore2_tbs, 1
+	.equ	se_m_encore2_exg, 0
+	.equ	se_m_encore2_cmp, 1
 
 	.section .rodata
-	.global	se_w227b
+	.global	se_m_encore2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w227b_1:
-	.byte	KEYSH , se_w227b_key+0
-	.byte	TEMPO , 150*se_w227b_tbs/2
+se_m_encore2_1:
+	.byte	KEYSH , se_m_encore2_key+0
+	.byte	TEMPO , 150*se_m_encore2_tbs/2
 	.byte		VOICE , 60
 	.byte		BENDR , 12
-	.byte		VOL   , 25*se_w227b_mvl/mxv
+	.byte		VOL   , 25*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte		TIE   , Cn3 , v127
@@ -29,18 +29,18 @@ se_w227b_1:
 	.byte	W01
 	.byte		        c_v+5
 	.byte	W01
-	.byte		VOL   , 34*se_w227b_mvl/mxv
+	.byte		VOL   , 34*se_m_encore2_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+2
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 46*se_w227b_mvl/mxv
+	.byte		VOL   , 46*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W01
 	.byte		        c_v-4
 	.byte	W02
-	.byte		VOL   , 56*se_w227b_mvl/mxv
+	.byte		VOL   , 56*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W02
 	.byte		        c_v+0
@@ -49,30 +49,30 @@ se_w227b_1:
 	.byte	W01
 	.byte		        c_v+5
 	.byte	W01
-	.byte		VOL   , 70*se_w227b_mvl/mxv
+	.byte		VOL   , 70*se_m_encore2_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+2
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 80*se_w227b_mvl/mxv
+	.byte		VOL   , 80*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W01
 	.byte		        c_v-4
 	.byte	W02
-	.byte		VOL   , 88*se_w227b_mvl/mxv
+	.byte		VOL   , 88*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
 	.byte		        c_v+2
 	.byte	W01
-	.byte		VOL   , 96*se_w227b_mvl/mxv
+	.byte		VOL   , 96*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v+5
 	.byte	W02
 	.byte		        c_v+2
 	.byte	W02
-	.byte		VOL   , 100*se_w227b_mvl/mxv
+	.byte		VOL   , 100*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v-2
@@ -81,7 +81,7 @@ se_w227b_1:
 	.byte	W02
 	.byte		        c_v-2
 	.byte	W02
-se_w227b_1_000:
+se_m_encore2_1_000:
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+2
@@ -100,58 +100,58 @@ se_w227b_1_000:
 	.byte	W02
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w227b_1_000
+	 .word	se_m_encore2_1_000
 	.byte	PATT
-	 .word	se_w227b_1_000
+	 .word	se_m_encore2_1_000
 	.byte	PATT
-	 .word	se_w227b_1_000
+	 .word	se_m_encore2_1_000
 	.byte	PATT
-	 .word	se_w227b_1_000
+	 .word	se_m_encore2_1_000
 	.byte	PATT
-	 .word	se_w227b_1_000
+	 .word	se_m_encore2_1_000
 	.byte	PATT
-	 .word	se_w227b_1_000
-	.byte		VOL   , 96*se_w227b_mvl/mxv
+	 .word	se_m_encore2_1_000
+	.byte		VOL   , 96*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v+2
 	.byte	W01
 	.byte		        c_v+5
 	.byte	W01
-	.byte		VOL   , 92*se_w227b_mvl/mxv
+	.byte		VOL   , 92*se_m_encore2_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+2
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 84*se_w227b_mvl/mxv
+	.byte		VOL   , 84*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W01
 	.byte		        c_v-4
 	.byte	W02
-	.byte		VOL   , 72*se_w227b_mvl/mxv
+	.byte		VOL   , 72*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
 	.byte		        c_v+2
 	.byte	W01
-	.byte		VOL   , 63*se_w227b_mvl/mxv
+	.byte		VOL   , 63*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v+5
 	.byte	W02
-	.byte		VOL   , 52*se_w227b_mvl/mxv
+	.byte		VOL   , 52*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v+2
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 37*se_w227b_mvl/mxv
+	.byte		VOL   , 37*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W01
 	.byte		        c_v-4
 	.byte	W01
-	.byte		VOL   , 22*se_w227b_mvl/mxv
+	.byte		VOL   , 22*se_m_encore2_mvl/mxv
 	.byte	W01
-	.byte		        12*se_w227b_mvl/mxv
+	.byte		        12*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W02
 	.byte		EOT   , Cn3 
@@ -160,14 +160,14 @@ se_w227b_1_000:
 @******************************************************@
 	.align	2
 
-se_w227b:
+se_m_encore2:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w227b_pri	@ Priority
-	.byte	se_w227b_rev	@ Reverb.
+	.byte	se_m_encore2_pri	@ Priority
+	.byte	se_m_encore2_rev	@ Reverb.
 
-	.word	se_w227b_grp
+	.word	se_m_encore2_grp
 
-	.word	se_w227b_1
+	.word	se_m_encore2_1
 
 	.end
diff --git a/sound/songs/se_w153.s b/sound/songs/se_m_explosion.s
index fe4e25a9e..c93f485b8 100644
--- a/sound/songs/se_w153.s
+++ b/sound/songs/se_m_explosion.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w153_grp, voicegroup128
-	.equ	se_w153_pri, 4
-	.equ	se_w153_rev, reverb_set+50
-	.equ	se_w153_mvl, 127
-	.equ	se_w153_key, 0
-	.equ	se_w153_tbs, 1
-	.equ	se_w153_exg, 0
-	.equ	se_w153_cmp, 1
+	.equ	se_m_explosion_grp, voicegroup128
+	.equ	se_m_explosion_pri, 4
+	.equ	se_m_explosion_rev, reverb_set+50
+	.equ	se_m_explosion_mvl, 127
+	.equ	se_m_explosion_key, 0
+	.equ	se_m_explosion_tbs, 1
+	.equ	se_m_explosion_exg, 0
+	.equ	se_m_explosion_cmp, 1
 
 	.section .rodata
-	.global	se_w153
+	.global	se_m_explosion
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w153_1:
-	.byte	KEYSH , se_w153_key+0
-	.byte	TEMPO , 150*se_w153_tbs/2
+se_m_explosion_1:
+	.byte	KEYSH , se_m_explosion_key+0
+	.byte	TEMPO , 150*se_m_explosion_tbs/2
 	.byte		VOICE , 41
-	.byte		VOL   , 125*se_w153_mvl/mxv
+	.byte		VOL   , 125*se_m_explosion_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -82,20 +82,20 @@ se_w153_1:
 
 @********************** Track  2 **********************@
 
-se_w153_2:
-	.byte	KEYSH , se_w153_key+0
+se_m_explosion_2:
+	.byte	KEYSH , se_m_explosion_key+0
 	.byte		VOICE , 4
-	.byte		VOL   , 125*se_w153_mvl/mxv
+	.byte		VOL   , 125*se_m_explosion_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+1
 	.byte		N02   , Cn3 , v052
 	.byte	W01
-	.byte		VOL   , 74*se_w153_mvl/mxv
+	.byte		VOL   , 74*se_m_explosion_mvl/mxv
 	.byte	W06
-	.byte		        125*se_w153_mvl/mxv
+	.byte		        125*se_m_explosion_mvl/mxv
 	.byte		N02   
 	.byte	W01
-	.byte		VOL   , 74*se_w153_mvl/mxv
+	.byte		VOL   , 74*se_m_explosion_mvl/mxv
 	.byte	W16
 	.byte	W24
 	.byte	W24
@@ -104,15 +104,15 @@ se_w153_2:
 @******************************************************@
 	.align	2
 
-se_w153:
+se_m_explosion:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w153_pri	@ Priority
-	.byte	se_w153_rev	@ Reverb.
+	.byte	se_m_explosion_pri	@ Priority
+	.byte	se_m_explosion_rev	@ Reverb.
 
-	.word	se_w153_grp
+	.word	se_m_explosion_grp
 
-	.word	se_w153_1
-	.word	se_w153_2
+	.word	se_m_explosion_1
+	.word	se_m_explosion_2
 
 	.end
diff --git a/sound/songs/se_w185.s b/sound/songs/se_m_faint_attack.s
index 8ec9ebfe8..ce53c7173 100644
--- a/sound/songs/se_w185.s
+++ b/sound/songs/se_m_faint_attack.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w185_grp, voicegroup128
-	.equ	se_w185_pri, 4
-	.equ	se_w185_rev, reverb_set+50
-	.equ	se_w185_mvl, 127
-	.equ	se_w185_key, 0
-	.equ	se_w185_tbs, 1
-	.equ	se_w185_exg, 0
-	.equ	se_w185_cmp, 1
+	.equ	se_m_faint_attack_grp, voicegroup128
+	.equ	se_m_faint_attack_pri, 4
+	.equ	se_m_faint_attack_rev, reverb_set+50
+	.equ	se_m_faint_attack_mvl, 127
+	.equ	se_m_faint_attack_key, 0
+	.equ	se_m_faint_attack_tbs, 1
+	.equ	se_m_faint_attack_exg, 0
+	.equ	se_m_faint_attack_cmp, 1
 
 	.section .rodata
-	.global	se_w185
+	.global	se_m_faint_attack
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w185_1:
-	.byte	KEYSH , se_w185_key+0
-	.byte	TEMPO , 150*se_w185_tbs/2
+se_m_faint_attack_1:
+	.byte	KEYSH , se_m_faint_attack_key+0
+	.byte	TEMPO , 150*se_m_faint_attack_tbs/2
 	.byte		VOICE , 45
-	.byte		VOL   , 100*se_w185_mvl/mxv
+	.byte		VOL   , 100*se_m_faint_attack_mvl/mxv
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-5
@@ -76,14 +76,14 @@ se_w185_1:
 @******************************************************@
 	.align	2
 
-se_w185:
+se_m_faint_attack:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w185_pri	@ Priority
-	.byte	se_w185_rev	@ Reverb.
+	.byte	se_m_faint_attack_pri	@ Priority
+	.byte	se_m_faint_attack_rev	@ Reverb.
 
-	.word	se_w185_grp
+	.word	se_m_faint_attack_grp
 
-	.word	se_w185_1
+	.word	se_m_faint_attack_1
 
 	.end
diff --git a/sound/songs/se_m_flame_wheel.s b/sound/songs/se_m_flame_wheel.s
new file mode 100644
index 000000000..797073466
--- /dev/null
+++ b/sound/songs/se_m_flame_wheel.s
@@ -0,0 +1,124 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_flame_wheel_grp, voicegroup128
+	.equ	se_m_flame_wheel_pri, 4
+	.equ	se_m_flame_wheel_rev, reverb_set+50
+	.equ	se_m_flame_wheel_mvl, 127
+	.equ	se_m_flame_wheel_key, 0
+	.equ	se_m_flame_wheel_tbs, 1
+	.equ	se_m_flame_wheel_exg, 0
+	.equ	se_m_flame_wheel_cmp, 1
+
+	.section .rodata
+	.global	se_m_flame_wheel
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_flame_wheel_1:
+	.byte	KEYSH , se_m_flame_wheel_key+0
+	.byte	TEMPO , 150*se_m_flame_wheel_tbs/2
+	.byte		VOICE , 29
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 22*se_m_flame_wheel_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N30   , Dn4 , v127
+	.byte	W01
+	.byte		VOL   , 49*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		        71*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_flame_wheel_mvl/mxv
+	.byte		BEND  , c_v+8
+	.byte	W01
+	.byte		VOL   , 110*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte		BEND  , c_v+16
+	.byte	W01
+	.byte		VOL   , 95*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        88*se_m_flame_wheel_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+7
+	.byte	W01
+	.byte		VOL   , 93*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        110*se_m_flame_wheel_mvl/mxv
+	.byte		PAN   , c_v-5
+	.byte		BEND  , c_v+0
+	.byte	W02
+	.byte		VOL   , 86*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-9
+	.byte	W01
+	.byte		VOL   , 63*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        37*se_m_flame_wheel_mvl/mxv
+	.byte		BEND  , c_v-24
+	.byte	W03
+	.byte		VOL   , 13*se_m_flame_wheel_mvl/mxv
+	.byte		BEND  , c_v-46
+	.byte	W03
+	.byte	W03
+	.byte	W03
+	.byte	W03
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_flame_wheel_2:
+	.byte	KEYSH , se_m_flame_wheel_key+0
+	.byte		VOICE , 27
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 22*se_m_flame_wheel_mvl/mxv
+	.byte		N30   , Gn2 , v032
+	.byte	W01
+	.byte		VOL   , 49*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		        71*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		        110*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte	W01
+	.byte		        95*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        88*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte		        93*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        110*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        86*se_m_flame_wheel_mvl/mxv
+	.byte	W01
+	.byte	W01
+	.byte		        63*se_m_flame_wheel_mvl/mxv
+	.byte	W02
+	.byte		        37*se_m_flame_wheel_mvl/mxv
+	.byte	W03
+	.byte		        13*se_m_flame_wheel_mvl/mxv
+	.byte	W03
+	.byte	W03
+	.byte	W03
+	.byte	W03
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_flame_wheel:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_flame_wheel_pri	@ Priority
+	.byte	se_m_flame_wheel_rev	@ Reverb.
+
+	.word	se_m_flame_wheel_grp
+
+	.word	se_m_flame_wheel_1
+	.word	se_m_flame_wheel_2
+
+	.end
diff --git a/sound/songs/se_m_flame_wheel2.s b/sound/songs/se_m_flame_wheel2.s
new file mode 100644
index 000000000..21f911b0b
--- /dev/null
+++ b/sound/songs/se_m_flame_wheel2.s
@@ -0,0 +1,99 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_flame_wheel2_grp, voicegroup128
+	.equ	se_m_flame_wheel2_pri, 4
+	.equ	se_m_flame_wheel2_rev, reverb_set+50
+	.equ	se_m_flame_wheel2_mvl, 127
+	.equ	se_m_flame_wheel2_key, 0
+	.equ	se_m_flame_wheel2_tbs, 1
+	.equ	se_m_flame_wheel2_exg, 0
+	.equ	se_m_flame_wheel2_cmp, 1
+
+	.section .rodata
+	.global	se_m_flame_wheel2
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_flame_wheel2_1:
+	.byte	KEYSH , se_m_flame_wheel2_key+0
+	.byte	TEMPO , 150*se_m_flame_wheel2_tbs/2
+	.byte		VOICE , 29
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 110*se_m_flame_wheel2_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N48   , Cn4 , v127
+	.byte	W06
+	.byte		PAN   , c_v+4
+	.byte	W03
+	.byte		BEND  , c_v+2
+	.byte	W03
+	.byte		PAN   , c_v+10
+	.byte	W03
+	.byte		BEND  , c_v+5
+	.byte	W03
+	.byte		VOL   , 98*se_m_flame_wheel2_mvl/mxv
+	.byte		PAN   , c_v+4
+	.byte	W03
+	.byte		BEND  , c_v+3
+	.byte	W03
+	.byte		VOL   , 88*se_m_flame_wheel2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		BEND  , c_v-5
+	.byte	W03
+	.byte		VOL   , 68*se_m_flame_wheel2_mvl/mxv
+	.byte		PAN   , c_v-5
+	.byte	W03
+	.byte		        c_v+7
+	.byte		BEND  , c_v-9
+	.byte	W03
+	.byte		VOL   , 44*se_m_flame_wheel2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		BEND  , c_v-15
+	.byte	W03
+	.byte		VOL   , 13*se_m_flame_wheel2_mvl/mxv
+	.byte		BEND  , c_v-24
+	.byte	W03
+	.byte		        c_v-40
+	.byte	W03
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_flame_wheel2_2:
+	.byte	KEYSH , se_m_flame_wheel2_key+0
+	.byte		VOICE , 27
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 110*se_m_flame_wheel2_mvl/mxv
+	.byte		N48   , Gn2 , v032
+	.byte	W18
+	.byte		VOL   , 98*se_m_flame_wheel2_mvl/mxv
+	.byte	W06
+	.byte		        88*se_m_flame_wheel2_mvl/mxv
+	.byte	W06
+	.byte		        68*se_m_flame_wheel2_mvl/mxv
+	.byte	W06
+	.byte		        44*se_m_flame_wheel2_mvl/mxv
+	.byte	W06
+	.byte		        13*se_m_flame_wheel2_mvl/mxv
+	.byte	W06
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_flame_wheel2:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_flame_wheel2_pri	@ Priority
+	.byte	se_m_flame_wheel2_rev	@ Reverb.
+
+	.word	se_m_flame_wheel2_grp
+
+	.word	se_m_flame_wheel2_1
+	.word	se_m_flame_wheel2_2
+
+	.end
diff --git a/sound/songs/se_w053.s b/sound/songs/se_m_flamethrower.s
index 7c414896a..29438337f 100644
--- a/sound/songs/se_w053.s
+++ b/sound/songs/se_m_flamethrower.s
@@ -1,26 +1,26 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w053_grp, voicegroup128
-	.equ	se_w053_pri, 4
-	.equ	se_w053_rev, reverb_set+50
-	.equ	se_w053_mvl, 127
-	.equ	se_w053_key, 0
-	.equ	se_w053_tbs, 1
-	.equ	se_w053_exg, 0
-	.equ	se_w053_cmp, 1
+	.equ	se_m_flamethrower_grp, voicegroup128
+	.equ	se_m_flamethrower_pri, 4
+	.equ	se_m_flamethrower_rev, reverb_set+50
+	.equ	se_m_flamethrower_mvl, 127
+	.equ	se_m_flamethrower_key, 0
+	.equ	se_m_flamethrower_tbs, 1
+	.equ	se_m_flamethrower_exg, 0
+	.equ	se_m_flamethrower_cmp, 1
 
 	.section .rodata
-	.global	se_w053
+	.global	se_m_flamethrower
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w053_1:
-	.byte	KEYSH , se_w053_key+0
-	.byte	TEMPO , 150*se_w053_tbs/2
+se_m_flamethrower_1:
+	.byte	KEYSH , se_m_flamethrower_key+0
+	.byte	TEMPO , 150*se_m_flamethrower_tbs/2
 	.byte		VOICE , 29
 	.byte		BENDR , 12
-	.byte		VOL   , 110*se_w053_mvl/mxv
+	.byte		VOL   , 110*se_m_flamethrower_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+50
 	.byte		TIE   , Cn3 , v127
@@ -66,7 +66,7 @@ se_w053_1:
 	.byte	W03
 	.byte		        c_v+0
 	.byte	W03
-se_w053_1_000:
+se_m_flamethrower_1_000:
 	.byte		PAN   , c_v+4
 	.byte	W03
 	.byte		        c_v-5
@@ -83,48 +83,48 @@ se_w053_1_000:
 	.byte	W03
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w053_1_000
+	 .word	se_m_flamethrower_1_000
 	.byte	PATT
-	 .word	se_w053_1_000
+	 .word	se_m_flamethrower_1_000
 	.byte	PATT
-	 .word	se_w053_1_000
+	 .word	se_m_flamethrower_1_000
 	.byte		PAN   , c_v+4
 	.byte	W03
 	.byte		        c_v-5
 	.byte	W03
-	.byte		VOL   , 103*se_w053_mvl/mxv
+	.byte		VOL   , 103*se_m_flamethrower_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+8
 	.byte	W03
-	.byte		VOL   , 96*se_w053_mvl/mxv
+	.byte		VOL   , 96*se_m_flamethrower_mvl/mxv
 	.byte		PAN   , c_v-9
 	.byte	W04
 	.byte		        c_v+4
 	.byte	W02
-	.byte		VOL   , 88*se_w053_mvl/mxv
+	.byte		VOL   , 88*se_m_flamethrower_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-5
 	.byte	W03
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 73*se_w053_mvl/mxv
+	.byte		VOL   , 73*se_m_flamethrower_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+4
 	.byte	W03
-	.byte		VOL   , 62*se_w053_mvl/mxv
+	.byte		VOL   , 62*se_m_flamethrower_mvl/mxv
 	.byte		PAN   , c_v-5
 	.byte	W04
 	.byte		        c_v+8
 	.byte	W01
-	.byte		VOL   , 47*se_w053_mvl/mxv
+	.byte		VOL   , 47*se_m_flamethrower_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-9
 	.byte	W03
-	.byte		VOL   , 27*se_w053_mvl/mxv
+	.byte		VOL   , 27*se_m_flamethrower_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+4
 	.byte	W04
-	.byte		VOL   , 10*se_w053_mvl/mxv
+	.byte		VOL   , 10*se_m_flamethrower_mvl/mxv
 	.byte		PAN   , c_v-5
 	.byte	W03
 	.byte		        c_v+0
@@ -134,20 +134,20 @@ se_w053_1_000:
 
 @********************** Track  2 **********************@
 
-se_w053_2:
-	.byte	KEYSH , se_w053_key+0
+se_m_flamethrower_2:
+	.byte	KEYSH , se_m_flamethrower_key+0
 	.byte		VOICE , 27
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w053_mvl/mxv
+	.byte		VOL   , 110*se_m_flamethrower_mvl/mxv
 	.byte		N24   , Fn2 , v060
 	.byte	W10
-	.byte		VOL   , 99*se_w053_mvl/mxv
+	.byte		VOL   , 99*se_m_flamethrower_mvl/mxv
 	.byte	W05
-	.byte		        82*se_w053_mvl/mxv
+	.byte		        82*se_m_flamethrower_mvl/mxv
 	.byte	W04
-	.byte		        54*se_w053_mvl/mxv
+	.byte		        54*se_m_flamethrower_mvl/mxv
 	.byte	W02
-	.byte		        25*se_w053_mvl/mxv
+	.byte		        25*se_m_flamethrower_mvl/mxv
 	.byte	W03
 	.byte	W24
 	.byte	W24
@@ -161,15 +161,15 @@ se_w053_2:
 @******************************************************@
 	.align	2
 
-se_w053:
+se_m_flamethrower:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w053_pri	@ Priority
-	.byte	se_w053_rev	@ Reverb.
+	.byte	se_m_flamethrower_pri	@ Priority
+	.byte	se_m_flamethrower_rev	@ Reverb.
 
-	.word	se_w053_grp
+	.word	se_m_flamethrower_grp
 
-	.word	se_w053_1
-	.word	se_w053_2
+	.word	se_m_flamethrower_1
+	.word	se_m_flamethrower_2
 
 	.end
diff --git a/sound/songs/se_m_flatter.s b/sound/songs/se_m_flatter.s
new file mode 100644
index 000000000..e3746c990
--- /dev/null
+++ b/sound/songs/se_m_flatter.s
@@ -0,0 +1,67 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_flatter_grp, voicegroup128
+	.equ	se_m_flatter_pri, 4
+	.equ	se_m_flatter_rev, reverb_set+50
+	.equ	se_m_flatter_mvl, 127
+	.equ	se_m_flatter_key, 0
+	.equ	se_m_flatter_tbs, 1
+	.equ	se_m_flatter_exg, 0
+	.equ	se_m_flatter_cmp, 1
+
+	.section .rodata
+	.global	se_m_flatter
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_flatter_1:
+	.byte	KEYSH , se_m_flatter_key+0
+	.byte	TEMPO , 150*se_m_flatter_tbs/2
+	.byte		VOICE , 41
+	.byte		VOL   , 100*se_m_flatter_mvl/mxv
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+0
+	.byte		N01   , Dn5 , v127
+	.byte	W01
+	.byte		        Gn4 
+	.byte	W01
+	.byte		N09   , En5 
+	.byte	W02
+	.byte		PAN   , c_v+6
+	.byte	W02
+	.byte		VOL   , 92*se_m_flatter_mvl/mxv
+	.byte		PAN   , c_v-8
+	.byte	W01
+	.byte		VOL   , 83*se_m_flatter_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte	W01
+	.byte		VOL   , 71*se_m_flatter_mvl/mxv
+	.byte		PAN   , c_v-8
+	.byte		BEND  , c_v-4
+	.byte	W01
+	.byte		VOL   , 46*se_m_flatter_mvl/mxv
+	.byte		PAN   , c_v+11
+	.byte		BEND  , c_v-8
+	.byte	W01
+	.byte		VOL   , 22*se_m_flatter_mvl/mxv
+	.byte		PAN   , c_v-12
+	.byte		BEND  , c_v-15
+	.byte	W02
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_flatter:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_flatter_pri	@ Priority
+	.byte	se_m_flatter_rev	@ Reverb.
+
+	.word	se_m_flatter_grp
+
+	.word	se_m_flatter_1
+
+	.end
diff --git a/sound/songs/se_w202.s b/sound/songs/se_m_giga_drain.s
index 6149a878d..4596a0252 100644
--- a/sound/songs/se_w202.s
+++ b/sound/songs/se_m_giga_drain.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w202_grp, voicegroup128
-	.equ	se_w202_pri, 4
-	.equ	se_w202_rev, reverb_set+50
-	.equ	se_w202_mvl, 127
-	.equ	se_w202_key, 0
-	.equ	se_w202_tbs, 1
-	.equ	se_w202_exg, 0
-	.equ	se_w202_cmp, 1
+	.equ	se_m_giga_drain_grp, voicegroup128
+	.equ	se_m_giga_drain_pri, 4
+	.equ	se_m_giga_drain_rev, reverb_set+50
+	.equ	se_m_giga_drain_mvl, 127
+	.equ	se_m_giga_drain_key, 0
+	.equ	se_m_giga_drain_tbs, 1
+	.equ	se_m_giga_drain_exg, 0
+	.equ	se_m_giga_drain_cmp, 1
 
 	.section .rodata
-	.global	se_w202
+	.global	se_m_giga_drain
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w202_1:
-	.byte	KEYSH , se_w202_key+0
-	.byte	TEMPO , 150*se_w202_tbs/2
+se_m_giga_drain_1:
+	.byte	KEYSH , se_m_giga_drain_key+0
+	.byte	TEMPO , 150*se_m_giga_drain_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w202_mvl/mxv
+	.byte		VOL   , 110*se_m_giga_drain_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N03   , Gn2 , v127
 	.byte	W02
@@ -68,14 +68,14 @@ se_w202_1:
 @******************************************************@
 	.align	2
 
-se_w202:
+se_m_giga_drain:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w202_pri	@ Priority
-	.byte	se_w202_rev	@ Reverb.
+	.byte	se_m_giga_drain_pri	@ Priority
+	.byte	se_m_giga_drain_rev	@ Reverb.
 
-	.word	se_w202_grp
+	.word	se_m_giga_drain_grp
 
-	.word	se_w202_1
+	.word	se_m_giga_drain_1
 
 	.end
diff --git a/sound/songs/se_w320.s b/sound/songs/se_m_grasswhistle.s
index 82d93b571..111bc2166 100644
--- a/sound/songs/se_w320.s
+++ b/sound/songs/se_m_grasswhistle.s
@@ -1,28 +1,28 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w320_grp, voicegroup128
-	.equ	se_w320_pri, 4
-	.equ	se_w320_rev, reverb_set+50
-	.equ	se_w320_mvl, 127
-	.equ	se_w320_key, 0
-	.equ	se_w320_tbs, 1
-	.equ	se_w320_exg, 0
-	.equ	se_w320_cmp, 1
+	.equ	se_m_grasswhistle_grp, voicegroup128
+	.equ	se_m_grasswhistle_pri, 4
+	.equ	se_m_grasswhistle_rev, reverb_set+50
+	.equ	se_m_grasswhistle_mvl, 127
+	.equ	se_m_grasswhistle_key, 0
+	.equ	se_m_grasswhistle_tbs, 1
+	.equ	se_m_grasswhistle_exg, 0
+	.equ	se_m_grasswhistle_cmp, 1
 
 	.section .rodata
-	.global	se_w320
+	.global	se_m_grasswhistle
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w320_1:
-	.byte	KEYSH , se_w320_key+0
-	.byte	TEMPO , 100*se_w320_tbs/2
+se_m_grasswhistle_1:
+	.byte	KEYSH , se_m_grasswhistle_key+0
+	.byte	TEMPO , 100*se_m_grasswhistle_tbs/2
 	.byte		VOICE , 64
 	.byte		BENDR , 2
 	.byte		LFOS  , 40
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 70*se_w320_mvl/mxv
+	.byte		VOL   , 70*se_m_grasswhistle_mvl/mxv
 	.byte		BEND  , c_v-16
 	.byte		N21   , Gn5 , v112
 	.byte	W03
@@ -52,24 +52,24 @@ se_w320_1:
 	.byte	W12
 	.byte	W12
 	.byte	W06
-	.byte		VOL   , 61*se_w320_mvl/mxv
+	.byte		VOL   , 61*se_m_grasswhistle_mvl/mxv
 	.byte	W06
-	.byte		        51*se_w320_mvl/mxv
+	.byte		        51*se_m_grasswhistle_mvl/mxv
 	.byte	W06
-	.byte		        36*se_w320_mvl/mxv
+	.byte		        36*se_m_grasswhistle_mvl/mxv
 	.byte	W06
-	.byte		        18*se_w320_mvl/mxv
+	.byte		        18*se_m_grasswhistle_mvl/mxv
 	.byte	W12
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w320_2:
-	.byte	KEYSH , se_w320_key+0
+se_m_grasswhistle_2:
+	.byte	KEYSH , se_m_grasswhistle_key+0
 	.byte		VOICE , 64
 	.byte		BENDR , 2
 	.byte		LFOS  , 40
-	.byte		VOL   , 70*se_w320_mvl/mxv
+	.byte		VOL   , 70*se_m_grasswhistle_mvl/mxv
 	.byte	W12
 	.byte		PAN   , c_v+12
 	.byte		BEND  , c_v-16
@@ -103,28 +103,28 @@ se_w320_2:
 	.byte		MOD   , 10
 	.byte	W12
 	.byte	W06
-	.byte		VOL   , 61*se_w320_mvl/mxv
+	.byte		VOL   , 61*se_m_grasswhistle_mvl/mxv
 	.byte	W06
-	.byte		        51*se_w320_mvl/mxv
+	.byte		        51*se_m_grasswhistle_mvl/mxv
 	.byte	W06
-	.byte		        36*se_w320_mvl/mxv
+	.byte		        36*se_m_grasswhistle_mvl/mxv
 	.byte	W06
-	.byte		        18*se_w320_mvl/mxv
+	.byte		        18*se_m_grasswhistle_mvl/mxv
 	.byte	W12
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w320:
+se_m_grasswhistle:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w320_pri	@ Priority
-	.byte	se_w320_rev	@ Reverb.
+	.byte	se_m_grasswhistle_pri	@ Priority
+	.byte	se_m_grasswhistle_rev	@ Reverb.
 
-	.word	se_w320_grp
+	.word	se_m_grasswhistle_grp
 
-	.word	se_w320_1
-	.word	se_w320_2
+	.word	se_m_grasswhistle_1
+	.word	se_m_grasswhistle_2
 
 	.end
diff --git a/sound/songs/se_w258.s b/sound/songs/se_m_hail.s
index e2b1a531f..0c04af212 100644
--- a/sound/songs/se_w258.s
+++ b/sound/songs/se_m_hail.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w258_grp, voicegroup128
-	.equ	se_w258_pri, 4
-	.equ	se_w258_rev, reverb_set+50
-	.equ	se_w258_mvl, 127
-	.equ	se_w258_key, 0
-	.equ	se_w258_tbs, 1
-	.equ	se_w258_exg, 0
-	.equ	se_w258_cmp, 1
+	.equ	se_m_hail_grp, voicegroup128
+	.equ	se_m_hail_pri, 4
+	.equ	se_m_hail_rev, reverb_set+50
+	.equ	se_m_hail_mvl, 127
+	.equ	se_m_hail_key, 0
+	.equ	se_m_hail_tbs, 1
+	.equ	se_m_hail_exg, 0
+	.equ	se_m_hail_cmp, 1
 
 	.section .rodata
-	.global	se_w258
+	.global	se_m_hail
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w258_1:
-	.byte	KEYSH , se_w258_key+0
-	.byte	TEMPO , 150*se_w258_tbs/2
+se_m_hail_1:
+	.byte	KEYSH , se_m_hail_key+0
+	.byte	TEMPO , 150*se_m_hail_tbs/2
 	.byte		VOICE , 3
-	.byte		VOL   , 100*se_w258_mvl/mxv
+	.byte		VOL   , 100*se_m_hail_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , Fn4 , v112
 	.byte	W04
@@ -57,10 +57,10 @@ se_w258_1:
 
 @********************** Track  2 **********************@
 
-se_w258_2:
-	.byte	KEYSH , se_w258_key+0
+se_m_hail_2:
+	.byte	KEYSH , se_m_hail_key+0
 	.byte		VOICE , 4
-	.byte		VOL   , 100*se_w258_mvl/mxv
+	.byte		VOL   , 100*se_m_hail_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , Dn4 , v040
 	.byte	W04
@@ -84,15 +84,15 @@ se_w258_2:
 @******************************************************@
 	.align	2
 
-se_w258:
+se_m_hail:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w258_pri	@ Priority
-	.byte	se_w258_rev	@ Reverb.
+	.byte	se_m_hail_pri	@ Priority
+	.byte	se_m_hail_rev	@ Reverb.
 
-	.word	se_w258_grp
+	.word	se_m_hail_grp
 
-	.word	se_w258_1
-	.word	se_w258_2
+	.word	se_m_hail_1
+	.word	se_m_hail_2
 
 	.end
diff --git a/sound/songs/se_w231.s b/sound/songs/se_m_harden.s
index 46e5ba938..e9bd888de 100644
--- a/sound/songs/se_w231.s
+++ b/sound/songs/se_m_harden.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w231_grp, voicegroup128
-	.equ	se_w231_pri, 4
-	.equ	se_w231_rev, reverb_set+50
-	.equ	se_w231_mvl, 127
-	.equ	se_w231_key, 0
-	.equ	se_w231_tbs, 1
-	.equ	se_w231_exg, 0
-	.equ	se_w231_cmp, 1
+	.equ	se_m_harden_grp, voicegroup128
+	.equ	se_m_harden_pri, 4
+	.equ	se_m_harden_rev, reverb_set+50
+	.equ	se_m_harden_mvl, 127
+	.equ	se_m_harden_key, 0
+	.equ	se_m_harden_tbs, 1
+	.equ	se_m_harden_exg, 0
+	.equ	se_m_harden_cmp, 1
 
 	.section .rodata
-	.global	se_w231
+	.global	se_m_harden
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w231_1:
-	.byte	KEYSH , se_w231_key+0
-	.byte	TEMPO , 150*se_w231_tbs/2
+se_m_harden_1:
+	.byte	KEYSH , se_m_harden_key+0
+	.byte	TEMPO , 150*se_m_harden_tbs/2
 	.byte		VOICE , 28
-	.byte		VOL   , 100*se_w231_mvl/mxv
+	.byte		VOL   , 100*se_m_harden_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+16
 	.byte		N03   , Gs3 , v080
@@ -46,10 +46,10 @@ se_w231_1:
 
 @********************** Track  2 **********************@
 
-se_w231_2:
-	.byte	KEYSH , se_w231_key+0
+se_m_harden_2:
+	.byte	KEYSH , se_m_harden_key+0
 	.byte		VOICE , 4
-	.byte		VOL   , 100*se_w231_mvl/mxv
+	.byte		VOL   , 100*se_m_harden_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , En4 , v060
 	.byte	W04
@@ -60,15 +60,15 @@ se_w231_2:
 @******************************************************@
 	.align	2
 
-se_w231:
+se_m_harden:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w231_pri	@ Priority
-	.byte	se_w231_rev	@ Reverb.
+	.byte	se_m_harden_pri	@ Priority
+	.byte	se_m_harden_rev	@ Reverb.
 
-	.word	se_w231_grp
+	.word	se_m_harden_grp
 
-	.word	se_w231_1
-	.word	se_w231_2
+	.word	se_m_harden_1
+	.word	se_m_harden_2
 
 	.end
diff --git a/sound/songs/se_w114.s b/sound/songs/se_m_haze.s
index 4de8c4ed8..4bf61faa6 100644
--- a/sound/songs/se_w114.s
+++ b/sound/songs/se_m_haze.s
@@ -1,191 +1,191 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w114_grp, voicegroup128
-	.equ	se_w114_pri, 4
-	.equ	se_w114_rev, reverb_set+50
-	.equ	se_w114_mvl, 127
-	.equ	se_w114_key, 0
-	.equ	se_w114_tbs, 1
-	.equ	se_w114_exg, 0
-	.equ	se_w114_cmp, 1
+	.equ	se_m_haze_grp, voicegroup128
+	.equ	se_m_haze_pri, 4
+	.equ	se_m_haze_rev, reverb_set+50
+	.equ	se_m_haze_mvl, 127
+	.equ	se_m_haze_key, 0
+	.equ	se_m_haze_tbs, 1
+	.equ	se_m_haze_exg, 0
+	.equ	se_m_haze_cmp, 1
 
 	.section .rodata
-	.global	se_w114
+	.global	se_m_haze
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w114_1:
-	.byte	KEYSH , se_w114_key+0
-	.byte	TEMPO , 190*se_w114_tbs/2
+se_m_haze_1:
+	.byte	KEYSH , se_m_haze_key+0
+	.byte	TEMPO , 190*se_m_haze_tbs/2
 	.byte		VOICE , 45
 	.byte		BENDR , 8
 	.byte		PAN   , c_v-47
-	.byte		VOL   , 10*se_w114_mvl/mxv
+	.byte		VOL   , 10*se_m_haze_mvl/mxv
 	.byte		MOD   , 30
 	.byte		BEND  , c_v+1
 	.byte		TIE   , As2 , v100
 	.byte	W03
-	.byte		VOL   , 14*se_w114_mvl/mxv
+	.byte		VOL   , 14*se_m_haze_mvl/mxv
 	.byte	W03
-	.byte		        22*se_w114_mvl/mxv
+	.byte		        22*se_m_haze_mvl/mxv
 	.byte		PAN   , c_v-45
 	.byte	W02
-	.byte		VOL   , 31*se_w114_mvl/mxv
+	.byte		VOL   , 31*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        39*se_w114_mvl/mxv
+	.byte		        39*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-43
 	.byte	W02
-	.byte		VOL   , 45*se_w114_mvl/mxv
+	.byte		VOL   , 45*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        50*se_w114_mvl/mxv
+	.byte		        50*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-41
 	.byte	W01
-	.byte		VOL   , 61*se_w114_mvl/mxv
+	.byte		VOL   , 61*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        66*se_w114_mvl/mxv
+	.byte		        66*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-39
-	.byte		VOL   , 73*se_w114_mvl/mxv
+	.byte		VOL   , 73*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        78*se_w114_mvl/mxv
+	.byte		        78*se_m_haze_mvl/mxv
 	.byte	W04
-	.byte		        84*se_w114_mvl/mxv
+	.byte		        84*se_m_haze_mvl/mxv
 	.byte		PAN   , c_v-37
 	.byte	W03
-	.byte		VOL   , 91*se_w114_mvl/mxv
+	.byte		VOL   , 91*se_m_haze_mvl/mxv
 	.byte	W03
-	.byte		        98*se_w114_mvl/mxv
+	.byte		        98*se_m_haze_mvl/mxv
 	.byte		PAN   , c_v-35
 	.byte	W02
-	.byte		VOL   , 104*se_w114_mvl/mxv
+	.byte		VOL   , 104*se_m_haze_mvl/mxv
 	.byte	W04
-	.byte		        110*se_w114_mvl/mxv
+	.byte		        110*se_m_haze_mvl/mxv
 	.byte		PAN   , c_v-32
 	.byte	W06
 	.byte		        c_v-28
 	.byte	W06
 	.byte		        c_v-25
-	.byte		VOL   , 106*se_w114_mvl/mxv
+	.byte		VOL   , 106*se_m_haze_mvl/mxv
 	.byte	W04
-	.byte		        104*se_w114_mvl/mxv
+	.byte		        104*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-23
 	.byte	W03
-	.byte		VOL   , 101*se_w114_mvl/mxv
+	.byte		VOL   , 101*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-20
 	.byte	W03
-	.byte		VOL   , 97*se_w114_mvl/mxv
+	.byte		VOL   , 97*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-17
 	.byte	W02
-	.byte		VOL   , 91*se_w114_mvl/mxv
+	.byte		VOL   , 91*se_m_haze_mvl/mxv
 	.byte	W04
 	.byte		PAN   , c_v-13
 	.byte	W03
-	.byte		VOL   , 88*se_w114_mvl/mxv
+	.byte		VOL   , 88*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-10
 	.byte	W03
-	.byte		VOL   , 81*se_w114_mvl/mxv
+	.byte		VOL   , 81*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-7
 	.byte	W04
-	.byte		VOL   , 75*se_w114_mvl/mxv
+	.byte		VOL   , 75*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-3
 	.byte	W02
-	.byte		VOL   , 74*se_w114_mvl/mxv
+	.byte		VOL   , 74*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        76*se_w114_mvl/mxv
+	.byte		        76*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 79*se_w114_mvl/mxv
+	.byte		VOL   , 79*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        83*se_w114_mvl/mxv
+	.byte		        83*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte	W01
-	.byte		        86*se_w114_mvl/mxv
+	.byte		        86*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+2
-	.byte		VOL   , 90*se_w114_mvl/mxv
+	.byte		VOL   , 90*se_m_haze_mvl/mxv
 	.byte	W03
-	.byte		        95*se_w114_mvl/mxv
+	.byte		        95*se_m_haze_mvl/mxv
 	.byte	W03
-	.byte		        98*se_w114_mvl/mxv
+	.byte		        98*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v+7
-	.byte		VOL   , 102*se_w114_mvl/mxv
+	.byte		VOL   , 102*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		        104*se_w114_mvl/mxv
+	.byte		        104*se_m_haze_mvl/mxv
 	.byte	W04
 	.byte		PAN   , c_v+10
-	.byte		VOL   , 110*se_w114_mvl/mxv
+	.byte		VOL   , 110*se_m_haze_mvl/mxv
 	.byte	W06
 	.byte		PAN   , c_v+14
 	.byte	W06
 	.byte		        c_v+16
 	.byte	W02
-	.byte		VOL   , 106*se_w114_mvl/mxv
+	.byte		VOL   , 106*se_m_haze_mvl/mxv
 	.byte	W04
 	.byte		PAN   , c_v+19
 	.byte	W01
-	.byte		VOL   , 100*se_w114_mvl/mxv
+	.byte		VOL   , 100*se_m_haze_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v+22
-	.byte		VOL   , 94*se_w114_mvl/mxv
+	.byte		VOL   , 94*se_m_haze_mvl/mxv
 	.byte	W06
 	.byte		PAN   , c_v+25
-	.byte		VOL   , 88*se_w114_mvl/mxv
+	.byte		VOL   , 88*se_m_haze_mvl/mxv
 	.byte	W04
-	.byte		        83*se_w114_mvl/mxv
+	.byte		        83*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+27
 	.byte	W06
 	.byte		        c_v+29
-	.byte		VOL   , 75*se_w114_mvl/mxv
+	.byte		VOL   , 75*se_m_haze_mvl/mxv
 	.byte	W06
 	.byte		PAN   , c_v+32
-	.byte		VOL   , 64*se_w114_mvl/mxv
+	.byte		VOL   , 64*se_m_haze_mvl/mxv
 	.byte	W06
 	.byte		PAN   , c_v+34
 	.byte	W01
-	.byte		VOL   , 55*se_w114_mvl/mxv
+	.byte		VOL   , 55*se_m_haze_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v+38
 	.byte	W01
-	.byte		VOL   , 47*se_w114_mvl/mxv
+	.byte		VOL   , 47*se_m_haze_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v+41
 	.byte	W01
-	.byte		VOL   , 41*se_w114_mvl/mxv
+	.byte		VOL   , 41*se_m_haze_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v+44
-	.byte		VOL   , 32*se_w114_mvl/mxv
+	.byte		VOL   , 32*se_m_haze_mvl/mxv
 	.byte	W03
-	.byte		        25*se_w114_mvl/mxv
+	.byte		        25*se_m_haze_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v+47
 	.byte	W01
-	.byte		VOL   , 12*se_w114_mvl/mxv
+	.byte		VOL   , 12*se_m_haze_mvl/mxv
 	.byte	W03
-	.byte		        6*se_w114_mvl/mxv
+	.byte		        6*se_m_haze_mvl/mxv
 	.byte	W02
 	.byte		EOT   
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w114_2:
-	.byte	KEYSH , se_w114_key+0
+se_m_haze_2:
+	.byte	KEYSH , se_m_haze_key+0
 	.byte		VOICE , 70
 	.byte		BENDR , 8
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w114_mvl/mxv
+	.byte		VOL   , 110*se_m_haze_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N24   , Fn4 , v020
 	.byte	W06
@@ -236,15 +236,15 @@ se_w114_2:
 @******************************************************@
 	.align	2
 
-se_w114:
+se_m_haze:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w114_pri	@ Priority
-	.byte	se_w114_rev	@ Reverb.
+	.byte	se_m_haze_pri	@ Priority
+	.byte	se_m_haze_rev	@ Reverb.
 
-	.word	se_w114_grp
+	.word	se_m_haze_grp
 
-	.word	se_w114_1
-	.word	se_w114_2
+	.word	se_m_haze_1
+	.word	se_m_haze_2
 
 	.end
diff --git a/sound/songs/se_w215.s b/sound/songs/se_m_heal_bell.s
index 196686fbd..b2b17f7d8 100644
--- a/sound/songs/se_w215.s
+++ b/sound/songs/se_m_heal_bell.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w215_grp, voicegroup128
-	.equ	se_w215_pri, 4
-	.equ	se_w215_rev, reverb_set+50
-	.equ	se_w215_mvl, 127
-	.equ	se_w215_key, 0
-	.equ	se_w215_tbs, 1
-	.equ	se_w215_exg, 0
-	.equ	se_w215_cmp, 1
+	.equ	se_m_heal_bell_grp, voicegroup128
+	.equ	se_m_heal_bell_pri, 4
+	.equ	se_m_heal_bell_rev, reverb_set+50
+	.equ	se_m_heal_bell_mvl, 127
+	.equ	se_m_heal_bell_key, 0
+	.equ	se_m_heal_bell_tbs, 1
+	.equ	se_m_heal_bell_exg, 0
+	.equ	se_m_heal_bell_cmp, 1
 
 	.section .rodata
-	.global	se_w215
+	.global	se_m_heal_bell
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w215_1:
-	.byte	KEYSH , se_w215_key+0
-	.byte	TEMPO , 150*se_w215_tbs/2
+se_m_heal_bell_1:
+	.byte	KEYSH , se_m_heal_bell_key+0
+	.byte	TEMPO , 150*se_m_heal_bell_tbs/2
 	.byte		VOICE , 51
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 90*se_w215_mvl/mxv
+	.byte		VOL   , 90*se_m_heal_bell_mvl/mxv
 	.byte		BEND  , c_v+4
 	.byte		N03   , As5 , v100
 	.byte	W01
@@ -70,14 +70,14 @@ se_w215_1:
 @******************************************************@
 	.align	2
 
-se_w215:
+se_m_heal_bell:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w215_pri	@ Priority
-	.byte	se_w215_rev	@ Reverb.
+	.byte	se_m_heal_bell_pri	@ Priority
+	.byte	se_m_heal_bell_rev	@ Reverb.
 
-	.word	se_w215_grp
+	.word	se_m_heal_bell_grp
 
-	.word	se_w215_1
+	.word	se_m_heal_bell_1
 
 	.end
diff --git a/sound/songs/se_w257.s b/sound/songs/se_m_heat_wave.s
index 5e9b6d06d..a4b5cc896 100644
--- a/sound/songs/se_w257.s
+++ b/sound/songs/se_m_heat_wave.s
@@ -1,60 +1,60 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w257_grp, voicegroup128
-	.equ	se_w257_pri, 4
-	.equ	se_w257_rev, reverb_set+50
-	.equ	se_w257_mvl, 127
-	.equ	se_w257_key, 0
-	.equ	se_w257_tbs, 1
-	.equ	se_w257_exg, 0
-	.equ	se_w257_cmp, 1
+	.equ	se_m_heat_wave_grp, voicegroup128
+	.equ	se_m_heat_wave_pri, 4
+	.equ	se_m_heat_wave_rev, reverb_set+50
+	.equ	se_m_heat_wave_mvl, 127
+	.equ	se_m_heat_wave_key, 0
+	.equ	se_m_heat_wave_tbs, 1
+	.equ	se_m_heat_wave_exg, 0
+	.equ	se_m_heat_wave_cmp, 1
 
 	.section .rodata
-	.global	se_w257
+	.global	se_m_heat_wave
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w257_1:
-	.byte	KEYSH , se_w257_key+0
-	.byte	TEMPO , 150*se_w257_tbs/2
+se_m_heat_wave_1:
+	.byte	KEYSH , se_m_heat_wave_key+0
+	.byte	TEMPO , 150*se_m_heat_wave_tbs/2
 	.byte		VOICE , 29
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 23*se_w257_mvl/mxv
+	.byte		VOL   , 23*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		TIE   , Fn4 , v127
 	.byte	W01
-	.byte		VOL   , 51*se_w257_mvl/mxv
+	.byte		VOL   , 51*se_m_heat_wave_mvl/mxv
 	.byte	W01
-	.byte		        75*se_w257_mvl/mxv
+	.byte		        75*se_m_heat_wave_mvl/mxv
 	.byte	W01
-	.byte		        99*se_w257_mvl/mxv
+	.byte		        99*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v+8
 	.byte	W01
-	.byte		VOL   , 115*se_w257_mvl/mxv
+	.byte		VOL   , 115*se_m_heat_wave_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+16
 	.byte	W01
-	.byte		VOL   , 99*se_w257_mvl/mxv
+	.byte		VOL   , 99*se_m_heat_wave_mvl/mxv
 	.byte	W02
-	.byte		        92*se_w257_mvl/mxv
+	.byte		        92*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v+7
 	.byte	W01
-	.byte		VOL   , 97*se_w257_mvl/mxv
+	.byte		VOL   , 97*se_m_heat_wave_mvl/mxv
 	.byte	W02
-	.byte		        105*se_w257_mvl/mxv
+	.byte		        105*se_m_heat_wave_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte	W03
-	.byte		VOL   , 110*se_w257_mvl/mxv
+	.byte		VOL   , 110*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v-9
 	.byte	W03
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v-24
 	.byte	W03
-	.byte		VOL   , 115*se_w257_mvl/mxv
+	.byte		VOL   , 115*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v-38
 	.byte	W03
 	.byte		PAN   , c_v+0
@@ -100,78 +100,78 @@ se_w257_1:
 	.byte		BEND  , c_v-3
 	.byte	W02
 	.byte		PAN   , c_v-8
-	.byte		VOL   , 113*se_w257_mvl/mxv
+	.byte		VOL   , 113*se_m_heat_wave_mvl/mxv
 	.byte	W04
-	.byte		        110*se_w257_mvl/mxv
+	.byte		        110*se_m_heat_wave_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte	W02
 	.byte		BEND  , c_v-7
 	.byte	W02
-	.byte		VOL   , 105*se_w257_mvl/mxv
+	.byte		VOL   , 105*se_m_heat_wave_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+6
 	.byte	W03
-	.byte		VOL   , 98*se_w257_mvl/mxv
+	.byte		VOL   , 98*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v-11
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 91*se_w257_mvl/mxv
+	.byte		VOL   , 91*se_m_heat_wave_mvl/mxv
 	.byte	W03
-	.byte		        81*se_w257_mvl/mxv
+	.byte		        81*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v-15
 	.byte	W02
 	.byte		PAN   , c_v-8
 	.byte	W02
-	.byte		VOL   , 74*se_w257_mvl/mxv
+	.byte		VOL   , 74*se_m_heat_wave_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-22
 	.byte	W03
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 63*se_w257_mvl/mxv
+	.byte		VOL   , 63*se_m_heat_wave_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-30
 	.byte	W01
-	.byte		VOL   , 50*se_w257_mvl/mxv
+	.byte		VOL   , 50*se_m_heat_wave_mvl/mxv
 	.byte	W02
-	.byte		        40*se_w257_mvl/mxv
+	.byte		        40*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v-39
 	.byte	W02
 	.byte		PAN   , c_v+6
 	.byte	W01
-	.byte		VOL   , 28*se_w257_mvl/mxv
+	.byte		VOL   , 28*se_m_heat_wave_mvl/mxv
 	.byte		BEND  , c_v-52
 	.byte	W02
-	.byte		VOL   , 17*se_w257_mvl/mxv
+	.byte		VOL   , 17*se_m_heat_wave_mvl/mxv
 	.byte	W03
 	.byte		EOT   
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w257_2:
-	.byte	KEYSH , se_w257_key+0
+se_m_heat_wave_2:
+	.byte	KEYSH , se_m_heat_wave_key+0
 	.byte		VOICE , 27
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 23*se_w257_mvl/mxv
+	.byte		VOL   , 23*se_m_heat_wave_mvl/mxv
 	.byte		N30   , Gn2 , v032
 	.byte	W01
-	.byte		VOL   , 51*se_w257_mvl/mxv
+	.byte		VOL   , 51*se_m_heat_wave_mvl/mxv
 	.byte	W01
-	.byte		        75*se_w257_mvl/mxv
+	.byte		        75*se_m_heat_wave_mvl/mxv
 	.byte	W01
-	.byte		        99*se_w257_mvl/mxv
+	.byte		        99*se_m_heat_wave_mvl/mxv
 	.byte	W01
-	.byte		        115*se_w257_mvl/mxv
+	.byte		        115*se_m_heat_wave_mvl/mxv
 	.byte	W03
-	.byte		        99*se_w257_mvl/mxv
+	.byte		        99*se_m_heat_wave_mvl/mxv
 	.byte	W02
-	.byte		        92*se_w257_mvl/mxv
+	.byte		        92*se_m_heat_wave_mvl/mxv
 	.byte	W01
-	.byte		        97*se_w257_mvl/mxv
+	.byte		        97*se_m_heat_wave_mvl/mxv
 	.byte	W02
-	.byte		        115*se_w257_mvl/mxv
+	.byte		        115*se_m_heat_wave_mvl/mxv
 	.byte	W12
 	.byte		PAN   , c_v+0
 	.byte	W12
@@ -192,15 +192,15 @@ se_w257_2:
 @******************************************************@
 	.align	2
 
-se_w257:
+se_m_heat_wave:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w257_pri	@ Priority
-	.byte	se_w257_rev	@ Reverb.
+	.byte	se_m_heat_wave_pri	@ Priority
+	.byte	se_m_heat_wave_rev	@ Reverb.
 
-	.word	se_w257_grp
+	.word	se_m_heat_wave_grp
 
-	.word	se_w257_1
-	.word	se_w257_2
+	.word	se_m_heat_wave_1
+	.word	se_m_heat_wave_2
 
 	.end
diff --git a/sound/songs/se_w056.s b/sound/songs/se_m_hydro_pump.s
index d553f418f..050f6281b 100644
--- a/sound/songs/se_w056.s
+++ b/sound/songs/se_m_hydro_pump.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w056_grp, voicegroup128
-	.equ	se_w056_pri, 4
-	.equ	se_w056_rev, reverb_set+50
-	.equ	se_w056_mvl, 127
-	.equ	se_w056_key, 0
-	.equ	se_w056_tbs, 1
-	.equ	se_w056_exg, 0
-	.equ	se_w056_cmp, 1
+	.equ	se_m_hydro_pump_grp, voicegroup128
+	.equ	se_m_hydro_pump_pri, 4
+	.equ	se_m_hydro_pump_rev, reverb_set+50
+	.equ	se_m_hydro_pump_mvl, 127
+	.equ	se_m_hydro_pump_key, 0
+	.equ	se_m_hydro_pump_tbs, 1
+	.equ	se_m_hydro_pump_exg, 0
+	.equ	se_m_hydro_pump_cmp, 1
 
 	.section .rodata
-	.global	se_w056
+	.global	se_m_hydro_pump
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w056_1:
-	.byte	KEYSH , se_w056_key+0
-	.byte	TEMPO , 150*se_w056_tbs/2
+se_m_hydro_pump_1:
+	.byte	KEYSH , se_m_hydro_pump_key+0
+	.byte	TEMPO , 150*se_m_hydro_pump_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 115*se_w056_mvl/mxv
+	.byte		VOL   , 115*se_m_hydro_pump_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		TIE   , Gn2 , v127
 	.byte	W06
@@ -53,53 +53,53 @@ se_w056_1:
 	.byte	W06
 	.byte		        c_v+11
 	.byte	W02
-	.byte		VOL   , 103*se_w056_mvl/mxv
+	.byte		VOL   , 103*se_m_hydro_pump_mvl/mxv
 	.byte	W04
 	.byte		PAN   , c_v+4
 	.byte	W01
-	.byte		VOL   , 85*se_w056_mvl/mxv
+	.byte		VOL   , 85*se_m_hydro_pump_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 71*se_w056_mvl/mxv
+	.byte		VOL   , 71*se_m_hydro_pump_mvl/mxv
 	.byte	W05
-	.byte		        52*se_w056_mvl/mxv
+	.byte		        52*se_m_hydro_pump_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte	W04
-	.byte		VOL   , 32*se_w056_mvl/mxv
+	.byte		VOL   , 32*se_m_hydro_pump_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-10
 	.byte	W03
-	.byte		VOL   , 11*se_w056_mvl/mxv
+	.byte		VOL   , 11*se_m_hydro_pump_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-5
 	.byte	W01
-	.byte		VOL   , 6*se_w056_mvl/mxv
+	.byte		VOL   , 6*se_m_hydro_pump_mvl/mxv
 	.byte	W05
 	.byte		EOT   
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w056_2:
-	.byte	KEYSH , se_w056_key+0
-	.byte		VOL   , 58*se_w056_mvl/mxv
+se_m_hydro_pump_2:
+	.byte	KEYSH , se_m_hydro_pump_key+0
+	.byte		VOL   , 58*se_m_hydro_pump_mvl/mxv
 	.byte		N14   , Gn3 , v080
 	.byte	W01
 	.byte		VOICE , 25
-	.byte		VOL   , 76*se_w056_mvl/mxv
+	.byte		VOL   , 76*se_m_hydro_pump_mvl/mxv
 	.byte	W01
-	.byte		        89*se_w056_mvl/mxv
+	.byte		        89*se_m_hydro_pump_mvl/mxv
 	.byte	W01
-	.byte		        100*se_w056_mvl/mxv
+	.byte		        100*se_m_hydro_pump_mvl/mxv
 	.byte	W01
-	.byte		        115*se_w056_mvl/mxv
+	.byte		        115*se_m_hydro_pump_mvl/mxv
 	.byte	W06
-	.byte		        90*se_w056_mvl/mxv
+	.byte		        90*se_m_hydro_pump_mvl/mxv
 	.byte	W02
-	.byte		        76*se_w056_mvl/mxv
+	.byte		        76*se_m_hydro_pump_mvl/mxv
 	.byte	W01
-	.byte		        58*se_w056_mvl/mxv
+	.byte		        58*se_m_hydro_pump_mvl/mxv
 	.byte	W11
 	.byte	W24
 	.byte	W24
@@ -110,15 +110,15 @@ se_w056_2:
 @******************************************************@
 	.align	2
 
-se_w056:
+se_m_hydro_pump:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w056_pri	@ Priority
-	.byte	se_w056_rev	@ Reverb.
+	.byte	se_m_hydro_pump_pri	@ Priority
+	.byte	se_m_hydro_pump_rev	@ Reverb.
 
-	.word	se_w056_grp
+	.word	se_m_hydro_pump_grp
 
-	.word	se_w056_1
-	.word	se_w056_2
+	.word	se_m_hydro_pump_1
+	.word	se_m_hydro_pump_2
 
 	.end
diff --git a/sound/songs/se_w063.s b/sound/songs/se_m_hyper_beam.s
index e2db381bd..bce85a21a 100644
--- a/sound/songs/se_w063.s
+++ b/sound/songs/se_m_hyper_beam.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w063_grp, voicegroup128
-	.equ	se_w063_pri, 4
-	.equ	se_w063_rev, reverb_set+50
-	.equ	se_w063_mvl, 127
-	.equ	se_w063_key, 0
-	.equ	se_w063_tbs, 1
-	.equ	se_w063_exg, 0
-	.equ	se_w063_cmp, 1
+	.equ	se_m_hyper_beam_grp, voicegroup128
+	.equ	se_m_hyper_beam_pri, 4
+	.equ	se_m_hyper_beam_rev, reverb_set+50
+	.equ	se_m_hyper_beam_mvl, 127
+	.equ	se_m_hyper_beam_key, 0
+	.equ	se_m_hyper_beam_tbs, 1
+	.equ	se_m_hyper_beam_exg, 0
+	.equ	se_m_hyper_beam_cmp, 1
 
 	.section .rodata
-	.global	se_w063
+	.global	se_m_hyper_beam
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w063_1:
-	.byte	KEYSH , se_w063_key+0
-	.byte	TEMPO , 150*se_w063_tbs/2
+se_m_hyper_beam_1:
+	.byte	KEYSH , se_m_hyper_beam_key+0
+	.byte	TEMPO , 150*se_m_hyper_beam_tbs/2
 	.byte		VOICE , 18
-	.byte		VOL   , 110*se_w063_mvl/mxv
+	.byte		VOL   , 110*se_m_hyper_beam_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -45,10 +45,10 @@ se_w063_1:
 
 @********************** Track  2 **********************@
 
-se_w063_2:
-	.byte	KEYSH , se_w063_key+0
+se_m_hyper_beam_2:
+	.byte	KEYSH , se_m_hyper_beam_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 110*se_w063_mvl/mxv
+	.byte		VOL   , 110*se_m_hyper_beam_mvl/mxv
 	.byte		N01   , Cn3 , v040
 	.byte	W02
 	.byte		N01   
@@ -57,28 +57,28 @@ se_w063_2:
 	.byte	W02
 	.byte		N01   
 	.byte	W04
-se_w063_2_000:
+se_m_hyper_beam_2_000:
 	.byte		N01   , Cn3 , v020
 	.byte	W02
 	.byte		N01   
 	.byte	W04
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w063_2_000
+	 .word	se_m_hyper_beam_2_000
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w063:
+se_m_hyper_beam:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w063_pri	@ Priority
-	.byte	se_w063_rev	@ Reverb.
+	.byte	se_m_hyper_beam_pri	@ Priority
+	.byte	se_m_hyper_beam_rev	@ Reverb.
 
-	.word	se_w063_grp
+	.word	se_m_hyper_beam_grp
 
-	.word	se_w063_1
-	.word	se_w063_2
+	.word	se_m_hyper_beam_1
+	.word	se_m_hyper_beam_2
 
 	.end
diff --git a/sound/songs/se_w063b.s b/sound/songs/se_m_hyper_beam2.s
index eef257849..304fa7b3f 100644
--- a/sound/songs/se_w063b.s
+++ b/sound/songs/se_m_hyper_beam2.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w063b_grp, voicegroup128
-	.equ	se_w063b_pri, 4
-	.equ	se_w063b_rev, reverb_set+50
-	.equ	se_w063b_mvl, 127
-	.equ	se_w063b_key, 0
-	.equ	se_w063b_tbs, 1
-	.equ	se_w063b_exg, 0
-	.equ	se_w063b_cmp, 1
+	.equ	se_m_hyper_beam2_grp, voicegroup128
+	.equ	se_m_hyper_beam2_pri, 4
+	.equ	se_m_hyper_beam2_rev, reverb_set+50
+	.equ	se_m_hyper_beam2_mvl, 127
+	.equ	se_m_hyper_beam2_key, 0
+	.equ	se_m_hyper_beam2_tbs, 1
+	.equ	se_m_hyper_beam2_exg, 0
+	.equ	se_m_hyper_beam2_cmp, 1
 
 	.section .rodata
-	.global	se_w063b
+	.global	se_m_hyper_beam2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w063b_1:
-	.byte	KEYSH , se_w063b_key+0
-	.byte	TEMPO , 150*se_w063b_tbs/2
+se_m_hyper_beam2_1:
+	.byte	KEYSH , se_m_hyper_beam2_key+0
+	.byte	TEMPO , 150*se_m_hyper_beam2_tbs/2
 	.byte		VOICE , 45
-	.byte		VOL   , 110*se_w063b_mvl/mxv
+	.byte		VOL   , 110*se_m_hyper_beam2_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -76,10 +76,10 @@ se_w063b_1:
 
 @********************** Track  2 **********************@
 
-se_w063b_2:
-	.byte	KEYSH , se_w063b_key+0
+se_m_hyper_beam2_2:
+	.byte	KEYSH , se_m_hyper_beam2_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 110*se_w063b_mvl/mxv
+	.byte		VOL   , 110*se_m_hyper_beam2_mvl/mxv
 	.byte		N01   , Cn3 , v032
 	.byte	W02
 	.byte		N01   
@@ -88,28 +88,28 @@ se_w063b_2:
 	.byte	W02
 	.byte		N01   
 	.byte	W04
-se_w063b_2_000:
+se_m_hyper_beam2_2_000:
 	.byte		N01   , Cn3 , v020
 	.byte	W02
 	.byte		N01   
 	.byte	W04
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w063b_2_000
+	 .word	se_m_hyper_beam2_2_000
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w063b:
+se_m_hyper_beam2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w063b_pri	@ Priority
-	.byte	se_w063b_rev	@ Reverb.
+	.byte	se_m_hyper_beam2_pri	@ Priority
+	.byte	se_m_hyper_beam2_rev	@ Reverb.
 
-	.word	se_w063b_grp
+	.word	se_m_hyper_beam2_grp
 
-	.word	se_w063b_1
-	.word	se_w063b_2
+	.word	se_m_hyper_beam2_1
+	.word	se_m_hyper_beam2_2
 
 	.end
diff --git a/sound/songs/se_w196.s b/sound/songs/se_m_icy_wind.s
index 8a47a8c1b..d15350525 100644
--- a/sound/songs/se_w196.s
+++ b/sound/songs/se_m_icy_wind.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w196_grp, voicegroup128
-	.equ	se_w196_pri, 4
-	.equ	se_w196_rev, reverb_set+50
-	.equ	se_w196_mvl, 127
-	.equ	se_w196_key, 0
-	.equ	se_w196_tbs, 1
-	.equ	se_w196_exg, 0
-	.equ	se_w196_cmp, 1
+	.equ	se_m_icy_wind_grp, voicegroup128
+	.equ	se_m_icy_wind_pri, 4
+	.equ	se_m_icy_wind_rev, reverb_set+50
+	.equ	se_m_icy_wind_mvl, 127
+	.equ	se_m_icy_wind_key, 0
+	.equ	se_m_icy_wind_tbs, 1
+	.equ	se_m_icy_wind_exg, 0
+	.equ	se_m_icy_wind_cmp, 1
 
 	.section .rodata
-	.global	se_w196
+	.global	se_m_icy_wind
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w196_1:
-	.byte	KEYSH , se_w196_key+0
-	.byte	TEMPO , 150*se_w196_tbs/2
+se_m_icy_wind_1:
+	.byte	KEYSH , se_m_icy_wind_key+0
+	.byte	TEMPO , 150*se_m_icy_wind_tbs/2
 	.byte		VOICE , 3
-	.byte		VOL   , 100*se_w196_mvl/mxv
+	.byte		VOL   , 100*se_m_icy_wind_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , Ds4 , v112
 	.byte	W04
@@ -36,10 +36,10 @@ se_w196_1:
 
 @********************** Track  2 **********************@
 
-se_w196_2:
-	.byte	KEYSH , se_w196_key+0
+se_m_icy_wind_2:
+	.byte	KEYSH , se_m_icy_wind_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 100*se_w196_mvl/mxv
+	.byte		VOL   , 100*se_m_icy_wind_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		N01   , Dn4 , v040
 	.byte	W04
@@ -58,15 +58,15 @@ se_w196_2:
 @******************************************************@
 	.align	2
 
-se_w196:
+se_m_icy_wind:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w196_pri	@ Priority
-	.byte	se_w196_rev	@ Reverb.
+	.byte	se_m_icy_wind_pri	@ Priority
+	.byte	se_m_icy_wind_rev	@ Reverb.
 
-	.word	se_w196_grp
+	.word	se_m_icy_wind_grp
 
-	.word	se_w196_1
-	.word	se_w196_2
+	.word	se_m_icy_wind_1
+	.word	se_m_icy_wind_2
 
 	.end
diff --git a/sound/songs/se_w122.s b/sound/songs/se_m_lick.s
index 95eb26ead..1aa0c35a2 100644
--- a/sound/songs/se_w122.s
+++ b/sound/songs/se_m_lick.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w122_grp, voicegroup128
-	.equ	se_w122_pri, 4
-	.equ	se_w122_rev, reverb_set+50
-	.equ	se_w122_mvl, 127
-	.equ	se_w122_key, 0
-	.equ	se_w122_tbs, 1
-	.equ	se_w122_exg, 0
-	.equ	se_w122_cmp, 1
+	.equ	se_m_lick_grp, voicegroup128
+	.equ	se_m_lick_pri, 4
+	.equ	se_m_lick_rev, reverb_set+50
+	.equ	se_m_lick_mvl, 127
+	.equ	se_m_lick_key, 0
+	.equ	se_m_lick_tbs, 1
+	.equ	se_m_lick_exg, 0
+	.equ	se_m_lick_cmp, 1
 
 	.section .rodata
-	.global	se_w122
+	.global	se_m_lick
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w122_1:
-	.byte	KEYSH , se_w122_key+0
-	.byte	TEMPO , 150*se_w122_tbs/2
+se_m_lick_1:
+	.byte	KEYSH , se_m_lick_key+0
+	.byte	TEMPO , 150*se_m_lick_tbs/2
 	.byte		VOICE , 31
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w122_mvl/mxv
+	.byte		VOL   , 110*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v-5
 	.byte		N32   , Cn3 , v127
 	.byte	W01
@@ -68,47 +68,47 @@ se_w122_1:
 	.byte		BEND  , c_v+16
 	.byte	W02
 	.byte		PAN   , c_v-4
-	.byte		VOL   , 102*se_w122_mvl/mxv
+	.byte		VOL   , 102*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+12
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+16
 	.byte	W01
 	.byte		PAN   , c_v+4
-	.byte		VOL   , 97*se_w122_mvl/mxv
+	.byte		VOL   , 97*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+18
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+14
 	.byte	W01
 	.byte		PAN   , c_v-4
-	.byte		VOL   , 92*se_w122_mvl/mxv
+	.byte		VOL   , 92*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+18
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+20
 	.byte	W01
 	.byte		PAN   , c_v+4
-	.byte		VOL   , 88*se_w122_mvl/mxv
+	.byte		VOL   , 88*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+17
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+12
 	.byte	W01
 	.byte		PAN   , c_v-4
-	.byte		VOL   , 81*se_w122_mvl/mxv
+	.byte		VOL   , 81*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+16
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 64*se_w122_mvl/mxv
+	.byte		VOL   , 64*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+12
 	.byte	W02
 	.byte		PAN   , c_v+4
-	.byte		VOL   , 49*se_w122_mvl/mxv
+	.byte		VOL   , 49*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+14
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 25*se_w122_mvl/mxv
+	.byte		VOL   , 25*se_m_lick_mvl/mxv
 	.byte		BEND  , c_v+11
 	.byte	W05
 	.byte	FINE
@@ -116,14 +116,14 @@ se_w122_1:
 @******************************************************@
 	.align	2
 
-se_w122:
+se_m_lick:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w122_pri	@ Priority
-	.byte	se_w122_rev	@ Reverb.
+	.byte	se_m_lick_pri	@ Priority
+	.byte	se_m_lick_rev	@ Reverb.
 
-	.word	se_w122_grp
+	.word	se_m_lick_grp
 
-	.word	se_w122_1
+	.word	se_m_lick_1
 
 	.end
diff --git a/sound/songs/se_w199.s b/sound/songs/se_m_lock_on.s
index 26ffc82b7..d8e1de5b0 100644
--- a/sound/songs/se_w199.s
+++ b/sound/songs/se_m_lock_on.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w199_grp, voicegroup128
-	.equ	se_w199_pri, 4
-	.equ	se_w199_rev, reverb_set+50
-	.equ	se_w199_mvl, 127
-	.equ	se_w199_key, 0
-	.equ	se_w199_tbs, 1
-	.equ	se_w199_exg, 0
-	.equ	se_w199_cmp, 1
+	.equ	se_m_lock_on_grp, voicegroup128
+	.equ	se_m_lock_on_pri, 4
+	.equ	se_m_lock_on_rev, reverb_set+50
+	.equ	se_m_lock_on_mvl, 127
+	.equ	se_m_lock_on_key, 0
+	.equ	se_m_lock_on_tbs, 1
+	.equ	se_m_lock_on_exg, 0
+	.equ	se_m_lock_on_cmp, 1
 
 	.section .rodata
-	.global	se_w199
+	.global	se_m_lock_on
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w199_1:
-	.byte	KEYSH , se_w199_key+0
-	.byte	TEMPO , 150*se_w199_tbs/2
+se_m_lock_on_1:
+	.byte	KEYSH , se_m_lock_on_key+0
+	.byte	TEMPO , 150*se_m_lock_on_tbs/2
 	.byte		VOICE , 40
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w199_mvl/mxv
+	.byte		VOL   , 110*se_m_lock_on_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N01   , Cn4 , v100
 	.byte	W01
@@ -56,14 +56,14 @@ se_w199_1:
 @******************************************************@
 	.align	2
 
-se_w199:
+se_m_lock_on:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w199_pri	@ Priority
-	.byte	se_w199_rev	@ Reverb.
+	.byte	se_m_lock_on_pri	@ Priority
+	.byte	se_m_lock_on_rev	@ Reverb.
 
-	.word	se_w199_grp
+	.word	se_m_lock_on_grp
 
-	.word	se_w199_1
+	.word	se_m_lock_on_1
 
 	.end
diff --git a/sound/songs/se_w118.s b/sound/songs/se_m_metronome.s
index 3c4d1404c..ba0a55d8b 100644
--- a/sound/songs/se_w118.s
+++ b/sound/songs/se_m_metronome.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w118_grp, voicegroup128
-	.equ	se_w118_pri, 4
-	.equ	se_w118_rev, reverb_set+50
-	.equ	se_w118_mvl, 127
-	.equ	se_w118_key, 0
-	.equ	se_w118_tbs, 1
-	.equ	se_w118_exg, 0
-	.equ	se_w118_cmp, 1
+	.equ	se_m_metronome_grp, voicegroup128
+	.equ	se_m_metronome_pri, 4
+	.equ	se_m_metronome_rev, reverb_set+50
+	.equ	se_m_metronome_mvl, 127
+	.equ	se_m_metronome_key, 0
+	.equ	se_m_metronome_tbs, 1
+	.equ	se_m_metronome_exg, 0
+	.equ	se_m_metronome_cmp, 1
 
 	.section .rodata
-	.global	se_w118
+	.global	se_m_metronome
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w118_1:
-	.byte	KEYSH , se_w118_key+0
-	.byte	TEMPO , 150*se_w118_tbs/2
+se_m_metronome_1:
+	.byte	KEYSH , se_m_metronome_key+0
+	.byte	TEMPO , 150*se_m_metronome_tbs/2
 	.byte		VOICE , 37
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 115*se_w118_mvl/mxv
+	.byte		VOL   , 115*se_m_metronome_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N15   , En3 , v127
 	.byte	W01
@@ -66,14 +66,14 @@ se_w118_1:
 @******************************************************@
 	.align	2
 
-se_w118:
+se_m_metronome:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w118_pri	@ Priority
-	.byte	se_w118_rev	@ Reverb.
+	.byte	se_m_metronome_pri	@ Priority
+	.byte	se_m_metronome_rev	@ Reverb.
 
-	.word	se_w118_grp
+	.word	se_m_metronome_grp
 
-	.word	se_w118_1
+	.word	se_m_metronome_1
 
 	.end
diff --git a/sound/songs/se_w208.s b/sound/songs/se_m_milk_drink.s
index b26ce23d7..30a051540 100644
--- a/sound/songs/se_w208.s
+++ b/sound/songs/se_m_milk_drink.s
@@ -1,42 +1,42 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w208_grp, voicegroup128
-	.equ	se_w208_pri, 4
-	.equ	se_w208_rev, reverb_set+50
-	.equ	se_w208_mvl, 127
-	.equ	se_w208_key, 0
-	.equ	se_w208_tbs, 1
-	.equ	se_w208_exg, 0
-	.equ	se_w208_cmp, 1
+	.equ	se_m_milk_drink_grp, voicegroup128
+	.equ	se_m_milk_drink_pri, 4
+	.equ	se_m_milk_drink_rev, reverb_set+50
+	.equ	se_m_milk_drink_mvl, 127
+	.equ	se_m_milk_drink_key, 0
+	.equ	se_m_milk_drink_tbs, 1
+	.equ	se_m_milk_drink_exg, 0
+	.equ	se_m_milk_drink_cmp, 1
 
 	.section .rodata
-	.global	se_w208
+	.global	se_m_milk_drink
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w208_1:
-	.byte	KEYSH , se_w208_key+0
-	.byte	TEMPO , 180*se_w208_tbs/2
+se_m_milk_drink_1:
+	.byte	KEYSH , se_m_milk_drink_key+0
+	.byte	TEMPO , 180*se_m_milk_drink_tbs/2
 	.byte		VOICE , 16
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 100*se_w208_mvl/mxv
+	.byte		VOL   , 100*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , An6 , v100
 	.byte	W01
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 90*se_w208_mvl/mxv
+	.byte		VOL   , 90*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 77*se_w208_mvl/mxv
+	.byte		VOL   , 77*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 37*se_w208_mvl/mxv
+	.byte		VOL   , 37*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W02
 	.byte		N02   , An6 , v056
@@ -44,7 +44,7 @@ se_w208_1:
 	.byte		PAN   , c_v+5
 	.byte	W01
 	.byte		        c_v-6
-	.byte		VOL   , 100*se_w208_mvl/mxv
+	.byte		VOL   , 100*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , An6 , v100
 	.byte	W01
@@ -52,15 +52,15 @@ se_w208_1:
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 90*se_w208_mvl/mxv
+	.byte		VOL   , 90*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W02
 	.byte		PAN   , c_v+1
-	.byte		VOL   , 77*se_w208_mvl/mxv
+	.byte		VOL   , 77*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 37*se_w208_mvl/mxv
+	.byte		VOL   , 37*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W01
 	.byte		PAN   , c_v-6
@@ -69,7 +69,7 @@ se_w208_1:
 	.byte		PAN   , c_v+8
 	.byte	W01
 	.byte		        c_v-10
-	.byte		VOL   , 100*se_w208_mvl/mxv
+	.byte		VOL   , 100*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , An6 , v072
 	.byte	W02
@@ -77,15 +77,15 @@ se_w208_1:
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 90*se_w208_mvl/mxv
+	.byte		VOL   , 90*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 77*se_w208_mvl/mxv
+	.byte		VOL   , 77*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 37*se_w208_mvl/mxv
+	.byte		VOL   , 37*se_m_milk_drink_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W01
 	.byte		PAN   , c_v-10
@@ -95,10 +95,10 @@ se_w208_1:
 
 @********************** Track  2 **********************@
 
-se_w208_2:
-	.byte	KEYSH , se_w208_key+0
+se_m_milk_drink_2:
+	.byte	KEYSH , se_m_milk_drink_key+0
 	.byte		VOICE , 53
-	.byte		VOL   , 100*se_w208_mvl/mxv
+	.byte		VOL   , 100*se_m_milk_drink_mvl/mxv
 	.byte	W02
 	.byte		N06   , Fs6 , v040
 	.byte	W04
@@ -115,15 +115,15 @@ se_w208_2:
 @******************************************************@
 	.align	2
 
-se_w208:
+se_m_milk_drink:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w208_pri	@ Priority
-	.byte	se_w208_rev	@ Reverb.
+	.byte	se_m_milk_drink_pri	@ Priority
+	.byte	se_m_milk_drink_rev	@ Reverb.
 
-	.word	se_w208_grp
+	.word	se_m_milk_drink_grp
 
-	.word	se_w208_1
-	.word	se_w208_2
+	.word	se_m_milk_drink_1
+	.word	se_m_milk_drink_2
 
 	.end
diff --git a/sound/songs/se_w107.s b/sound/songs/se_m_minimize.s
index da7bc3d39..565450b2b 100644
--- a/sound/songs/se_w107.s
+++ b/sound/songs/se_m_minimize.s
@@ -1,58 +1,58 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w107_grp, voicegroup128
-	.equ	se_w107_pri, 4
-	.equ	se_w107_rev, reverb_set+50
-	.equ	se_w107_mvl, 127
-	.equ	se_w107_key, 0
-	.equ	se_w107_tbs, 1
-	.equ	se_w107_exg, 0
-	.equ	se_w107_cmp, 1
+	.equ	se_m_minimize_grp, voicegroup128
+	.equ	se_m_minimize_pri, 4
+	.equ	se_m_minimize_rev, reverb_set+50
+	.equ	se_m_minimize_mvl, 127
+	.equ	se_m_minimize_key, 0
+	.equ	se_m_minimize_tbs, 1
+	.equ	se_m_minimize_exg, 0
+	.equ	se_m_minimize_cmp, 1
 
 	.section .rodata
-	.global	se_w107
+	.global	se_m_minimize
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w107_1:
-	.byte	KEYSH , se_w107_key+0
-	.byte	TEMPO , 150*se_w107_tbs/2
+se_m_minimize_1:
+	.byte	KEYSH , se_m_minimize_key+0
+	.byte	TEMPO , 150*se_m_minimize_tbs/2
 	.byte		VOICE , 45
 	.byte		BENDR , 24
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 32*se_w107_mvl/mxv
+	.byte		VOL   , 32*se_m_minimize_mvl/mxv
 	.byte		MOD   , 30
 	.byte		BEND  , c_v+39
 	.byte		N06   , Dn4 , v127
 	.byte	W01
 	.byte		BEND  , c_v+31
 	.byte	W01
-	.byte		VOL   , 49*se_w107_mvl/mxv
+	.byte		VOL   , 49*se_m_minimize_mvl/mxv
 	.byte		PAN   , c_v+5
 	.byte		BEND  , c_v+23
 	.byte	W01
 	.byte		        c_v+15
 	.byte	W01
-	.byte		VOL   , 61*se_w107_mvl/mxv
+	.byte		VOL   , 61*se_m_minimize_mvl/mxv
 	.byte		BEND  , c_v+8
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+35
 	.byte		N06   , Cn4 , v116
 	.byte	W01
-	.byte		VOL   , 71*se_w107_mvl/mxv
+	.byte		VOL   , 71*se_m_minimize_mvl/mxv
 	.byte		BEND  , c_v+27
 	.byte	W01
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+19
 	.byte	W01
-	.byte		VOL   , 81*se_w107_mvl/mxv
+	.byte		VOL   , 81*se_m_minimize_mvl/mxv
 	.byte		BEND  , c_v+12
 	.byte	W01
 	.byte		        c_v+5
 	.byte	W02
-	.byte		VOL   , 95*se_w107_mvl/mxv
+	.byte		VOL   , 95*se_m_minimize_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+32
 	.byte		N06   , Bn3 , v112
@@ -92,20 +92,20 @@ se_w107_1:
 	.byte	W01
 	.byte		        c_v-6
 	.byte	W02
-	.byte		VOL   , 82*se_w107_mvl/mxv
+	.byte		VOL   , 82*se_m_minimize_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+21
 	.byte		N06   , Fn3 , v100
 	.byte	W01
 	.byte		BEND  , c_v+13
 	.byte	W01
-	.byte		VOL   , 71*se_w107_mvl/mxv
+	.byte		VOL   , 71*se_m_minimize_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v+5
 	.byte	W01
 	.byte		        c_v-2
 	.byte	W01
-	.byte		VOL   , 61*se_w107_mvl/mxv
+	.byte		VOL   , 61*se_m_minimize_mvl/mxv
 	.byte		BEND  , c_v-10
 	.byte	W02
 	.byte		PAN   , c_v+0
@@ -152,14 +152,14 @@ se_w107_1:
 @******************************************************@
 	.align	2
 
-se_w107:
+se_m_minimize:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w107_pri	@ Priority
-	.byte	se_w107_rev	@ Reverb.
+	.byte	se_m_minimize_pri	@ Priority
+	.byte	se_m_minimize_rev	@ Reverb.
 
-	.word	se_w107_grp
+	.word	se_m_minimize_grp
 
-	.word	se_w107_1
+	.word	se_m_minimize_1
 
 	.end
diff --git a/sound/songs/se_w054.s b/sound/songs/se_m_mist.s
index 712dc3338..f46eb130a 100644
--- a/sound/songs/se_w054.s
+++ b/sound/songs/se_m_mist.s
@@ -1,48 +1,48 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w054_grp, voicegroup128
-	.equ	se_w054_pri, 4
-	.equ	se_w054_rev, reverb_set+50
-	.equ	se_w054_mvl, 127
-	.equ	se_w054_key, 0
-	.equ	se_w054_tbs, 1
-	.equ	se_w054_exg, 0
-	.equ	se_w054_cmp, 1
+	.equ	se_m_mist_grp, voicegroup128
+	.equ	se_m_mist_pri, 4
+	.equ	se_m_mist_rev, reverb_set+50
+	.equ	se_m_mist_mvl, 127
+	.equ	se_m_mist_key, 0
+	.equ	se_m_mist_tbs, 1
+	.equ	se_m_mist_exg, 0
+	.equ	se_m_mist_cmp, 1
 
 	.section .rodata
-	.global	se_w054
+	.global	se_m_mist
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w054_1:
-	.byte	KEYSH , se_w054_key+0
-	.byte	TEMPO , 150*se_w054_tbs/2
+se_m_mist_1:
+	.byte	KEYSH , se_m_mist_key+0
+	.byte	TEMPO , 150*se_m_mist_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 7*se_w054_mvl/mxv
+	.byte		VOL   , 7*se_m_mist_mvl/mxv
 	.byte		BEND  , c_v+1
 	.byte		N18   , Cn5 , v052
 	.byte	W01
-	.byte		VOL   , 20*se_w054_mvl/mxv
+	.byte		VOL   , 20*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v+16
 	.byte		BEND  , c_v-8
 	.byte	W01
-	.byte		VOL   , 41*se_w054_mvl/mxv
+	.byte		VOL   , 41*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v-14
 	.byte		BEND  , c_v-16
 	.byte	W01
-	.byte		VOL   , 70*se_w054_mvl/mxv
+	.byte		VOL   , 70*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v+16
 	.byte		BEND  , c_v-8
 	.byte	W01
-	.byte		VOL   , 93*se_w054_mvl/mxv
+	.byte		VOL   , 93*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v-14
 	.byte		BEND  , c_v+0
 	.byte	W02
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w054_mvl/mxv
+	.byte		VOL   , 110*se_m_mist_mvl/mxv
 	.byte		BEND  , c_v+8
 	.byte	W01
 	.byte		PAN   , c_v+16
@@ -50,30 +50,30 @@ se_w054_1:
 	.byte	W01
 	.byte		PAN   , c_v-14
 	.byte	W01
-	.byte		VOL   , 98*se_w054_mvl/mxv
+	.byte		VOL   , 98*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v+16
 	.byte		BEND  , c_v+10
 	.byte	W01
-	.byte		VOL   , 85*se_w054_mvl/mxv
+	.byte		VOL   , 85*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v-14
 	.byte		BEND  , c_v+4
 	.byte	W02
-	.byte		VOL   , 69*se_w054_mvl/mxv
+	.byte		VOL   , 69*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-7
 	.byte	W01
-	.byte		VOL   , 51*se_w054_mvl/mxv
+	.byte		VOL   , 51*se_m_mist_mvl/mxv
 	.byte		PAN   , c_v+16
 	.byte		BEND  , c_v-22
 	.byte	W01
 	.byte		PAN   , c_v-14
-	.byte		VOL   , 38*se_w054_mvl/mxv
+	.byte		VOL   , 38*se_m_mist_mvl/mxv
 	.byte		BEND  , c_v-28
 	.byte	W01
-	.byte		VOL   , 17*se_w054_mvl/mxv
+	.byte		VOL   , 17*se_m_mist_mvl/mxv
 	.byte		BEND  , c_v-32
 	.byte	W01
-	.byte		VOL   , 4*se_w054_mvl/mxv
+	.byte		VOL   , 4*se_m_mist_mvl/mxv
 	.byte		BEND  , c_v-38
 	.byte	W08
 	.byte	FINE
@@ -81,14 +81,14 @@ se_w054_1:
 @******************************************************@
 	.align	2
 
-se_w054:
+se_m_mist:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w054_pri	@ Priority
-	.byte	se_w054_rev	@ Reverb.
+	.byte	se_m_mist_pri	@ Priority
+	.byte	se_m_mist_rev	@ Reverb.
 
-	.word	se_w054_grp
+	.word	se_m_mist_grp
 
-	.word	se_w054_1
+	.word	se_m_mist_1
 
 	.end
diff --git a/sound/songs/se_w236.s b/sound/songs/se_m_moonlight.s
index c3bb3d90f..bd4410b32 100644
--- a/sound/songs/se_w236.s
+++ b/sound/songs/se_m_moonlight.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w236_grp, voicegroup128
-	.equ	se_w236_pri, 4
-	.equ	se_w236_rev, reverb_set+50
-	.equ	se_w236_mvl, 127
-	.equ	se_w236_key, 0
-	.equ	se_w236_tbs, 1
-	.equ	se_w236_exg, 0
-	.equ	se_w236_cmp, 1
+	.equ	se_m_moonlight_grp, voicegroup128
+	.equ	se_m_moonlight_pri, 4
+	.equ	se_m_moonlight_rev, reverb_set+50
+	.equ	se_m_moonlight_mvl, 127
+	.equ	se_m_moonlight_key, 0
+	.equ	se_m_moonlight_tbs, 1
+	.equ	se_m_moonlight_exg, 0
+	.equ	se_m_moonlight_cmp, 1
 
 	.section .rodata
-	.global	se_w236
+	.global	se_m_moonlight
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w236_1:
-	.byte	KEYSH , se_w236_key+0
-	.byte	TEMPO , 150*se_w236_tbs/2
+se_m_moonlight_1:
+	.byte	KEYSH , se_m_moonlight_key+0
+	.byte	TEMPO , 150*se_m_moonlight_tbs/2
 	.byte		VOICE , 46
-	.byte		VOL   , 100*se_w236_mvl/mxv
+	.byte		VOL   , 100*se_m_moonlight_mvl/mxv
 	.byte		BENDR , 4
 	.byte		PAN   , c_v+0
 	.byte		MOD   , 6
@@ -32,7 +32,7 @@ se_w236_1:
 	.byte	W01
 	.byte		N20   , Gn6 , v100
 	.byte	W21
-se_w236_1_000:
+se_m_moonlight_1_000:
 	.byte		N01   , Ds6 , v056
 	.byte	W01
 	.byte		        Dn6 
@@ -50,7 +50,7 @@ se_w236_1_000:
 	.byte		        c_v-4
 	.byte	W04
 	.byte	PEND
-se_w236_1_001:
+se_m_moonlight_1_001:
 	.byte		PAN   , c_v+0
 	.byte		N01   , Gs5 , v092
 	.byte	W01
@@ -61,7 +61,7 @@ se_w236_1_001:
 	.byte		N20   , Cn6 , v100
 	.byte	W21
 	.byte	PEND
-se_w236_1_002:
+se_m_moonlight_1_002:
 	.byte		PAN   , c_v+16
 	.byte		N01   , Gs5 , v056
 	.byte	W01
@@ -72,7 +72,7 @@ se_w236_1_002:
 	.byte		N20   , Cn6 , v064
 	.byte	W21
 	.byte	PEND
-se_w236_1_003:
+se_m_moonlight_1_003:
 	.byte		PAN   , c_v-16
 	.byte		N01   , Gs5 , v040
 	.byte	W01
@@ -83,7 +83,7 @@ se_w236_1_003:
 	.byte		N20   , Cn6 
 	.byte	W21
 	.byte	PEND
-se_w236_1_004:
+se_m_moonlight_1_004:
 	.byte		PAN   , c_v+32
 	.byte		N01   , Gs5 , v020
 	.byte	W01
@@ -105,24 +105,24 @@ se_w236_1_004:
 	.byte		N20   , Gn6 , v100
 	.byte	W21
 	.byte	PATT
-	 .word	se_w236_1_000
+	 .word	se_m_moonlight_1_000
 	.byte	PATT
-	 .word	se_w236_1_001
+	 .word	se_m_moonlight_1_001
 	.byte	PATT
-	 .word	se_w236_1_002
+	 .word	se_m_moonlight_1_002
 	.byte	PATT
-	 .word	se_w236_1_003
+	 .word	se_m_moonlight_1_003
 	.byte	PATT
-	 .word	se_w236_1_004
+	 .word	se_m_moonlight_1_004
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w236_2:
-	.byte	KEYSH , se_w236_key+0
+se_m_moonlight_2:
+	.byte	KEYSH , se_m_moonlight_key+0
 	.byte		VOICE , 55
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 39*se_w236_mvl/mxv
+	.byte		VOL   , 39*se_m_moonlight_mvl/mxv
 	.byte		BEND  , c_v-4
 	.byte	W10
 	.byte		N01   , Ds6 , v112
@@ -135,7 +135,7 @@ se_w236_2:
 	.byte	W05
 	.byte		        Gn6 , v096
 	.byte	W05
-se_w236_2_000:
+se_m_moonlight_2_000:
 	.byte		PAN   , c_v+50
 	.byte		N04   , Gn6 , v080
 	.byte	W04
@@ -149,7 +149,7 @@ se_w236_2_000:
 	.byte		N04   , Gn6 , v032
 	.byte	W10
 	.byte	PEND
-se_w236_2_001:
+se_m_moonlight_2_001:
 	.byte		PAN   , c_v+0
 	.byte	W10
 	.byte		N01   , Gs5 , v112
@@ -163,7 +163,7 @@ se_w236_2_001:
 	.byte		        Cn6 , v096
 	.byte	W05
 	.byte	PEND
-se_w236_2_002:
+se_m_moonlight_2_002:
 	.byte		PAN   , c_v+50
 	.byte		N04   , Cn6 , v080
 	.byte	W04
@@ -192,11 +192,11 @@ se_w236_2_002:
 	.byte		        Gn6 , v096
 	.byte	W05
 	.byte	PATT
-	 .word	se_w236_2_000
+	 .word	se_m_moonlight_2_000
 	.byte	PATT
-	 .word	se_w236_2_001
+	 .word	se_m_moonlight_2_001
 	.byte	PATT
-	 .word	se_w236_2_002
+	 .word	se_m_moonlight_2_002
 	.byte	W24
 	.byte	W24
 	.byte	FINE
@@ -204,15 +204,15 @@ se_w236_2_002:
 @******************************************************@
 	.align	2
 
-se_w236:
+se_m_moonlight:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w236_pri	@ Priority
-	.byte	se_w236_rev	@ Reverb.
+	.byte	se_m_moonlight_pri	@ Priority
+	.byte	se_m_moonlight_rev	@ Reverb.
 
-	.word	se_w236_grp
+	.word	se_m_moonlight_grp
 
-	.word	se_w236_1
-	.word	se_w236_2
+	.word	se_m_moonlight_1
+	.word	se_m_moonlight_2
 
 	.end
diff --git a/sound/songs/se_w234.s b/sound/songs/se_m_morning_sun.s
index 4f07ef30a..ac7667246 100644
--- a/sound/songs/se_w234.s
+++ b/sound/songs/se_m_morning_sun.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w234_grp, voicegroup128
-	.equ	se_w234_pri, 5
-	.equ	se_w234_rev, reverb_set+50
-	.equ	se_w234_mvl, 127
-	.equ	se_w234_key, 0
-	.equ	se_w234_tbs, 1
-	.equ	se_w234_exg, 0
-	.equ	se_w234_cmp, 1
+	.equ	se_m_morning_sun_grp, voicegroup128
+	.equ	se_m_morning_sun_pri, 5
+	.equ	se_m_morning_sun_rev, reverb_set+50
+	.equ	se_m_morning_sun_mvl, 127
+	.equ	se_m_morning_sun_key, 0
+	.equ	se_m_morning_sun_tbs, 1
+	.equ	se_m_morning_sun_exg, 0
+	.equ	se_m_morning_sun_cmp, 1
 
 	.section .rodata
-	.global	se_w234
+	.global	se_m_morning_sun
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w234_1:
-	.byte	KEYSH , se_w234_key+0
-	.byte	TEMPO , 150*se_w234_tbs/2
+se_m_morning_sun_1:
+	.byte	KEYSH , se_m_morning_sun_key+0
+	.byte	TEMPO , 150*se_m_morning_sun_tbs/2
 	.byte		VOICE , 46
-	.byte		VOL   , 95*se_w234_mvl/mxv
+	.byte		VOL   , 95*se_m_morning_sun_mvl/mxv
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
@@ -72,11 +72,11 @@ se_w234_1:
 
 @********************** Track  2 **********************@
 
-se_w234_2:
-	.byte	KEYSH , se_w234_key+0
+se_m_morning_sun_2:
+	.byte	KEYSH , se_m_morning_sun_key+0
 	.byte		VOICE , 53
 	.byte		BENDR , 2
-	.byte		VOL   , 43*se_w234_mvl/mxv
+	.byte		VOL   , 43*se_m_morning_sun_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
 	.byte		N06   , Gs6 , v108
@@ -121,15 +121,15 @@ se_w234_2:
 @******************************************************@
 	.align	2
 
-se_w234:
+se_m_morning_sun:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w234_pri	@ Priority
-	.byte	se_w234_rev	@ Reverb.
+	.byte	se_m_morning_sun_pri	@ Priority
+	.byte	se_m_morning_sun_rev	@ Reverb.
 
-	.word	se_w234_grp
+	.word	se_m_morning_sun_grp
 
-	.word	se_w234_1
-	.word	se_w234_2
+	.word	se_m_morning_sun_1
+	.word	se_m_morning_sun_2
 
 	.end
diff --git a/sound/songs/se_w171.s b/sound/songs/se_m_nightmare.s
index a953faa50..825bfaea2 100644
--- a/sound/songs/se_w171.s
+++ b/sound/songs/se_m_nightmare.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w171_grp, voicegroup128
-	.equ	se_w171_pri, 4
-	.equ	se_w171_rev, reverb_set+50
-	.equ	se_w171_mvl, 127
-	.equ	se_w171_key, 0
-	.equ	se_w171_tbs, 1
-	.equ	se_w171_exg, 0
-	.equ	se_w171_cmp, 1
+	.equ	se_m_nightmare_grp, voicegroup128
+	.equ	se_m_nightmare_pri, 4
+	.equ	se_m_nightmare_rev, reverb_set+50
+	.equ	se_m_nightmare_mvl, 127
+	.equ	se_m_nightmare_key, 0
+	.equ	se_m_nightmare_tbs, 1
+	.equ	se_m_nightmare_exg, 0
+	.equ	se_m_nightmare_cmp, 1
 
 	.section .rodata
-	.global	se_w171
+	.global	se_m_nightmare
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w171_1:
-	.byte	KEYSH , se_w171_key+0
-	.byte	TEMPO , 220*se_w171_tbs/2
+se_m_nightmare_1:
+	.byte	KEYSH , se_m_nightmare_key+0
+	.byte	TEMPO , 220*se_m_nightmare_tbs/2
 	.byte		VOICE , 3
-	.byte		VOL   , 110*se_w171_mvl/mxv
+	.byte		VOL   , 110*se_m_nightmare_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -65,12 +65,12 @@ se_w171_1:
 
 @********************** Track  2 **********************@
 
-se_w171_2:
-	.byte	KEYSH , se_w171_key+0
+se_m_nightmare_2:
+	.byte	KEYSH , se_m_nightmare_key+0
 	.byte		VOICE , 20
 	.byte		XCMD  , xIECV , 10
 	.byte		        xIECL , 8
-	.byte		VOL   , 110*se_w171_mvl/mxv
+	.byte		VOL   , 110*se_m_nightmare_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v+55
 	.byte		N03   , Cn2 , v100
@@ -132,15 +132,15 @@ se_w171_2:
 @******************************************************@
 	.align	2
 
-se_w171:
+se_m_nightmare:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w171_pri	@ Priority
-	.byte	se_w171_rev	@ Reverb.
+	.byte	se_m_nightmare_pri	@ Priority
+	.byte	se_m_nightmare_rev	@ Reverb.
 
-	.word	se_w171_grp
+	.word	se_m_nightmare_grp
 
-	.word	se_w171_1
-	.word	se_w171_2
+	.word	se_m_nightmare_1
+	.word	se_m_nightmare_2
 
 	.end
diff --git a/sound/songs/se_m_perish_song.s b/sound/songs/se_m_perish_song.s
new file mode 100644
index 000000000..af30e2457
--- /dev/null
+++ b/sound/songs/se_m_perish_song.s
@@ -0,0 +1,221 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_perish_song_grp, voicegroup128
+	.equ	se_m_perish_song_pri, 4
+	.equ	se_m_perish_song_rev, reverb_set+50
+	.equ	se_m_perish_song_mvl, 127
+	.equ	se_m_perish_song_key, 0
+	.equ	se_m_perish_song_tbs, 1
+	.equ	se_m_perish_song_exg, 0
+	.equ	se_m_perish_song_cmp, 1
+
+	.section .rodata
+	.global	se_m_perish_song
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_perish_song_1:
+	.byte	KEYSH , se_m_perish_song_key+0
+	.byte	TEMPO , 100*se_m_perish_song_tbs/2
+	.byte		VOICE , 73
+	.byte		BENDR , 12
+	.byte		LFOS  , 40
+	.byte		PAN   , c_v+7
+	.byte		VOL   , 25*se_m_perish_song_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte	W03
+	.byte		VOL   , 29*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        33*se_m_perish_song_mvl/mxv
+	.byte		N48   , An3 , v112
+	.byte	W03
+	.byte		VOL   , 40*se_m_perish_song_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+4
+	.byte	W02
+se_m_perish_song_1_000:
+	.byte		VOL   , 45*se_m_perish_song_mvl/mxv
+	.byte		MOD   , 8
+	.byte	W03
+	.byte		VOL   , 51*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	PEND
+se_m_perish_song_1_001:
+	.byte		VOL   , 56*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		VOL   , 62*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	PEND
+se_m_perish_song_1_002:
+	.byte		VOL   , 72*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v-4
+	.byte	W03
+	.byte		VOL   , 81*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	PEND
+se_m_perish_song_1_003:
+	.byte		VOL   , 92*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v-8
+	.byte	W03
+	.byte		VOL   , 100*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	PEND
+	.byte		PAN   , c_v-4
+	.byte	W06
+	.byte		VOL   , 82*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		VOL   , 52*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        25*se_m_perish_song_mvl/mxv
+	.byte		MOD   , 0
+	.byte		PAN   , c_v+4
+	.byte	W03
+	.byte		VOL   , 29*se_m_perish_song_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+7
+	.byte	W02
+	.byte		VOL   , 33*se_m_perish_song_mvl/mxv
+	.byte		N72   , Gs3 , v112
+	.byte	W03
+	.byte		VOL   , 40*se_m_perish_song_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+4
+	.byte	W02
+	.byte	PATT
+	 .word	se_m_perish_song_1_000
+	.byte	PATT
+	 .word	se_m_perish_song_1_001
+	.byte	PATT
+	 .word	se_m_perish_song_1_002
+	.byte	PATT
+	 .word	se_m_perish_song_1_003
+	.byte		PAN   , c_v-4
+	.byte	W06
+	.byte		        c_v+0
+	.byte	W06
+	.byte		        c_v+4
+	.byte	W03
+	.byte		VOL   , 87*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        75*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v+7
+	.byte	W03
+	.byte		VOL   , 62*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        48*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v+4
+	.byte	W03
+	.byte		VOL   , 33*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        25*se_m_perish_song_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W02
+	.byte		VOL   , 10*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	W01
+	.byte		PAN   , c_v-4
+	.byte	W05
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_perish_song_2:
+	.byte	KEYSH , se_m_perish_song_key+0
+	.byte		VOICE , 73
+	.byte		VOL   , 25*se_m_perish_song_mvl/mxv
+	.byte		PAN   , c_v-17
+	.byte		N48   , Cn4 , v100
+	.byte	W03
+	.byte		VOL   , 29*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        33*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        40*se_m_perish_song_mvl/mxv
+	.byte	W03
+se_m_perish_song_2_000:
+	.byte		VOL   , 45*se_m_perish_song_mvl/mxv
+	.byte		MOD   , 8
+	.byte	W03
+	.byte		VOL   , 51*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	PEND
+	.byte		        56*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        62*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        72*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        81*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        92*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        100*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	W06
+	.byte		        82*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        52*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        25*se_m_perish_song_mvl/mxv
+	.byte		MOD   , 0
+	.byte		N72   , Bn3 , v100
+	.byte	W03
+	.byte		VOL   , 29*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        33*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        40*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	PATT
+	 .word	se_m_perish_song_2_000
+	.byte		VOL   , 56*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        62*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        72*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        81*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        92*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        100*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	W06
+	.byte	W06
+	.byte	W03
+	.byte		        87*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        75*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        62*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        48*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        33*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        25*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte		        10*se_m_perish_song_mvl/mxv
+	.byte	W03
+	.byte	W06
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_perish_song:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_perish_song_pri	@ Priority
+	.byte	se_m_perish_song_rev	@ Reverb.
+
+	.word	se_m_perish_song_grp
+
+	.word	se_m_perish_song_1
+	.word	se_m_perish_song_2
+
+	.end
diff --git a/sound/songs/se_w080.s b/sound/songs/se_m_petal_dance.s
index 0027a0d65..c8ad2810d 100644
--- a/sound/songs/se_w080.s
+++ b/sound/songs/se_m_petal_dance.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w080_grp, voicegroup128
-	.equ	se_w080_pri, 4
-	.equ	se_w080_rev, reverb_set+50
-	.equ	se_w080_mvl, 127
-	.equ	se_w080_key, 0
-	.equ	se_w080_tbs, 1
-	.equ	se_w080_exg, 0
-	.equ	se_w080_cmp, 1
+	.equ	se_m_petal_dance_grp, voicegroup128
+	.equ	se_m_petal_dance_pri, 4
+	.equ	se_m_petal_dance_rev, reverb_set+50
+	.equ	se_m_petal_dance_mvl, 127
+	.equ	se_m_petal_dance_key, 0
+	.equ	se_m_petal_dance_tbs, 1
+	.equ	se_m_petal_dance_exg, 0
+	.equ	se_m_petal_dance_cmp, 1
 
 	.section .rodata
-	.global	se_w080
+	.global	se_m_petal_dance
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w080_1:
-	.byte	KEYSH , se_w080_key+0
-	.byte	TEMPO , 150*se_w080_tbs/2
+se_m_petal_dance_1:
+	.byte	KEYSH , se_m_petal_dance_key+0
+	.byte	TEMPO , 150*se_m_petal_dance_tbs/2
 	.byte		VOICE , 46
-	.byte		VOL   , 95*se_w080_mvl/mxv
+	.byte		VOL   , 95*se_m_petal_dance_mvl/mxv
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
@@ -112,11 +112,11 @@ se_w080_1:
 
 @********************** Track  2 **********************@
 
-se_w080_2:
-	.byte	KEYSH , se_w080_key+0
+se_m_petal_dance_2:
+	.byte	KEYSH , se_m_petal_dance_key+0
 	.byte		VOICE , 53
 	.byte		BENDR , 2
-	.byte		VOL   , 43*se_w080_mvl/mxv
+	.byte		VOL   , 43*se_m_petal_dance_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+15
 	.byte		N06   , En6 , v108
@@ -191,15 +191,15 @@ se_w080_2:
 @******************************************************@
 	.align	2
 
-se_w080:
+se_m_petal_dance:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w080_pri	@ Priority
-	.byte	se_w080_rev	@ Reverb.
+	.byte	se_m_petal_dance_pri	@ Priority
+	.byte	se_m_petal_dance_rev	@ Reverb.
 
-	.word	se_w080_grp
+	.word	se_m_petal_dance_grp
 
-	.word	se_w080_1
-	.word	se_w080_2
+	.word	se_m_petal_dance_1
+	.word	se_m_petal_dance_2
 
 	.end
diff --git a/sound/songs/se_m_poison_powder.s b/sound/songs/se_m_poison_powder.s
new file mode 100644
index 000000000..f48637385
--- /dev/null
+++ b/sound/songs/se_m_poison_powder.s
@@ -0,0 +1,58 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_poison_powder_grp, voicegroup128
+	.equ	se_m_poison_powder_pri, 4
+	.equ	se_m_poison_powder_rev, reverb_set+50
+	.equ	se_m_poison_powder_mvl, 127
+	.equ	se_m_poison_powder_key, 0
+	.equ	se_m_poison_powder_tbs, 1
+	.equ	se_m_poison_powder_exg, 0
+	.equ	se_m_poison_powder_cmp, 1
+
+	.section .rodata
+	.global	se_m_poison_powder
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_poison_powder_1:
+	.byte	KEYSH , se_m_poison_powder_key+0
+	.byte	TEMPO , 150*se_m_poison_powder_tbs/2
+	.byte		VOICE , 18
+	.byte		BENDR , 12
+	.byte		VOL   , 55*se_m_poison_powder_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+1
+	.byte		N01   , Cn6 , v100
+	.byte	W01
+	.byte		VOL   , 110*se_m_poison_powder_mvl/mxv
+	.byte	W01
+	.byte		VOICE , 36
+	.byte		VOL   , 55*se_m_poison_powder_mvl/mxv
+	.byte		N02   , Gn6 , v080
+	.byte	W01
+	.byte		VOL   , 110*se_m_poison_powder_mvl/mxv
+	.byte	W04
+	.byte		PAN   , c_v+20
+	.byte		N01   , Gn6 , v024
+	.byte	W03
+	.byte		        Gn6 , v016
+	.byte	W02
+	.byte		PAN   , c_v-21
+	.byte	W12
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_poison_powder:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_poison_powder_pri	@ Priority
+	.byte	se_m_poison_powder_rev	@ Reverb.
+
+	.word	se_m_poison_powder_grp
+
+	.word	se_m_poison_powder_1
+
+	.end
diff --git a/sound/songs/se_w060.s b/sound/songs/se_m_psybeam.s
index 520720429..c7f68cffd 100644
--- a/sound/songs/se_w060.s
+++ b/sound/songs/se_m_psybeam.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w060_grp, voicegroup128
-	.equ	se_w060_pri, 4
-	.equ	se_w060_rev, reverb_set+50
-	.equ	se_w060_mvl, 127
-	.equ	se_w060_key, 0
-	.equ	se_w060_tbs, 1
-	.equ	se_w060_exg, 0
-	.equ	se_w060_cmp, 1
+	.equ	se_m_psybeam_grp, voicegroup128
+	.equ	se_m_psybeam_pri, 4
+	.equ	se_m_psybeam_rev, reverb_set+50
+	.equ	se_m_psybeam_mvl, 127
+	.equ	se_m_psybeam_key, 0
+	.equ	se_m_psybeam_tbs, 1
+	.equ	se_m_psybeam_exg, 0
+	.equ	se_m_psybeam_cmp, 1
 
 	.section .rodata
-	.global	se_w060
+	.global	se_m_psybeam
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w060_1:
-	.byte	KEYSH , se_w060_key+0
-	.byte	TEMPO , 190*se_w060_tbs/2
+se_m_psybeam_1:
+	.byte	KEYSH , se_m_psybeam_key+0
+	.byte	TEMPO , 190*se_m_psybeam_tbs/2
 	.byte		VOICE , 45
 	.byte		BENDR , 8
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 38*se_w060_mvl/mxv
+	.byte		VOL   , 38*se_m_psybeam_mvl/mxv
 	.byte		MOD   , 30
 	.byte		BEND  , c_v+1
 	.byte		N42   , As2 , v120
@@ -29,26 +29,26 @@ se_w060_1:
 	.byte		PAN   , c_v+3
 	.byte	W01
 	.byte		        c_v+5
-	.byte		VOL   , 57*se_w060_mvl/mxv
+	.byte		VOL   , 57*se_m_psybeam_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+9
 	.byte	W01
-	.byte		VOL   , 71*se_w060_mvl/mxv
+	.byte		VOL   , 71*se_m_psybeam_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+5
 	.byte	W01
 	.byte		        c_v+1
-	.byte		VOL   , 82*se_w060_mvl/mxv
+	.byte		VOL   , 82*se_m_psybeam_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v-3
-	.byte		VOL   , 94*se_w060_mvl/mxv
+	.byte		VOL   , 94*se_m_psybeam_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte	W02
 	.byte		        c_v-10
-	.byte		VOL   , 110*se_w060_mvl/mxv
+	.byte		VOL   , 110*se_m_psybeam_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-6
 	.byte	W01
@@ -66,79 +66,79 @@ se_w060_1:
 	.byte		        c_v+5
 	.byte	W02
 	.byte		        c_v+1
-	.byte		VOL   , 95*se_w060_mvl/mxv
+	.byte		VOL   , 95*se_m_psybeam_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v-3
-	.byte		VOL   , 83*se_w060_mvl/mxv
+	.byte		VOL   , 83*se_m_psybeam_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte	W01
 	.byte		        c_v-10
-	.byte		VOL   , 71*se_w060_mvl/mxv
+	.byte		VOL   , 71*se_m_psybeam_mvl/mxv
 	.byte	W02
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 56*se_w060_mvl/mxv
+	.byte		VOL   , 56*se_m_psybeam_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-3
 	.byte	W01
-	.byte		VOL   , 38*se_w060_mvl/mxv
+	.byte		VOL   , 38*se_m_psybeam_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w060_2:
-	.byte	KEYSH , se_w060_key+0
+se_m_psybeam_2:
+	.byte	KEYSH , se_m_psybeam_key+0
 	.byte		VOICE , 47
 	.byte		BENDR , 8
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 38*se_w060_mvl/mxv
+	.byte		VOL   , 38*se_m_psybeam_mvl/mxv
 	.byte		MOD   , 30
 	.byte		BEND  , c_v+1
 	.byte		N42   , As1 , v040
 	.byte	W02
-	.byte		VOL   , 57*se_w060_mvl/mxv
+	.byte		VOL   , 57*se_m_psybeam_mvl/mxv
 	.byte	W02
-	.byte		        71*se_w060_mvl/mxv
+	.byte		        71*se_m_psybeam_mvl/mxv
 	.byte	W02
 	.byte	W01
-	.byte		        82*se_w060_mvl/mxv
+	.byte		        82*se_m_psybeam_mvl/mxv
 	.byte	W02
-	.byte		        94*se_w060_mvl/mxv
+	.byte		        94*se_m_psybeam_mvl/mxv
 	.byte	W03
-	.byte		        110*se_w060_mvl/mxv
+	.byte		        110*se_m_psybeam_mvl/mxv
 	.byte	W06
 	.byte	W06
 	.byte	W06
-	.byte		        95*se_w060_mvl/mxv
+	.byte		        95*se_m_psybeam_mvl/mxv
 	.byte	W02
-	.byte		        83*se_w060_mvl/mxv
+	.byte		        83*se_m_psybeam_mvl/mxv
 	.byte	W02
-	.byte		        71*se_w060_mvl/mxv
+	.byte		        71*se_m_psybeam_mvl/mxv
 	.byte	W02
 	.byte	W01
-	.byte		        56*se_w060_mvl/mxv
+	.byte		        56*se_m_psybeam_mvl/mxv
 	.byte	W02
-	.byte		        38*se_w060_mvl/mxv
+	.byte		        38*se_m_psybeam_mvl/mxv
 	.byte	W03
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w060:
+se_m_psybeam:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w060_pri	@ Priority
-	.byte	se_w060_rev	@ Reverb.
+	.byte	se_m_psybeam_pri	@ Priority
+	.byte	se_m_psybeam_rev	@ Reverb.
 
-	.word	se_w060_grp
+	.word	se_m_psybeam_grp
 
-	.word	se_w060_1
-	.word	se_w060_2
+	.word	se_m_psybeam_1
+	.word	se_m_psybeam_2
 
 	.end
diff --git a/sound/songs/se_w060b.s b/sound/songs/se_m_psybeam2.s
index 45dc69634..e26a844c9 100644
--- a/sound/songs/se_w060b.s
+++ b/sound/songs/se_m_psybeam2.s
@@ -1,43 +1,43 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w060b_grp, voicegroup128
-	.equ	se_w060b_pri, 4
-	.equ	se_w060b_rev, reverb_set+50
-	.equ	se_w060b_mvl, 127
-	.equ	se_w060b_key, 0
-	.equ	se_w060b_tbs, 1
-	.equ	se_w060b_exg, 0
-	.equ	se_w060b_cmp, 1
+	.equ	se_m_psybeam2_grp, voicegroup128
+	.equ	se_m_psybeam2_pri, 4
+	.equ	se_m_psybeam2_rev, reverb_set+50
+	.equ	se_m_psybeam2_mvl, 127
+	.equ	se_m_psybeam2_key, 0
+	.equ	se_m_psybeam2_tbs, 1
+	.equ	se_m_psybeam2_exg, 0
+	.equ	se_m_psybeam2_cmp, 1
 
 	.section .rodata
-	.global	se_w060b
+	.global	se_m_psybeam2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w060b_1:
-	.byte	KEYSH , se_w060b_key+0
-	.byte	TEMPO , 190*se_w060b_tbs/2
+se_m_psybeam2_1:
+	.byte	KEYSH , se_m_psybeam2_key+0
+	.byte	TEMPO , 190*se_m_psybeam2_tbs/2
 	.byte		VOICE , 45
 	.byte		BENDR , 8
-	.byte		VOL   , 36*se_w060b_mvl/mxv
+	.byte		VOL   , 36*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-44
 	.byte		N12   , Gs2 , v127
 	.byte	W01
-	.byte		VOL   , 52*se_w060b_mvl/mxv
+	.byte		VOL   , 52*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 67*se_w060b_mvl/mxv
+	.byte		VOL   , 67*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 78*se_w060b_mvl/mxv
+	.byte		VOL   , 78*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+27
 	.byte	W01
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+44
 	.byte	W02
@@ -47,42 +47,42 @@ se_w060b_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+44
 	.byte	W01
-	.byte		VOL   , 86*se_w060b_mvl/mxv
+	.byte		VOL   , 86*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+28
 	.byte	W01
-	.byte		VOL   , 55*se_w060b_mvl/mxv
+	.byte		VOL   , 55*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 33*se_w060b_mvl/mxv
+	.byte		VOL   , 33*se_m_psybeam2_mvl/mxv
 	.byte		BEND  , c_v+5
 	.byte	W02
 	.byte		VOICE , 37
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		N02   , Gs3 , v080
 	.byte	W01
 	.byte		BEND  , c_v+16
 	.byte	W01
 	.byte		VOICE , 45
-	.byte		VOL   , 36*se_w060b_mvl/mxv
+	.byte		VOL   , 36*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-44
 	.byte		N12   , As2 , v127
 	.byte	W01
-	.byte		VOL   , 52*se_w060b_mvl/mxv
+	.byte		VOL   , 52*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 67*se_w060b_mvl/mxv
+	.byte		VOL   , 67*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+17
 	.byte	W02
-	.byte		VOL   , 78*se_w060b_mvl/mxv
+	.byte		VOL   , 78*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+27
 	.byte	W01
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+11
 	.byte		BEND  , c_v+44
 	.byte	W01
@@ -92,41 +92,41 @@ se_w060b_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+44
 	.byte	W01
-	.byte		VOL   , 86*se_w060b_mvl/mxv
+	.byte		VOL   , 86*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+11
 	.byte		BEND  , c_v+28
 	.byte	W02
-	.byte		VOL   , 55*se_w060b_mvl/mxv
+	.byte		VOL   , 55*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-11
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 33*se_w060b_mvl/mxv
+	.byte		VOL   , 33*se_m_psybeam2_mvl/mxv
 	.byte		BEND  , c_v+5
 	.byte	W01
 	.byte		VOICE , 37
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		N02   , As3 , v056
 	.byte	W01
 	.byte		BEND  , c_v+16
 	.byte	W01
 	.byte		VOICE , 45
-	.byte		VOL   , 36*se_w060b_mvl/mxv
+	.byte		VOL   , 36*se_m_psybeam2_mvl/mxv
 	.byte		BEND  , c_v-44
 	.byte		N12   , Gs2 , v080
 	.byte	W02
-	.byte		VOL   , 52*se_w060b_mvl/mxv
+	.byte		VOL   , 52*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 67*se_w060b_mvl/mxv
+	.byte		VOL   , 67*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 78*se_w060b_mvl/mxv
+	.byte		VOL   , 78*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+27
 	.byte	W01
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+44
 	.byte	W01
@@ -136,42 +136,42 @@ se_w060b_1:
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+44
 	.byte	W01
-	.byte		VOL   , 86*se_w060b_mvl/mxv
+	.byte		VOL   , 86*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+28
 	.byte	W01
-	.byte		VOL   , 55*se_w060b_mvl/mxv
+	.byte		VOL   , 55*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 33*se_w060b_mvl/mxv
+	.byte		VOL   , 33*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+5
 	.byte	W01
 	.byte		VOICE , 37
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		N02   , Gs3 , v024
 	.byte	W02
 	.byte		BEND  , c_v+16
 	.byte	W01
 	.byte		VOICE , 45
-	.byte		VOL   , 36*se_w060b_mvl/mxv
+	.byte		VOL   , 36*se_m_psybeam2_mvl/mxv
 	.byte		BEND  , c_v-44
 	.byte		N12   , As2 , v040
 	.byte	W01
-	.byte		VOL   , 52*se_w060b_mvl/mxv
+	.byte		VOL   , 52*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 67*se_w060b_mvl/mxv
+	.byte		VOL   , 67*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 78*se_w060b_mvl/mxv
+	.byte		VOL   , 78*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+27
 	.byte	W02
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+44
 	.byte	W01
@@ -181,19 +181,19 @@ se_w060b_1:
 	.byte		PAN   , c_v-11
 	.byte		BEND  , c_v+44
 	.byte	W01
-	.byte		VOL   , 86*se_w060b_mvl/mxv
+	.byte		VOL   , 86*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+28
 	.byte	W01
-	.byte		VOL   , 55*se_w060b_mvl/mxv
+	.byte		VOL   , 55*se_m_psybeam2_mvl/mxv
 	.byte		PAN   , c_v+11
 	.byte		BEND  , c_v+17
 	.byte	W02
-	.byte		VOL   , 33*se_w060b_mvl/mxv
+	.byte		VOL   , 33*se_m_psybeam2_mvl/mxv
 	.byte		BEND  , c_v+5
 	.byte	W01
 	.byte		VOICE , 37
-	.byte		VOL   , 105*se_w060b_mvl/mxv
+	.byte		VOL   , 105*se_m_psybeam2_mvl/mxv
 	.byte		N02   , As3 , v016
 	.byte	W01
 	.byte		BEND  , c_v+16
@@ -203,14 +203,14 @@ se_w060b_1:
 @******************************************************@
 	.align	2
 
-se_w060b:
+se_m_psybeam2:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w060b_pri	@ Priority
-	.byte	se_w060b_rev	@ Reverb.
+	.byte	se_m_psybeam2_pri	@ Priority
+	.byte	se_m_psybeam2_rev	@ Reverb.
 
-	.word	se_w060b_grp
+	.word	se_m_psybeam2_grp
 
-	.word	se_w060b_1
+	.word	se_m_psybeam2_1
 
 	.end
diff --git a/sound/songs/se_m_rain_dance.s b/sound/songs/se_m_rain_dance.s
new file mode 100644
index 000000000..810be0663
--- /dev/null
+++ b/sound/songs/se_m_rain_dance.s
@@ -0,0 +1,116 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_rain_dance_grp, voicegroup128
+	.equ	se_m_rain_dance_pri, 4
+	.equ	se_m_rain_dance_rev, reverb_set+50
+	.equ	se_m_rain_dance_mvl, 127
+	.equ	se_m_rain_dance_key, 0
+	.equ	se_m_rain_dance_tbs, 1
+	.equ	se_m_rain_dance_exg, 0
+	.equ	se_m_rain_dance_cmp, 1
+
+	.section .rodata
+	.global	se_m_rain_dance
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_rain_dance_1:
+	.byte	KEYSH , se_m_rain_dance_key+0
+	.byte	TEMPO , 220*se_m_rain_dance_tbs/2
+	.byte		VOICE , 36
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 20*se_m_rain_dance_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		TIE   , Gn3 , v064
+	.byte	W03
+	.byte		VOL   , 37*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        53*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        60*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        71*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        81*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        93*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        110*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v+3
+	.byte	W06
+	.byte		        c_v+11
+	.byte	W12
+	.byte		        c_v+20
+	.byte	W06
+	.byte		        c_v+25
+	.byte	W12
+	.byte		        c_v+14
+	.byte	W06
+	.byte		        c_v+8
+	.byte	W06
+	.byte	W06
+	.byte		        c_v-3
+	.byte	W12
+	.byte		        c_v-16
+	.byte	W06
+	.byte	W06
+	.byte		        c_v-26
+	.byte	W12
+	.byte		        c_v-16
+	.byte	W06
+	.byte		VOL   , 104*se_m_rain_dance_mvl/mxv
+	.byte		PAN   , c_v-5
+	.byte	W03
+	.byte		VOL   , 101*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        98*se_m_rain_dance_mvl/mxv
+	.byte		PAN   , c_v+6
+	.byte	W03
+	.byte		VOL   , 93*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        90*se_m_rain_dance_mvl/mxv
+	.byte		PAN   , c_v+14
+	.byte	W03
+	.byte		VOL   , 86*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        83*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        77*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        73*se_m_rain_dance_mvl/mxv
+	.byte		PAN   , c_v+24
+	.byte	W03
+	.byte		VOL   , 66*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        58*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        44*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        32*se_m_rain_dance_mvl/mxv
+	.byte		PAN   , c_v+15
+	.byte	W03
+	.byte		VOL   , 16*se_m_rain_dance_mvl/mxv
+	.byte	W03
+	.byte		        1*se_m_rain_dance_mvl/mxv
+	.byte		PAN   , c_v+4
+	.byte	W06
+	.byte		EOT   
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_rain_dance:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_rain_dance_pri	@ Priority
+	.byte	se_m_rain_dance_rev	@ Reverb.
+
+	.word	se_m_rain_dance_grp
+
+	.word	se_m_rain_dance_1
+
+	.end
diff --git a/sound/songs/se_w115.s b/sound/songs/se_m_reflect.s
index 4f9bfb71a..56699c65e 100644
--- a/sound/songs/se_w115.s
+++ b/sound/songs/se_m_reflect.s
@@ -1,99 +1,99 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w115_grp, voicegroup128
-	.equ	se_w115_pri, 4
-	.equ	se_w115_rev, reverb_set+50
-	.equ	se_w115_mvl, 127
-	.equ	se_w115_key, 0
-	.equ	se_w115_tbs, 1
-	.equ	se_w115_exg, 0
-	.equ	se_w115_cmp, 1
+	.equ	se_m_reflect_grp, voicegroup128
+	.equ	se_m_reflect_pri, 4
+	.equ	se_m_reflect_rev, reverb_set+50
+	.equ	se_m_reflect_mvl, 127
+	.equ	se_m_reflect_key, 0
+	.equ	se_m_reflect_tbs, 1
+	.equ	se_m_reflect_exg, 0
+	.equ	se_m_reflect_cmp, 1
 
 	.section .rodata
-	.global	se_w115
+	.global	se_m_reflect
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w115_1:
-	.byte	KEYSH , se_w115_key+0
-	.byte	TEMPO , 150*se_w115_tbs/2
+se_m_reflect_1:
+	.byte	KEYSH , se_m_reflect_key+0
+	.byte	TEMPO , 150*se_m_reflect_tbs/2
 	.byte		VOICE , 19
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v+6
 	.byte		N06   , Gn6 , v080
 	.byte	W01
 	.byte		BEND  , c_v-4
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-14
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-31
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-41
 	.byte	W02
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , Gn6 , v072
 	.byte	W01
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W02
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-1
 	.byte		N06   , Gn6 , v068
 	.byte	W01
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-21
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-38
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-48
 	.byte	W02
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-1
 	.byte		N06   , Gn6 , v060
 	.byte	W01
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-21
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-38
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-48
 	.byte	W02
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte		N06   , Gn6 , v052
 	.byte	W01
@@ -101,19 +101,19 @@ se_w115_1:
 	.byte		BEND  , c_v-12
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-22
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-39
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-49
 	.byte	W02
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte		N06   , Gn6 , v048
 	.byte	W01
@@ -121,18 +121,18 @@ se_w115_1:
 	.byte		BEND  , c_v-12
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-22
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-39
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-49
 	.byte	W02
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte		N06   , Gn6 , v040
 	.byte	W01
@@ -140,19 +140,19 @@ se_w115_1:
 	.byte		BEND  , c_v-13
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-22
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-39
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-49
 	.byte	W02
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte		N06   , Gn6 , v032
 	.byte	W01
@@ -160,15 +160,15 @@ se_w115_1:
 	.byte		BEND  , c_v-13
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-22
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-39
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 20*se_w115_mvl/mxv
+	.byte		VOL   , 20*se_m_reflect_mvl/mxv
 	.byte		BEND  , c_v-49
 	.byte	W02
 	.byte	W06
@@ -176,92 +176,92 @@ se_w115_1:
 
 @********************** Track  2 **********************@
 
-se_w115_2:
-	.byte	KEYSH , se_w115_key+0
+se_m_reflect_2:
+	.byte	KEYSH , se_m_reflect_key+0
 	.byte		VOICE , 53
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 90*se_w115_mvl/mxv
+	.byte		VOL   , 90*se_m_reflect_mvl/mxv
 	.byte	W02
 	.byte		N06   , En6 , v064
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
-	.byte		        60*se_w115_mvl/mxv
+	.byte		        60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w115_mvl/mxv
+	.byte		        90*se_m_reflect_mvl/mxv
 	.byte		N06   , En6 , v056
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
-se_w115_2_000:
-	.byte		VOL   , 60*se_w115_mvl/mxv
+se_m_reflect_2_000:
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w115_mvl/mxv
+	.byte		        90*se_m_reflect_mvl/mxv
 	.byte		N06   , En6 , v052
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w115_2_000
-	.byte		VOL   , 60*se_w115_mvl/mxv
+	 .word	se_m_reflect_2_000
+	.byte		VOL   , 60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w115_mvl/mxv
+	.byte		        90*se_m_reflect_mvl/mxv
 	.byte		N06   , En6 , v048
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
-	.byte		        60*se_w115_mvl/mxv
+	.byte		        60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w115_mvl/mxv
+	.byte		        90*se_m_reflect_mvl/mxv
 	.byte		N06   , En6 , v044
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
-	.byte		        60*se_w115_mvl/mxv
+	.byte		        60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w115_mvl/mxv
+	.byte		        90*se_m_reflect_mvl/mxv
 	.byte		N06   , En6 , v040
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
-	.byte		        60*se_w115_mvl/mxv
+	.byte		        60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        90*se_w115_mvl/mxv
+	.byte		        90*se_m_reflect_mvl/mxv
 	.byte		N06   , En6 , v036
 	.byte	W02
-	.byte		VOL   , 74*se_w115_mvl/mxv
+	.byte		VOL   , 74*se_m_reflect_mvl/mxv
 	.byte	W02
-	.byte		        60*se_w115_mvl/mxv
+	.byte		        60*se_m_reflect_mvl/mxv
 	.byte	W01
-	.byte		        20*se_w115_mvl/mxv
+	.byte		        20*se_m_reflect_mvl/mxv
 	.byte	W05
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w115:
+se_m_reflect:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w115_pri	@ Priority
-	.byte	se_w115_rev	@ Reverb.
+	.byte	se_m_reflect_pri	@ Priority
+	.byte	se_m_reflect_rev	@ Reverb.
 
-	.word	se_w115_grp
+	.word	se_m_reflect_grp
 
-	.word	se_w115_1
-	.word	se_w115_2
+	.word	se_m_reflect_1
+	.word	se_m_reflect_2
 
 	.end
diff --git a/sound/songs/se_w179.s b/sound/songs/se_m_reversal.s
index 9ea055b44..609c399f5 100644
--- a/sound/songs/se_w179.s
+++ b/sound/songs/se_m_reversal.s
@@ -1,33 +1,33 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w179_grp, voicegroup128
-	.equ	se_w179_pri, 4
-	.equ	se_w179_rev, reverb_set+50
-	.equ	se_w179_mvl, 127
-	.equ	se_w179_key, 0
-	.equ	se_w179_tbs, 1
-	.equ	se_w179_exg, 0
-	.equ	se_w179_cmp, 1
+	.equ	se_m_reversal_grp, voicegroup128
+	.equ	se_m_reversal_pri, 4
+	.equ	se_m_reversal_rev, reverb_set+50
+	.equ	se_m_reversal_mvl, 127
+	.equ	se_m_reversal_key, 0
+	.equ	se_m_reversal_tbs, 1
+	.equ	se_m_reversal_exg, 0
+	.equ	se_m_reversal_cmp, 1
 
 	.section .rodata
-	.global	se_w179
+	.global	se_m_reversal
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w179_1:
-	.byte	KEYSH , se_w179_key+0
-	.byte	TEMPO , 150*se_w179_tbs/2
+se_m_reversal_1:
+	.byte	KEYSH , se_m_reversal_key+0
+	.byte	TEMPO , 150*se_m_reversal_tbs/2
 	.byte		VOICE , 19
 	.byte		BENDR , 24
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		N03   , Cn5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -36,14 +36,14 @@ se_w179_1:
 	.byte		N01   , Gn4 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-33
 	.byte		N03   , Cs5 , v092
 	.byte	W02
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -52,14 +52,14 @@ se_w179_1:
 	.byte		N01   , Gs4 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-33
 	.byte		N03   , Dn5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W02
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -68,14 +68,14 @@ se_w179_1:
 	.byte		N01   , An4 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-33
 	.byte		N03   , Ds5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W02
 	.byte		VOICE , 22
@@ -84,14 +84,14 @@ se_w179_1:
 	.byte		N01   , As4 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-33
 	.byte		N03   , En5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -100,14 +100,14 @@ se_w179_1:
 	.byte		N01   , Bn4 , v127
 	.byte	W02
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-33
 	.byte		N03   , Fn5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -116,14 +116,14 @@ se_w179_1:
 	.byte		N01   , Cn5 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-33
 	.byte		N03   , Fs5 , v092
 	.byte	W02
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -132,14 +132,14 @@ se_w179_1:
 	.byte		N01   , Cs5 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-33
 	.byte		N03   , Gn5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W02
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -148,14 +148,14 @@ se_w179_1:
 	.byte		N01   , Dn5 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-33
 	.byte		N03   , Gs5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W02
 	.byte		VOICE , 22
@@ -164,14 +164,14 @@ se_w179_1:
 	.byte		N01   , Ds5 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-33
 	.byte		N03   , An5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -180,14 +180,14 @@ se_w179_1:
 	.byte		N01   , En5 , v127
 	.byte	W02
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-33
 	.byte		N03   , As5 , v092
 	.byte	W01
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -196,14 +196,14 @@ se_w179_1:
 	.byte		N01   , Fn5 , v127
 	.byte	W01
 	.byte		VOICE , 19
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-33
 	.byte		N03   , Bn5 , v092
 	.byte	W02
-	.byte		VOL   , 72*se_w179_mvl/mxv
+	.byte		VOL   , 72*se_m_reversal_mvl/mxv
 	.byte	W01
-	.byte		        40*se_w179_mvl/mxv
+	.byte		        40*se_m_reversal_mvl/mxv
 	.byte		BEND  , c_v+31
 	.byte	W01
 	.byte		VOICE , 22
@@ -218,10 +218,10 @@ se_w179_1:
 
 @********************** Track  2 **********************@
 
-se_w179_2:
-	.byte	KEYSH , se_w179_key+0
+se_m_reversal_2:
+	.byte	KEYSH , se_m_reversal_key+0
 	.byte		VOICE , 17
-	.byte		VOL   , 100*se_w179_mvl/mxv
+	.byte		VOL   , 100*se_m_reversal_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+31
 	.byte		N03   , Cn5 , v040
@@ -322,15 +322,15 @@ se_w179_2:
 @******************************************************@
 	.align	2
 
-se_w179:
+se_m_reversal:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w179_pri	@ Priority
-	.byte	se_w179_rev	@ Reverb.
+	.byte	se_m_reversal_pri	@ Priority
+	.byte	se_m_reversal_rev	@ Reverb.
 
-	.word	se_w179_grp
+	.word	se_m_reversal_grp
 
-	.word	se_w179_1
-	.word	se_w179_2
+	.word	se_m_reversal_1
+	.word	se_m_reversal_2
 
 	.end
diff --git a/sound/songs/se_w088.s b/sound/songs/se_m_rock_throw.s
index 9eceb812d..71dddd447 100644
--- a/sound/songs/se_w088.s
+++ b/sound/songs/se_m_rock_throw.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w088_grp, voicegroup128
-	.equ	se_w088_pri, 4
-	.equ	se_w088_rev, reverb_set+50
-	.equ	se_w088_mvl, 127
-	.equ	se_w088_key, 0
-	.equ	se_w088_tbs, 1
-	.equ	se_w088_exg, 0
-	.equ	se_w088_cmp, 1
+	.equ	se_m_rock_throw_grp, voicegroup128
+	.equ	se_m_rock_throw_pri, 4
+	.equ	se_m_rock_throw_rev, reverb_set+50
+	.equ	se_m_rock_throw_mvl, 127
+	.equ	se_m_rock_throw_key, 0
+	.equ	se_m_rock_throw_tbs, 1
+	.equ	se_m_rock_throw_exg, 0
+	.equ	se_m_rock_throw_cmp, 1
 
 	.section .rodata
-	.global	se_w088
+	.global	se_m_rock_throw
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w088_1:
-	.byte	KEYSH , se_w088_key+0
-	.byte	TEMPO , 150*se_w088_tbs/2
+se_m_rock_throw_1:
+	.byte	KEYSH , se_m_rock_throw_key+0
+	.byte	TEMPO , 150*se_m_rock_throw_tbs/2
 	.byte		VOICE , 26
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 105*se_w088_mvl/mxv
+	.byte		VOL   , 105*se_m_rock_throw_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , En3 , v127
 	.byte	W03
@@ -52,14 +52,14 @@ se_w088_1:
 @******************************************************@
 	.align	2
 
-se_w088:
+se_m_rock_throw:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w088_pri	@ Priority
-	.byte	se_w088_rev	@ Reverb.
+	.byte	se_m_rock_throw_pri	@ Priority
+	.byte	se_m_rock_throw_rev	@ Reverb.
 
-	.word	se_w088_grp
+	.word	se_m_rock_throw_grp
 
-	.word	se_w088_1
+	.word	se_m_rock_throw_1
 
 	.end
diff --git a/sound/songs/se_m_sacred_fire.s b/sound/songs/se_m_sacred_fire.s
new file mode 100644
index 000000000..5e6c864e2
--- /dev/null
+++ b/sound/songs/se_m_sacred_fire.s
@@ -0,0 +1,105 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_sacred_fire_grp, voicegroup128
+	.equ	se_m_sacred_fire_pri, 4
+	.equ	se_m_sacred_fire_rev, reverb_set+50
+	.equ	se_m_sacred_fire_mvl, 127
+	.equ	se_m_sacred_fire_key, 0
+	.equ	se_m_sacred_fire_tbs, 1
+	.equ	se_m_sacred_fire_exg, 0
+	.equ	se_m_sacred_fire_cmp, 1
+
+	.section .rodata
+	.global	se_m_sacred_fire
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_sacred_fire_1:
+	.byte	KEYSH , se_m_sacred_fire_key+0
+	.byte	TEMPO , 150*se_m_sacred_fire_tbs/2
+	.byte		VOICE , 29
+	.byte		BENDR , 12
+	.byte		VOL   , 110*se_m_sacred_fire_mvl/mxv
+	.byte		PAN   , c_v+5
+	.byte		BEND  , c_v+0
+	.byte		N04   , Cn3 , v127
+	.byte	W03
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		N18   , Gn4 
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte	W01
+	.byte		VOL   , 98*se_m_sacred_fire_mvl/mxv
+	.byte		BEND  , c_v+2
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 83*se_m_sacred_fire_mvl/mxv
+	.byte		BEND  , c_v+6
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte	W01
+	.byte		BEND  , c_v+9
+	.byte	W01
+	.byte		VOL   , 63*se_m_sacred_fire_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		BEND  , c_v+13
+	.byte	W02
+	.byte		VOL   , 44*se_m_sacred_fire_mvl/mxv
+	.byte		PAN   , c_v-5
+	.byte	W02
+	.byte		VOL   , 28*se_m_sacred_fire_mvl/mxv
+	.byte		BEND  , c_v+20
+	.byte	W01
+	.byte		PAN   , c_v-2
+	.byte	W01
+	.byte		VOL   , 12*se_m_sacred_fire_mvl/mxv
+	.byte	W02
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_sacred_fire_2:
+	.byte	KEYSH , se_m_sacred_fire_key+0
+	.byte		VOICE , 27
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 110*se_m_sacred_fire_mvl/mxv
+	.byte		N01   , Gn2 , v032
+	.byte	W02
+	.byte		N01   
+	.byte	W02
+	.byte		N18   
+	.byte	W03
+	.byte		VOL   , 98*se_m_sacred_fire_mvl/mxv
+	.byte	W03
+	.byte		        83*se_m_sacred_fire_mvl/mxv
+	.byte	W04
+	.byte		        63*se_m_sacred_fire_mvl/mxv
+	.byte	W04
+	.byte		        44*se_m_sacred_fire_mvl/mxv
+	.byte	W02
+	.byte		        28*se_m_sacred_fire_mvl/mxv
+	.byte	W02
+	.byte		        12*se_m_sacred_fire_mvl/mxv
+	.byte	W02
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_sacred_fire:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_sacred_fire_pri	@ Priority
+	.byte	se_m_sacred_fire_rev	@ Reverb.
+
+	.word	se_m_sacred_fire_grp
+
+	.word	se_m_sacred_fire_1
+	.word	se_m_sacred_fire_2
+
+	.end
diff --git a/sound/songs/se_m_sacred_fire2.s b/sound/songs/se_m_sacred_fire2.s
new file mode 100644
index 000000000..f255e712a
--- /dev/null
+++ b/sound/songs/se_m_sacred_fire2.s
@@ -0,0 +1,180 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_sacred_fire2_grp, voicegroup128
+	.equ	se_m_sacred_fire2_pri, 4
+	.equ	se_m_sacred_fire2_rev, reverb_set+50
+	.equ	se_m_sacred_fire2_mvl, 127
+	.equ	se_m_sacred_fire2_key, 0
+	.equ	se_m_sacred_fire2_tbs, 1
+	.equ	se_m_sacred_fire2_exg, 0
+	.equ	se_m_sacred_fire2_cmp, 1
+
+	.section .rodata
+	.global	se_m_sacred_fire2
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_sacred_fire2_1:
+	.byte	KEYSH , se_m_sacred_fire2_key+0
+	.byte	TEMPO , 150*se_m_sacred_fire2_tbs/2
+	.byte		VOICE , 29
+	.byte		BENDR , 12
+	.byte		VOL   , 22*se_m_sacred_fire2_mvl/mxv
+	.byte		PAN   , c_v+5
+	.byte		BEND  , c_v+0
+	.byte		N96   , Gn3 , v127
+	.byte	W01
+	.byte		VOL   , 49*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		        71*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 95*se_m_sacred_fire2_mvl/mxv
+	.byte		BEND  , c_v+8
+	.byte	W01
+	.byte		VOL   , 110*se_m_sacred_fire2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte		BEND  , c_v+16
+	.byte	W03
+	.byte		VOL   , 97*se_m_sacred_fire2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+7
+	.byte	W03
+	.byte		PAN   , c_v+5
+	.byte		BEND  , c_v+0
+	.byte	W01
+	.byte		VOL   , 84*se_m_sacred_fire2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-9
+	.byte	W03
+	.byte		VOL   , 76*se_m_sacred_fire2_mvl/mxv
+	.byte		PAN   , c_v-5
+	.byte		BEND  , c_v-24
+	.byte	W03
+	.byte		PAN   , c_v-2
+	.byte		BEND  , c_v-46
+	.byte	W03
+	.byte		VOL   , 84*se_m_sacred_fire2_mvl/mxv
+	.byte		PAN   , c_v+5
+	.byte	W03
+	.byte		        c_v+0
+	.byte	W01
+	.byte		VOL   , 92*se_m_sacred_fire2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte	W01
+	.byte		BEND  , c_v-32
+	.byte	W02
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 86*se_m_sacred_fire2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte	W02
+	.byte		BEND  , c_v-18
+	.byte	W01
+	.byte		VOL   , 78*se_m_sacred_fire2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		        c_v-5
+	.byte	W02
+	.byte		VOL   , 71*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v-2
+	.byte	W03
+	.byte		        c_v+5
+	.byte	W03
+	.byte		        c_v+0
+	.byte		VOL   , 78*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v-5
+	.byte	W02
+	.byte		VOL   , 86*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		        c_v+5
+	.byte	W02
+	.byte		VOL   , 90*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		        c_v-5
+	.byte	W03
+	.byte		        c_v-2
+	.byte	W01
+	.byte		VOL   , 80*se_m_sacred_fire2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte	W03
+	.byte		        c_v+0
+	.byte	W01
+	.byte		VOL   , 86*se_m_sacred_fire2_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v-5
+	.byte	W03
+	.byte		        c_v+0
+	.byte		VOL   , 83*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v+5
+	.byte		VOL   , 63*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		        37*se_m_sacred_fire2_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte	W03
+	.byte		        c_v-5
+	.byte		VOL   , 13*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		PAN   , c_v-2
+	.byte	W03
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_sacred_fire2_2:
+	.byte	KEYSH , se_m_sacred_fire2_key+0
+	.byte		VOICE , 27
+	.byte		VOL   , 22*se_m_sacred_fire2_mvl/mxv
+	.byte		N96   , Gn2 , v032
+	.byte	W01
+	.byte		VOL   , 49*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		        71*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		        95*se_m_sacred_fire2_mvl/mxv
+	.byte	W01
+	.byte		        110*se_m_sacred_fire2_mvl/mxv
+	.byte	W05
+	.byte		        97*se_m_sacred_fire2_mvl/mxv
+	.byte	W15
+	.byte	W24
+	.byte	W24
+	.byte	W09
+	.byte		        83*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		        63*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		        37*se_m_sacred_fire2_mvl/mxv
+	.byte	W03
+	.byte		        13*se_m_sacred_fire2_mvl/mxv
+	.byte	W06
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_sacred_fire2:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_sacred_fire2_pri	@ Priority
+	.byte	se_m_sacred_fire2_rev	@ Reverb.
+
+	.word	se_m_sacred_fire2_grp
+
+	.word	se_m_sacred_fire2_1
+	.word	se_m_sacred_fire2_2
+
+	.end
diff --git a/sound/songs/se_w328.s b/sound/songs/se_m_sand_tomb.s
index 6b5a2d923..8edf0abf8 100644
--- a/sound/songs/se_w328.s
+++ b/sound/songs/se_m_sand_tomb.s
@@ -1,45 +1,45 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w328_grp, voicegroup128
-	.equ	se_w328_pri, 4
-	.equ	se_w328_rev, reverb_set+50
-	.equ	se_w328_mvl, 127
-	.equ	se_w328_key, 0
-	.equ	se_w328_tbs, 1
-	.equ	se_w328_exg, 0
-	.equ	se_w328_cmp, 1
+	.equ	se_m_sand_tomb_grp, voicegroup128
+	.equ	se_m_sand_tomb_pri, 4
+	.equ	se_m_sand_tomb_rev, reverb_set+50
+	.equ	se_m_sand_tomb_mvl, 127
+	.equ	se_m_sand_tomb_key, 0
+	.equ	se_m_sand_tomb_tbs, 1
+	.equ	se_m_sand_tomb_exg, 0
+	.equ	se_m_sand_tomb_cmp, 1
 
 	.section .rodata
-	.global	se_w328
+	.global	se_m_sand_tomb
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w328_1:
-	.byte	KEYSH , se_w328_key+0
-	.byte	TEMPO , 150*se_w328_tbs/2
+se_m_sand_tomb_1:
+	.byte	KEYSH , se_m_sand_tomb_key+0
+	.byte	TEMPO , 150*se_m_sand_tomb_tbs/2
 	.byte		VOICE , 22
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 64*se_w328_mvl/mxv
+	.byte		VOL   , 64*se_m_sand_tomb_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N96   , En2 , v127
 	.byte	W03
-	.byte		VOL   , 79*se_w328_mvl/mxv
+	.byte		VOL   , 79*se_m_sand_tomb_mvl/mxv
 	.byte		BEND  , c_v+22
 	.byte	W02
 	.byte		        c_v+8
 	.byte	W01
-	.byte		VOL   , 84*se_w328_mvl/mxv
+	.byte		VOL   , 84*se_m_sand_tomb_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte	W03
-	.byte		VOL   , 91*se_w328_mvl/mxv
+	.byte		VOL   , 91*se_m_sand_tomb_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte	W03
-	.byte		VOL   , 100*se_w328_mvl/mxv
+	.byte		VOL   , 100*se_m_sand_tomb_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte	W03
-	.byte		VOL   , 110*se_w328_mvl/mxv
+	.byte		VOL   , 110*se_m_sand_tomb_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-12
 	.byte	W06
@@ -82,46 +82,46 @@ se_w328_1:
 	.byte		PAN   , c_v-11
 	.byte	W03
 	.byte		        c_v-17
-	.byte		VOL   , 98*se_w328_mvl/mxv
+	.byte		VOL   , 98*se_m_sand_tomb_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte	W03
-	.byte		VOL   , 90*se_w328_mvl/mxv
+	.byte		VOL   , 90*se_m_sand_tomb_mvl/mxv
 	.byte		BEND  , c_v-7
 	.byte	W03
 	.byte		PAN   , c_v-9
 	.byte		BEND  , c_v-12
 	.byte	W01
-	.byte		VOL   , 80*se_w328_mvl/mxv
+	.byte		VOL   , 80*se_m_sand_tomb_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 71*se_w328_mvl/mxv
+	.byte		VOL   , 71*se_m_sand_tomb_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-3
 	.byte	W02
-	.byte		VOL   , 58*se_w328_mvl/mxv
+	.byte		VOL   , 58*se_m_sand_tomb_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-13
 	.byte	W03
 	.byte		PAN   , c_v+10
-	.byte		VOL   , 45*se_w328_mvl/mxv
+	.byte		VOL   , 45*se_m_sand_tomb_mvl/mxv
 	.byte	W02
-	.byte		        27*se_w328_mvl/mxv
+	.byte		        27*se_m_sand_tomb_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-6
 	.byte	W01
-	.byte		VOL   , 11*se_w328_mvl/mxv
+	.byte		VOL   , 11*se_m_sand_tomb_mvl/mxv
 	.byte	W02
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w328_2:
-	.byte	KEYSH , se_w328_key+0
+se_m_sand_tomb_2:
+	.byte	KEYSH , se_m_sand_tomb_key+0
 	.byte		VOICE , 57
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w328_mvl/mxv
+	.byte		VOL   , 110*se_m_sand_tomb_mvl/mxv
 	.byte		N03   , Cn3 , v100
 	.byte	W03
 	.byte		        En3 , v080
@@ -183,15 +183,15 @@ se_w328_2:
 @******************************************************@
 	.align	2
 
-se_w328:
+se_m_sand_tomb:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w328_pri	@ Priority
-	.byte	se_w328_rev	@ Reverb.
+	.byte	se_m_sand_tomb_pri	@ Priority
+	.byte	se_m_sand_tomb_rev	@ Reverb.
 
-	.word	se_w328_grp
+	.word	se_m_sand_tomb_grp
 
-	.word	se_w328_1
-	.word	se_w328_2
+	.word	se_m_sand_tomb_1
+	.word	se_m_sand_tomb_2
 
 	.end
diff --git a/sound/songs/se_w201.s b/sound/songs/se_m_sandstorm.s
index b6a6aaff5..9674cd043 100644
--- a/sound/songs/se_w201.s
+++ b/sound/songs/se_m_sandstorm.s
@@ -1,58 +1,58 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w201_grp, voicegroup128
-	.equ	se_w201_pri, 4
-	.equ	se_w201_rev, reverb_set+50
-	.equ	se_w201_mvl, 127
-	.equ	se_w201_key, 0
-	.equ	se_w201_tbs, 1
-	.equ	se_w201_exg, 0
-	.equ	se_w201_cmp, 1
+	.equ	se_m_sandstorm_grp, voicegroup128
+	.equ	se_m_sandstorm_pri, 4
+	.equ	se_m_sandstorm_rev, reverb_set+50
+	.equ	se_m_sandstorm_mvl, 127
+	.equ	se_m_sandstorm_key, 0
+	.equ	se_m_sandstorm_tbs, 1
+	.equ	se_m_sandstorm_exg, 0
+	.equ	se_m_sandstorm_cmp, 1
 
 	.section .rodata
-	.global	se_w201
+	.global	se_m_sandstorm
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w201_1:
-	.byte	KEYSH , se_w201_key+0
-	.byte	TEMPO , 200*se_w201_tbs/2
+se_m_sandstorm_1:
+	.byte	KEYSH , se_m_sandstorm_key+0
+	.byte	TEMPO , 200*se_m_sandstorm_tbs/2
 	.byte		VOICE , 2
 	.byte		BENDR , 12
 	.byte		PAN   , c_v-48
-	.byte		VOL   , 11*se_w201_mvl/mxv
+	.byte		VOL   , 11*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		TIE   , En3 , v127
 	.byte	W03
-	.byte		VOL   , 17*se_w201_mvl/mxv
+	.byte		VOL   , 17*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v+22
 	.byte	W02
 	.byte		        c_v+8
 	.byte	W01
-	.byte		VOL   , 24*se_w201_mvl/mxv
+	.byte		VOL   , 24*se_m_sandstorm_mvl/mxv
 	.byte	W03
-	.byte		        32*se_w201_mvl/mxv
+	.byte		        32*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte	W03
-	.byte		VOL   , 52*se_w201_mvl/mxv
+	.byte		VOL   , 52*se_m_sandstorm_mvl/mxv
 	.byte	W03
-	.byte		        65*se_w201_mvl/mxv
+	.byte		        65*se_m_sandstorm_mvl/mxv
 	.byte	W03
-	.byte		        76*se_w201_mvl/mxv
+	.byte		        76*se_m_sandstorm_mvl/mxv
 	.byte	W02
-	.byte		        88*se_w201_mvl/mxv
+	.byte		        88*se_m_sandstorm_mvl/mxv
 	.byte		PAN   , c_v-43
 	.byte	W02
-	.byte		VOL   , 98*se_w201_mvl/mxv
+	.byte		VOL   , 98*se_m_sandstorm_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+0
 	.byte	W02
-	.byte		VOL   , 111*se_w201_mvl/mxv
+	.byte		VOL   , 111*se_m_sandstorm_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-7
 	.byte	W01
-	.byte		VOL   , 127*se_w201_mvl/mxv
+	.byte		VOL   , 127*se_m_sandstorm_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v-12
 	.byte	W02
@@ -134,31 +134,31 @@ se_w201_1:
 	.byte	W03
 	.byte		        c_v+7
 	.byte	W04
-	.byte		VOL   , 114*se_w201_mvl/mxv
+	.byte		VOL   , 114*se_m_sandstorm_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+0
 	.byte	W01
 	.byte		PAN   , c_v+48
 	.byte	W01
-	.byte		VOL   , 104*se_w201_mvl/mxv
+	.byte		VOL   , 104*se_m_sandstorm_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-7
 	.byte	W03
-	.byte		VOL   , 93*se_w201_mvl/mxv
+	.byte		VOL   , 93*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v-12
 	.byte	W03
-	.byte		VOL   , 82*se_w201_mvl/mxv
+	.byte		VOL   , 82*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W04
-	.byte		VOL   , 67*se_w201_mvl/mxv
+	.byte		VOL   , 67*se_m_sandstorm_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v-13
 	.byte	W01
-	.byte		VOL   , 52*se_w201_mvl/mxv
+	.byte		VOL   , 52*se_m_sandstorm_mvl/mxv
 	.byte	W03
-	.byte		        32*se_w201_mvl/mxv
+	.byte		        32*se_m_sandstorm_mvl/mxv
 	.byte	W02
-	.byte		        13*se_w201_mvl/mxv
+	.byte		        13*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v-6
 	.byte	W03
 	.byte		EOT   
@@ -166,11 +166,11 @@ se_w201_1:
 
 @********************** Track  2 **********************@
 
-se_w201_2:
-	.byte	KEYSH , se_w201_key+0
+se_m_sandstorm_2:
+	.byte	KEYSH , se_m_sandstorm_key+0
 	.byte		VOICE , 57
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 60*se_w201_mvl/mxv
+	.byte		VOL   , 60*se_m_sandstorm_mvl/mxv
 	.byte		N03   , Cn3 , v100
 	.byte	W03
 	.byte		        En3 , v080
@@ -185,7 +185,7 @@ se_w201_2:
 	.byte	W03
 	.byte		        Cn3 , v100
 	.byte	W03
-se_w201_2_000:
+se_m_sandstorm_2_000:
 	.byte	W01
 	.byte		N03   , En3 , v080
 	.byte	W03
@@ -230,7 +230,7 @@ se_w201_2_000:
 	.byte		        Cn3 , v100
 	.byte	W03
 	.byte	PATT
-	 .word	se_w201_2_000
+	 .word	se_m_sandstorm_2_000
 	.byte	W02
 	.byte		N03   , Cn3 , v076
 	.byte	W04
@@ -276,15 +276,15 @@ se_w201_2_000:
 @******************************************************@
 	.align	2
 
-se_w201:
+se_m_sandstorm:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w201_pri	@ Priority
-	.byte	se_w201_rev	@ Reverb.
+	.byte	se_m_sandstorm_pri	@ Priority
+	.byte	se_m_sandstorm_rev	@ Reverb.
 
-	.word	se_w201_grp
+	.word	se_m_sandstorm_grp
 
-	.word	se_w201_1
-	.word	se_w201_2
+	.word	se_m_sandstorm_1
+	.word	se_m_sandstorm_2
 
 	.end
diff --git a/sound/songs/se_w103.s b/sound/songs/se_m_screech.s
index d35ec99ad..378cf7128 100644
--- a/sound/songs/se_w103.s
+++ b/sound/songs/se_m_screech.s
@@ -1,24 +1,24 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w103_grp, voicegroup128
-	.equ	se_w103_pri, 4
-	.equ	se_w103_rev, reverb_set+50
-	.equ	se_w103_mvl, 127
-	.equ	se_w103_key, 0
-	.equ	se_w103_tbs, 1
-	.equ	se_w103_exg, 0
-	.equ	se_w103_cmp, 1
+	.equ	se_m_screech_grp, voicegroup128
+	.equ	se_m_screech_pri, 4
+	.equ	se_m_screech_rev, reverb_set+50
+	.equ	se_m_screech_mvl, 127
+	.equ	se_m_screech_key, 0
+	.equ	se_m_screech_tbs, 1
+	.equ	se_m_screech_exg, 0
+	.equ	se_m_screech_cmp, 1
 
 	.section .rodata
-	.global	se_w103
+	.global	se_m_screech
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w103_1:
-	.byte		VOL   , 110*se_w103_mvl/mxv
-	.byte	KEYSH , se_w103_key+0
-	.byte	TEMPO , 150*se_w103_tbs/2
+se_m_screech_1:
+	.byte		VOL   , 110*se_m_screech_mvl/mxv
+	.byte	KEYSH , se_m_screech_key+0
+	.byte	TEMPO , 150*se_m_screech_tbs/2
 	.byte		VOICE , 44
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
@@ -28,27 +28,27 @@ se_w103_1:
 	.byte		PAN   , c_v-5
 	.byte	W01
 	.byte		        c_v-10
-	.byte		VOL   , 15*se_w103_mvl/mxv
+	.byte		VOL   , 15*se_m_screech_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-4
-	.byte		VOL   , 41*se_w103_mvl/mxv
+	.byte		VOL   , 41*se_m_screech_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 69*se_w103_mvl/mxv
+	.byte		VOL   , 69*se_m_screech_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+4
 	.byte	W01
 	.byte		        c_v+10
-	.byte		VOL   , 84*se_w103_mvl/mxv
+	.byte		VOL   , 84*se_m_screech_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+4
 	.byte	W01
-	.byte		VOL   , 97*se_w103_mvl/mxv
+	.byte		VOL   , 97*se_m_screech_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
 	.byte		        c_v-5
 	.byte	W02
-	.byte		VOL   , 110*se_w103_mvl/mxv
+	.byte		VOL   , 110*se_m_screech_mvl/mxv
 	.byte		PAN   , c_v-10
 	.byte	W01
 	.byte		        c_v-4
@@ -59,13 +59,13 @@ se_w103_1:
 	.byte	W01
 	.byte		        c_v+10
 	.byte	W02
-	.byte		VOL   , 100*se_w103_mvl/mxv
+	.byte		VOL   , 100*se_m_screech_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte	W01
-	.byte		VOL   , 84*se_w103_mvl/mxv
+	.byte		VOL   , 84*se_m_screech_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 55*se_w103_mvl/mxv
+	.byte		VOL   , 55*se_m_screech_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+0
 	.byte	W02
@@ -73,9 +73,9 @@ se_w103_1:
 
 @********************** Track  2 **********************@
 
-se_w103_2:
-	.byte		VOL   , 110*se_w103_mvl/mxv
-	.byte	KEYSH , se_w103_key+0
+se_m_screech_2:
+	.byte		VOL   , 110*se_m_screech_mvl/mxv
+	.byte	KEYSH , se_m_screech_key+0
 	.byte		VOICE , 42
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -98,15 +98,15 @@ se_w103_2:
 @******************************************************@
 	.align	2
 
-se_w103:
+se_m_screech:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w103_pri	@ Priority
-	.byte	se_w103_rev	@ Reverb.
+	.byte	se_m_screech_pri	@ Priority
+	.byte	se_m_screech_rev	@ Reverb.
 
-	.word	se_w103_grp
+	.word	se_m_screech_grp
 
-	.word	se_w103_1
-	.word	se_w103_2
+	.word	se_m_screech_1
+	.word	se_m_screech_2
 
 	.end
diff --git a/sound/songs/se_m_self_destruct.s b/sound/songs/se_m_self_destruct.s
new file mode 100644
index 000000000..f2ab617ca
--- /dev/null
+++ b/sound/songs/se_m_self_destruct.s
@@ -0,0 +1,74 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_self_destruct_grp, voicegroup128
+	.equ	se_m_self_destruct_pri, 4
+	.equ	se_m_self_destruct_rev, reverb_set+50
+	.equ	se_m_self_destruct_mvl, 127
+	.equ	se_m_self_destruct_key, 0
+	.equ	se_m_self_destruct_tbs, 1
+	.equ	se_m_self_destruct_exg, 0
+	.equ	se_m_self_destruct_cmp, 1
+
+	.section .rodata
+	.global	se_m_self_destruct
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_self_destruct_1:
+	.byte	KEYSH , se_m_self_destruct_key+0
+	.byte	TEMPO , 150*se_m_self_destruct_tbs/2
+	.byte		VOICE , 41
+	.byte		VOL   , 115*se_m_self_destruct_mvl/mxv
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+0
+	.byte		N01   , Gn3 , v127
+	.byte	W01
+	.byte		        Cn3 
+	.byte	W01
+	.byte		N24   , An3 
+	.byte	W06
+	.byte		PAN   , c_v+6
+	.byte	W04
+	.byte		        c_v+0
+	.byte	W01
+	.byte		VOL   , 102*se_m_self_destruct_mvl/mxv
+	.byte	W02
+	.byte		PAN   , c_v-8
+	.byte		VOL   , 88*se_m_self_destruct_mvl/mxv
+	.byte	W03
+	.byte		        78*se_m_self_destruct_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte	W01
+	.byte		VOL   , 67*se_m_self_destruct_mvl/mxv
+	.byte	W01
+	.byte		BEND  , c_v-2
+	.byte	W01
+	.byte		PAN   , c_v+7
+	.byte		VOL   , 45*se_m_self_destruct_mvl/mxv
+	.byte	W02
+	.byte		BEND  , c_v-8
+	.byte	W01
+	.byte		VOL   , 13*se_m_self_destruct_mvl/mxv
+	.byte	W01
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-15
+	.byte	W22
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_self_destruct:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_self_destruct_pri	@ Priority
+	.byte	se_m_self_destruct_rev	@ Reverb.
+
+	.word	se_m_self_destruct_grp
+
+	.word	se_m_self_destruct_1
+
+	.end
diff --git a/sound/songs/se_w047.s b/sound/songs/se_m_sing.s
index 688b782ed..f12509f56 100644
--- a/sound/songs/se_w047.s
+++ b/sound/songs/se_m_sing.s
@@ -1,28 +1,28 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w047_grp, voicegroup128
-	.equ	se_w047_pri, 4
-	.equ	se_w047_rev, reverb_set+50
-	.equ	se_w047_mvl, 127
-	.equ	se_w047_key, 0
-	.equ	se_w047_tbs, 1
-	.equ	se_w047_exg, 0
-	.equ	se_w047_cmp, 1
+	.equ	se_m_sing_grp, voicegroup128
+	.equ	se_m_sing_pri, 4
+	.equ	se_m_sing_rev, reverb_set+50
+	.equ	se_m_sing_mvl, 127
+	.equ	se_m_sing_key, 0
+	.equ	se_m_sing_tbs, 1
+	.equ	se_m_sing_exg, 0
+	.equ	se_m_sing_cmp, 1
 
 	.section .rodata
-	.global	se_w047
+	.global	se_m_sing
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w047_1:
-	.byte	KEYSH , se_w047_key+0
-	.byte	TEMPO , 100*se_w047_tbs/2
+se_m_sing_1:
+	.byte	KEYSH , se_m_sing_key+0
+	.byte	TEMPO , 100*se_m_sing_tbs/2
 	.byte		VOICE , 73
 	.byte		BENDR , 12
 	.byte		LFOS  , 40
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N44   , Gn4 , v112
 	.byte	W06
@@ -31,47 +31,47 @@ se_w047_1:
 	.byte		MOD   , 7
 	.byte	W03
 	.byte	W03
-	.byte		VOL   , 83*se_w047_mvl/mxv
+	.byte		VOL   , 83*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
-	.byte		        69*se_w047_mvl/mxv
+	.byte		        69*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
-	.byte		        50*se_w047_mvl/mxv
+	.byte		        50*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
-	.byte		        24*se_w047_mvl/mxv
+	.byte		        24*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
 	.byte		MOD   , 0
 	.byte	W03
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		N21   , Fn5 
 	.byte	W06
 	.byte	W06
-se_w047_1_000:
-	.byte		VOL   , 86*se_w047_mvl/mxv
+se_m_sing_1_000:
+	.byte		VOL   , 86*se_m_sing_mvl/mxv
 	.byte		MOD   , 7
 	.byte	W03
-	.byte		VOL   , 75*se_w047_mvl/mxv
+	.byte		VOL   , 75*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	PEND
-se_w047_1_001:
-	.byte		VOL   , 55*se_w047_mvl/mxv
+se_m_sing_1_001:
+	.byte		VOL   , 55*se_m_sing_mvl/mxv
 	.byte	W03
-	.byte		        26*se_w047_mvl/mxv
+	.byte		        26*se_m_sing_mvl/mxv
 	.byte		MOD   , 0
 	.byte	W03
 	.byte	PEND
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		N21   , Ds5 , v112
 	.byte	W06
 	.byte	W06
 	.byte	PATT
-	 .word	se_w047_1_000
+	 .word	se_m_sing_1_000
 	.byte	PATT
-	 .word	se_w047_1_001
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	 .word	se_m_sing_1_001
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		N66   , Gn4 , v112
 	.byte	W06
 	.byte	W06
@@ -81,13 +81,13 @@ se_w047_1_001:
 	.byte	W06
 	.byte	W06
 	.byte	W06
-	.byte		VOL   , 83*se_w047_mvl/mxv
+	.byte		VOL   , 83*se_m_sing_mvl/mxv
 	.byte	W06
-	.byte		        69*se_w047_mvl/mxv
+	.byte		        69*se_m_sing_mvl/mxv
 	.byte	W06
-	.byte		        50*se_w047_mvl/mxv
+	.byte		        50*se_m_sing_mvl/mxv
 	.byte	W06
-	.byte		        24*se_w047_mvl/mxv
+	.byte		        24*se_m_sing_mvl/mxv
 	.byte	W06
 	.byte		MOD   , 0
 	.byte	W06
@@ -96,11 +96,11 @@ se_w047_1_001:
 
 @********************** Track  2 **********************@
 
-se_w047_2:
-	.byte	KEYSH , se_w047_key+0
+se_m_sing_2:
+	.byte	KEYSH , se_m_sing_key+0
 	.byte		VOICE , 73
 	.byte		LFOS  , 40
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		BEND  , c_v+9
 	.byte	W06
 	.byte	W06
@@ -112,49 +112,49 @@ se_w047_2:
 	.byte		MOD   , 7
 	.byte	W03
 	.byte	W03
-	.byte		VOL   , 83*se_w047_mvl/mxv
+	.byte		VOL   , 83*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
-	.byte		        69*se_w047_mvl/mxv
+	.byte		        69*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
-	.byte		        50*se_w047_mvl/mxv
+	.byte		        50*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
-	.byte		        24*se_w047_mvl/mxv
+	.byte		        24*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	W03
 	.byte		MOD   , 0
 	.byte	W03
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		PAN   , c_v-12
 	.byte		N21   , Fn5 
 	.byte	W06
 	.byte	W06
-se_w047_2_000:
-	.byte		VOL   , 86*se_w047_mvl/mxv
+se_m_sing_2_000:
+	.byte		VOL   , 86*se_m_sing_mvl/mxv
 	.byte		MOD   , 7
 	.byte	W03
-	.byte		VOL   , 75*se_w047_mvl/mxv
+	.byte		VOL   , 75*se_m_sing_mvl/mxv
 	.byte	W03
 	.byte	PEND
-se_w047_2_001:
-	.byte		VOL   , 55*se_w047_mvl/mxv
+se_m_sing_2_001:
+	.byte		VOL   , 55*se_m_sing_mvl/mxv
 	.byte	W03
-	.byte		        26*se_w047_mvl/mxv
+	.byte		        26*se_m_sing_mvl/mxv
 	.byte		MOD   , 0
 	.byte	W03
 	.byte	PEND
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		PAN   , c_v+12
 	.byte		N21   , Ds5 , v060
 	.byte	W06
 	.byte	W06
 	.byte	PATT
-	 .word	se_w047_2_000
+	 .word	se_m_sing_2_000
 	.byte	PATT
-	 .word	se_w047_2_001
-	.byte		VOL   , 95*se_w047_mvl/mxv
+	 .word	se_m_sing_2_001
+	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		PAN   , c_v-12
 	.byte		N66   , Gn4 , v060
 	.byte	W06
@@ -168,14 +168,14 @@ se_w047_2_001:
 	.byte	W06
 	.byte		        c_v+7
 	.byte	W06
-	.byte		VOL   , 83*se_w047_mvl/mxv
+	.byte		VOL   , 83*se_m_sing_mvl/mxv
 	.byte	W06
-	.byte		        69*se_w047_mvl/mxv
+	.byte		        69*se_m_sing_mvl/mxv
 	.byte		PAN   , c_v+15
 	.byte	W06
-	.byte		VOL   , 50*se_w047_mvl/mxv
+	.byte		VOL   , 50*se_m_sing_mvl/mxv
 	.byte	W06
-	.byte		        24*se_w047_mvl/mxv
+	.byte		        24*se_m_sing_mvl/mxv
 	.byte		PAN   , c_v+8
 	.byte	W06
 	.byte		MOD   , 0
@@ -184,15 +184,15 @@ se_w047_2_001:
 @******************************************************@
 	.align	2
 
-se_w047:
+se_m_sing:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w047_pri	@ Priority
-	.byte	se_w047_rev	@ Reverb.
+	.byte	se_m_sing_pri	@ Priority
+	.byte	se_m_sing_rev	@ Reverb.
 
-	.word	se_w047_grp
+	.word	se_m_sing_grp
 
-	.word	se_w047_1
-	.word	se_w047_2
+	.word	se_m_sing_1
+	.word	se_m_sing_2
 
 	.end
diff --git a/sound/songs/se_m_sketch.s b/sound/songs/se_m_sketch.s
new file mode 100644
index 000000000..3657d2009
--- /dev/null
+++ b/sound/songs/se_m_sketch.s
@@ -0,0 +1,68 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_sketch_grp, voicegroup128
+	.equ	se_m_sketch_pri, 4
+	.equ	se_m_sketch_rev, reverb_set+50
+	.equ	se_m_sketch_mvl, 127
+	.equ	se_m_sketch_key, 0
+	.equ	se_m_sketch_tbs, 1
+	.equ	se_m_sketch_exg, 0
+	.equ	se_m_sketch_cmp, 1
+
+	.section .rodata
+	.global	se_m_sketch
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_sketch_1:
+	.byte	KEYSH , se_m_sketch_key+0
+	.byte	TEMPO , 180*se_m_sketch_tbs/2
+	.byte		VOICE , 38
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 110*se_m_sketch_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N02   , Gn4 , v127
+	.byte	W01
+	.byte		VOL   , 74*se_m_sketch_mvl/mxv
+	.byte		BEND  , c_v-11
+	.byte	W01
+	.byte		VOICE , 31
+	.byte		VOL   , 40*se_m_sketch_mvl/mxv
+	.byte		BEND  , c_v-1
+	.byte		N03   , Cs5 
+	.byte	W01
+	.byte		VOL   , 64*se_m_sketch_mvl/mxv
+	.byte		PAN   , c_v-6
+	.byte		BEND  , c_v-12
+	.byte	W01
+	.byte		VOL   , 86*se_m_sketch_mvl/mxv
+	.byte		PAN   , c_v+4
+	.byte		BEND  , c_v-16
+	.byte	W02
+	.byte		VOL   , 110*se_m_sketch_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+0
+	.byte		N02   , As5 
+	.byte	W01
+	.byte		BEND  , c_v+12
+	.byte	W01
+	.byte		VOL   , 0*se_m_sketch_mvl/mxv
+	.byte	W04
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_sketch:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_sketch_pri	@ Priority
+	.byte	se_m_sketch_rev	@ Reverb.
+
+	.word	se_m_sketch_grp
+
+	.word	se_m_sketch_1
+
+	.end
diff --git a/sound/songs/se_m_sky_uppercut.s b/sound/songs/se_m_sky_uppercut.s
new file mode 100644
index 000000000..66a791f96
--- /dev/null
+++ b/sound/songs/se_m_sky_uppercut.s
@@ -0,0 +1,103 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_sky_uppercut_grp, voicegroup128
+	.equ	se_m_sky_uppercut_pri, 4
+	.equ	se_m_sky_uppercut_rev, reverb_set+50
+	.equ	se_m_sky_uppercut_mvl, 127
+	.equ	se_m_sky_uppercut_key, 0
+	.equ	se_m_sky_uppercut_tbs, 1
+	.equ	se_m_sky_uppercut_exg, 0
+	.equ	se_m_sky_uppercut_cmp, 1
+
+	.section .rodata
+	.global	se_m_sky_uppercut
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_sky_uppercut_1:
+	.byte	KEYSH , se_m_sky_uppercut_key+0
+	.byte	TEMPO , 220*se_m_sky_uppercut_tbs/2
+	.byte		VOICE , 41
+	.byte		VOL   , 110*se_m_sky_uppercut_mvl/mxv
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+6
+	.byte		BEND  , c_v+0
+	.byte		N02   , Cn4 , v127
+	.byte	W03
+	.byte		VOL   , 104*se_m_sky_uppercut_mvl/mxv
+	.byte	W03
+	.byte		        93*se_m_sky_uppercut_mvl/mxv
+	.byte		PAN   , c_v-6
+	.byte		N02   , Cn5 
+	.byte	W03
+	.byte		VOL   , 110*se_m_sky_uppercut_mvl/mxv
+	.byte	W01
+	.byte		VOICE , 22
+	.byte		PAN   , c_v+0
+	.byte		N24   , Cn4 , v060
+	.byte	W02
+	.byte	W02
+	.byte		BEND  , c_v+0
+	.byte	W04
+	.byte		        c_v+1
+	.byte	W03
+	.byte		        c_v+1
+	.byte	W01
+	.byte		VOL   , 105*se_m_sky_uppercut_mvl/mxv
+	.byte	W02
+	.byte		BEND  , c_v+0
+	.byte	W01
+	.byte		VOL   , 103*se_m_sky_uppercut_mvl/mxv
+	.byte	W02
+	.byte		        91*se_m_sky_uppercut_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte	W03
+	.byte		VOL   , 77*se_m_sky_uppercut_mvl/mxv
+	.byte		BEND  , c_v-1
+	.byte	W02
+	.byte		VOL   , 61*se_m_sky_uppercut_mvl/mxv
+	.byte		BEND  , c_v-2
+	.byte	W01
+	.byte		VOL   , 38*se_m_sky_uppercut_mvl/mxv
+	.byte	W01
+	.byte		        15*se_m_sky_uppercut_mvl/mxv
+	.byte		BEND  , c_v-3
+	.byte	W02
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_sky_uppercut_2:
+	.byte	KEYSH , se_m_sky_uppercut_key+0
+	.byte		VOICE , 4
+	.byte		VOL   , 110*se_m_sky_uppercut_mvl/mxv
+	.byte		N02   , Cn3 , v060
+	.byte	W03
+	.byte		        Gn2 
+	.byte	W03
+	.byte		        Gs4 
+	.byte	W04
+	.byte		        Gs4 , v020
+	.byte	W02
+	.byte	W06
+	.byte	W06
+	.byte	W06
+	.byte	W06
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_sky_uppercut:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_sky_uppercut_pri	@ Priority
+	.byte	se_m_sky_uppercut_rev	@ Reverb.
+
+	.word	se_m_sky_uppercut_grp
+
+	.word	se_m_sky_uppercut_1
+	.word	se_m_sky_uppercut_2
+
+	.end
diff --git a/sound/songs/se_w173.s b/sound/songs/se_m_snore.s
index a0bbd6378..aff9ef5e3 100644
--- a/sound/songs/se_w173.s
+++ b/sound/songs/se_m_snore.s
@@ -1,65 +1,65 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w173_grp, voicegroup128
-	.equ	se_w173_pri, 4
-	.equ	se_w173_rev, reverb_set+50
-	.equ	se_w173_mvl, 127
-	.equ	se_w173_key, 0
-	.equ	se_w173_tbs, 1
-	.equ	se_w173_exg, 0
-	.equ	se_w173_cmp, 1
+	.equ	se_m_snore_grp, voicegroup128
+	.equ	se_m_snore_pri, 4
+	.equ	se_m_snore_rev, reverb_set+50
+	.equ	se_m_snore_mvl, 127
+	.equ	se_m_snore_key, 0
+	.equ	se_m_snore_tbs, 1
+	.equ	se_m_snore_exg, 0
+	.equ	se_m_snore_cmp, 1
 
 	.section .rodata
-	.global	se_w173
+	.global	se_m_snore
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w173_1:
-	.byte	KEYSH , se_w173_key+0
-	.byte	TEMPO , 220*se_w173_tbs/2
+se_m_snore_1:
+	.byte	KEYSH , se_m_snore_key+0
+	.byte	TEMPO , 220*se_m_snore_tbs/2
 	.byte		VOICE , 38
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 27*se_w173_mvl/mxv
+	.byte		VOL   , 27*se_m_snore_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N10   , An1 , v127
 	.byte	W01
-	.byte		VOL   , 75*se_w173_mvl/mxv
+	.byte		VOL   , 75*se_m_snore_mvl/mxv
 	.byte	W01
-	.byte		        120*se_w173_mvl/mxv
+	.byte		        120*se_m_snore_mvl/mxv
 	.byte	W04
 	.byte	W02
-	.byte		        75*se_w173_mvl/mxv
+	.byte		        75*se_m_snore_mvl/mxv
 	.byte	W01
-	.byte		        28*se_w173_mvl/mxv
+	.byte		        28*se_m_snore_mvl/mxv
 	.byte	W03
 	.byte		VOICE , 36
-	.byte		VOL   , 83*se_w173_mvl/mxv
+	.byte		VOL   , 83*se_m_snore_mvl/mxv
 	.byte		N18   , En2 , v112
 	.byte	W02
-	.byte		VOL   , 87*se_w173_mvl/mxv
+	.byte		VOL   , 87*se_m_snore_mvl/mxv
 	.byte	W02
-	.byte		        91*se_w173_mvl/mxv
+	.byte		        91*se_m_snore_mvl/mxv
 	.byte	W02
 	.byte	W01
-	.byte		        97*se_w173_mvl/mxv
+	.byte		        97*se_m_snore_mvl/mxv
 	.byte	W02
-	.byte		        102*se_w173_mvl/mxv
+	.byte		        102*se_m_snore_mvl/mxv
 	.byte	W01
-	.byte		        109*se_w173_mvl/mxv
+	.byte		        109*se_m_snore_mvl/mxv
 	.byte	W02
-	.byte		        113*se_w173_mvl/mxv
+	.byte		        113*se_m_snore_mvl/mxv
 	.byte	W01
-	.byte		        120*se_w173_mvl/mxv
+	.byte		        120*se_m_snore_mvl/mxv
 	.byte	W05
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w173_2:
-	.byte		VOL   , 120*se_w173_mvl/mxv
-	.byte	KEYSH , se_w173_key+0
+se_m_snore_2:
+	.byte		VOL   , 120*se_m_snore_mvl/mxv
+	.byte	KEYSH , se_m_snore_key+0
 	.byte		VOICE , 27
 	.byte		N01   , En2 , v052
 	.byte	W02
@@ -91,15 +91,15 @@ se_w173_2:
 @******************************************************@
 	.align	2
 
-se_w173:
+se_m_snore:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w173_pri	@ Priority
-	.byte	se_w173_rev	@ Reverb.
+	.byte	se_m_snore_pri	@ Priority
+	.byte	se_m_snore_rev	@ Reverb.
 
-	.word	se_w173_grp
+	.word	se_m_snore_grp
 
-	.word	se_w173_1
-	.word	se_w173_2
+	.word	se_m_snore_1
+	.word	se_m_snore_2
 
 	.end
diff --git a/sound/songs/se_w076.s b/sound/songs/se_m_solar_beam.s
index 82508b774..c260c332a 100644
--- a/sound/songs/se_w076.s
+++ b/sound/songs/se_m_solar_beam.s
@@ -1,41 +1,41 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w076_grp, voicegroup128
-	.equ	se_w076_pri, 4
-	.equ	se_w076_rev, reverb_set+50
-	.equ	se_w076_mvl, 127
-	.equ	se_w076_key, 0
-	.equ	se_w076_tbs, 1
-	.equ	se_w076_exg, 0
-	.equ	se_w076_cmp, 1
+	.equ	se_m_solar_beam_grp, voicegroup128
+	.equ	se_m_solar_beam_pri, 4
+	.equ	se_m_solar_beam_rev, reverb_set+50
+	.equ	se_m_solar_beam_mvl, 127
+	.equ	se_m_solar_beam_key, 0
+	.equ	se_m_solar_beam_tbs, 1
+	.equ	se_m_solar_beam_exg, 0
+	.equ	se_m_solar_beam_cmp, 1
 
 	.section .rodata
-	.global	se_w076
+	.global	se_m_solar_beam
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w076_1:
-	.byte	KEYSH , se_w076_key+0
-	.byte	TEMPO , 150*se_w076_tbs/2
+se_m_solar_beam_1:
+	.byte	KEYSH , se_m_solar_beam_key+0
+	.byte	TEMPO , 150*se_m_solar_beam_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 24
-	.byte		VOL   , 25*se_w076_mvl/mxv
+	.byte		VOL   , 25*se_m_solar_beam_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+63
 	.byte		TIE   , Cn4 , v112
 	.byte	W04
-	.byte		VOL   , 40*se_w076_mvl/mxv
+	.byte		VOL   , 40*se_m_solar_beam_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+52
 	.byte	W03
-	.byte		VOL   , 55*se_w076_mvl/mxv
+	.byte		VOL   , 55*se_m_solar_beam_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-10
 	.byte		BEND  , c_v+41
 	.byte	W03
-	.byte		VOL   , 80*se_w076_mvl/mxv
+	.byte		VOL   , 80*se_m_solar_beam_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-5
 	.byte		BEND  , c_v+30
@@ -43,7 +43,7 @@ se_w076_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+22
 	.byte	W01
-	.byte		VOL   , 100*se_w076_mvl/mxv
+	.byte		VOL   , 100*se_m_solar_beam_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+63
@@ -114,36 +114,36 @@ se_w076_1:
 	.byte		        c_v-10
 	.byte		BEND  , c_v-18
 	.byte	W03
-	.byte		VOL   , 89*se_w076_mvl/mxv
+	.byte		VOL   , 89*se_m_solar_beam_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-5
 	.byte	W02
-	.byte		VOL   , 74*se_w076_mvl/mxv
+	.byte		VOL   , 74*se_m_solar_beam_mvl/mxv
 	.byte		BEND  , c_v-25
 	.byte	W04
 	.byte		PAN   , c_v+0
 	.byte	W02
-	.byte		VOL   , 62*se_w076_mvl/mxv
+	.byte		VOL   , 62*se_m_solar_beam_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-32
 	.byte	W03
 	.byte		PAN   , c_v+4
 	.byte	W01
-	.byte		VOL   , 45*se_w076_mvl/mxv
+	.byte		VOL   , 45*se_m_solar_beam_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-40
 	.byte	W04
-	.byte		VOL   , 28*se_w076_mvl/mxv
+	.byte		VOL   , 28*se_m_solar_beam_mvl/mxv
 	.byte		PAN   , c_v+11
 	.byte		BEND  , c_v-49
 	.byte	W03
 	.byte		        c_v-64
 	.byte	W01
-	.byte		VOL   , 10*se_w076_mvl/mxv
+	.byte		VOL   , 10*se_m_solar_beam_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+4
 	.byte	W02
-	.byte		VOL   , 5*se_w076_mvl/mxv
+	.byte		VOL   , 5*se_m_solar_beam_mvl/mxv
 	.byte	W04
 	.byte		EOT   
 	.byte	FINE
@@ -151,14 +151,14 @@ se_w076_1:
 @******************************************************@
 	.align	2
 
-se_w076:
+se_m_solar_beam:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w076_pri	@ Priority
-	.byte	se_w076_rev	@ Reverb.
+	.byte	se_m_solar_beam_pri	@ Priority
+	.byte	se_m_solar_beam_rev	@ Reverb.
 
-	.word	se_w076_grp
+	.word	se_m_solar_beam_grp
 
-	.word	se_w076_1
+	.word	se_m_solar_beam_1
 
 	.end
diff --git a/sound/songs/se_w255.s b/sound/songs/se_m_spit_up.s
index 73169ec42..5d96c7b86 100644
--- a/sound/songs/se_w255.s
+++ b/sound/songs/se_m_spit_up.s
@@ -1,26 +1,26 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w255_grp, voicegroup128
-	.equ	se_w255_pri, 4
-	.equ	se_w255_rev, reverb_set+50
-	.equ	se_w255_mvl, 127
-	.equ	se_w255_key, 0
-	.equ	se_w255_tbs, 1
-	.equ	se_w255_exg, 0
-	.equ	se_w255_cmp, 1
+	.equ	se_m_spit_up_grp, voicegroup128
+	.equ	se_m_spit_up_pri, 4
+	.equ	se_m_spit_up_rev, reverb_set+50
+	.equ	se_m_spit_up_mvl, 127
+	.equ	se_m_spit_up_key, 0
+	.equ	se_m_spit_up_tbs, 1
+	.equ	se_m_spit_up_exg, 0
+	.equ	se_m_spit_up_cmp, 1
 
 	.section .rodata
-	.global	se_w255
+	.global	se_m_spit_up
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w255_1:
-	.byte	KEYSH , se_w255_key+0
-	.byte	TEMPO , 150*se_w255_tbs/2
+se_m_spit_up_1:
+	.byte	KEYSH , se_m_spit_up_key+0
+	.byte	TEMPO , 150*se_m_spit_up_tbs/2
 	.byte		VOICE , 65
 	.byte		BENDR , 12
-	.byte		VOL   , 110*se_w255_mvl/mxv
+	.byte		VOL   , 110*se_m_spit_up_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte		N03   , Gn3 , v112
@@ -56,10 +56,10 @@ se_w255_1:
 
 @********************** Track  2 **********************@
 
-se_w255_2:
-	.byte	KEYSH , se_w255_key+0
+se_m_spit_up_2:
+	.byte	KEYSH , se_m_spit_up_key+0
 	.byte		VOICE , 57
-	.byte		VOL   , 110*se_w255_mvl/mxv
+	.byte		VOL   , 110*se_m_spit_up_mvl/mxv
 	.byte		N03   , En3 , v052
 	.byte	W03
 	.byte	W01
@@ -74,15 +74,15 @@ se_w255_2:
 @******************************************************@
 	.align	2
 
-se_w255:
+se_m_spit_up:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w255_pri	@ Priority
-	.byte	se_w255_rev	@ Reverb.
+	.byte	se_m_spit_up_pri	@ Priority
+	.byte	se_m_spit_up_rev	@ Reverb.
 
-	.word	se_w255_grp
+	.word	se_m_spit_up_grp
 
-	.word	se_w255_1
-	.word	se_w255_2
+	.word	se_m_spit_up_1
+	.word	se_m_spit_up_2
 
 	.end
diff --git a/sound/songs/se_w287b.s b/sound/songs/se_m_stat_decrease.s
index a88a960cb..5cdf8ac36 100644
--- a/sound/songs/se_w287b.s
+++ b/sound/songs/se_m_stat_decrease.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w287b_grp, voicegroup128
-	.equ	se_w287b_pri, 4
-	.equ	se_w287b_rev, reverb_set+50
-	.equ	se_w287b_mvl, 127
-	.equ	se_w287b_key, 0
-	.equ	se_w287b_tbs, 1
-	.equ	se_w287b_exg, 0
-	.equ	se_w287b_cmp, 1
+	.equ	se_m_stat_decrease_grp, voicegroup128
+	.equ	se_m_stat_decrease_pri, 4
+	.equ	se_m_stat_decrease_rev, reverb_set+50
+	.equ	se_m_stat_decrease_mvl, 127
+	.equ	se_m_stat_decrease_key, 0
+	.equ	se_m_stat_decrease_tbs, 1
+	.equ	se_m_stat_decrease_exg, 0
+	.equ	se_m_stat_decrease_cmp, 1
 
 	.section .rodata
-	.global	se_w287b
+	.global	se_m_stat_decrease
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w287b_1:
-	.byte	KEYSH , se_w287b_key+0
-	.byte	TEMPO , 170*se_w287b_tbs/2
+se_m_stat_decrease_1:
+	.byte	KEYSH , se_m_stat_decrease_key+0
+	.byte	TEMPO , 170*se_m_stat_decrease_tbs/2
 	.byte		VOICE , 67
-	.byte		VOL   , 70*se_w287b_mvl/mxv
+	.byte		VOL   , 70*se_m_stat_decrease_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+42
 	.byte		N02   , Cs6 , v076
@@ -194,12 +194,12 @@ se_w287b_1:
 
 @********************** Track  2 **********************@
 
-se_w287b_2:
-	.byte	KEYSH , se_w287b_key+0
+se_m_stat_decrease_2:
+	.byte	KEYSH , se_m_stat_decrease_key+0
 	.byte		VOICE , 55
 	.byte		XCMD  , xIECV , 10
 	.byte		        xIECL , 8
-	.byte		VOL   , 70*se_w287b_mvl/mxv
+	.byte		VOL   , 70*se_m_stat_decrease_mvl/mxv
 	.byte		N02   , As3 , v052
 	.byte	W03
 	.byte		N02   
@@ -257,15 +257,15 @@ se_w287b_2:
 @******************************************************@
 	.align	2
 
-se_w287b:
+se_m_stat_decrease:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w287b_pri	@ Priority
-	.byte	se_w287b_rev	@ Reverb.
+	.byte	se_m_stat_decrease_pri	@ Priority
+	.byte	se_m_stat_decrease_rev	@ Reverb.
 
-	.word	se_w287b_grp
+	.word	se_m_stat_decrease_grp
 
-	.word	se_w287b_1
-	.word	se_w287b_2
+	.word	se_m_stat_decrease_1
+	.word	se_m_stat_decrease_2
 
 	.end
diff --git a/sound/songs/se_w287.s b/sound/songs/se_m_stat_increase.s
index 5f5cc503d..e9eea563a 100644
--- a/sound/songs/se_w287.s
+++ b/sound/songs/se_m_stat_increase.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w287_grp, voicegroup128
-	.equ	se_w287_pri, 4
-	.equ	se_w287_rev, reverb_set+50
-	.equ	se_w287_mvl, 127
-	.equ	se_w287_key, 0
-	.equ	se_w287_tbs, 1
-	.equ	se_w287_exg, 0
-	.equ	se_w287_cmp, 1
+	.equ	se_m_stat_increase_grp, voicegroup128
+	.equ	se_m_stat_increase_pri, 4
+	.equ	se_m_stat_increase_rev, reverb_set+50
+	.equ	se_m_stat_increase_mvl, 127
+	.equ	se_m_stat_increase_key, 0
+	.equ	se_m_stat_increase_tbs, 1
+	.equ	se_m_stat_increase_exg, 0
+	.equ	se_m_stat_increase_cmp, 1
 
 	.section .rodata
-	.global	se_w287
+	.global	se_m_stat_increase
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w287_1:
-	.byte	KEYSH , se_w287_key+0
-	.byte	TEMPO , 170*se_w287_tbs/2
+se_m_stat_increase_1:
+	.byte	KEYSH , se_m_stat_increase_key+0
+	.byte	TEMPO , 170*se_m_stat_increase_tbs/2
 	.byte		VOICE , 67
-	.byte		VOL   , 70*se_w287_mvl/mxv
+	.byte		VOL   , 70*se_m_stat_increase_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte		N02   , An5 , v076
@@ -206,12 +206,12 @@ se_w287_1:
 
 @********************** Track  2 **********************@
 
-se_w287_2:
-	.byte	KEYSH , se_w287_key+0
+se_m_stat_increase_2:
+	.byte	KEYSH , se_m_stat_increase_key+0
 	.byte		VOICE , 55
 	.byte		XCMD  , xIECV , 10
 	.byte		        xIECL , 8
-	.byte		VOL   , 70*se_w287_mvl/mxv
+	.byte		VOL   , 70*se_m_stat_increase_mvl/mxv
 	.byte		N02   , Cn3 , v052
 	.byte	W03
 	.byte		N02   
@@ -269,15 +269,15 @@ se_w287_2:
 @******************************************************@
 	.align	2
 
-se_w287:
+se_m_stat_increase:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w287_pri	@ Priority
-	.byte	se_w287_rev	@ Reverb.
+	.byte	se_m_stat_increase_pri	@ Priority
+	.byte	se_m_stat_increase_rev	@ Reverb.
 
-	.word	se_w287_grp
+	.word	se_m_stat_increase_grp
 
-	.word	se_w287_1
-	.word	se_w287_2
+	.word	se_m_stat_increase_1
+	.word	se_m_stat_increase_2
 
 	.end
diff --git a/sound/songs/se_w070.s b/sound/songs/se_m_strength.s
index 876bad52b..0fca48906 100644
--- a/sound/songs/se_w070.s
+++ b/sound/songs/se_m_strength.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w070_grp, voicegroup128
-	.equ	se_w070_pri, 4
-	.equ	se_w070_rev, reverb_set+50
-	.equ	se_w070_mvl, 127
-	.equ	se_w070_key, 0
-	.equ	se_w070_tbs, 1
-	.equ	se_w070_exg, 0
-	.equ	se_w070_cmp, 1
+	.equ	se_m_strength_grp, voicegroup128
+	.equ	se_m_strength_pri, 4
+	.equ	se_m_strength_rev, reverb_set+50
+	.equ	se_m_strength_mvl, 127
+	.equ	se_m_strength_key, 0
+	.equ	se_m_strength_tbs, 1
+	.equ	se_m_strength_exg, 0
+	.equ	se_m_strength_cmp, 1
 
 	.section .rodata
-	.global	se_w070
+	.global	se_m_strength
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w070_1:
-	.byte	KEYSH , se_w070_key+0
-	.byte	TEMPO , 150*se_w070_tbs/2
+se_m_strength_1:
+	.byte	KEYSH , se_m_strength_key+0
+	.byte	TEMPO , 150*se_m_strength_tbs/2
 	.byte		VOICE , 26
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w070_mvl/mxv
+	.byte		VOL   , 110*se_m_strength_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N03   , Gn2 , v127
 	.byte	W03
@@ -44,11 +44,11 @@ se_w070_1:
 
 @********************** Track  2 **********************@
 
-se_w070_2:
-	.byte	KEYSH , se_w070_key+0
+se_m_strength_2:
+	.byte	KEYSH , se_m_strength_key+0
 	.byte		VOICE , 5
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w070_mvl/mxv
+	.byte		VOL   , 110*se_m_strength_mvl/mxv
 	.byte		N02   , Fn2 , v072
 	.byte	W02
 	.byte		N01   
@@ -70,15 +70,15 @@ se_w070_2:
 @******************************************************@
 	.align	2
 
-se_w070:
+se_m_strength:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w070_pri	@ Priority
-	.byte	se_w070_rev	@ Reverb.
+	.byte	se_m_strength_pri	@ Priority
+	.byte	se_m_strength_rev	@ Reverb.
 
-	.word	se_w070_grp
+	.word	se_m_strength_grp
 
-	.word	se_w070_1
-	.word	se_w070_2
+	.word	se_m_strength_1
+	.word	se_m_strength_2
 
 	.end
diff --git a/sound/songs/se_w081.s b/sound/songs/se_m_string_shot.s
index 248f44c6f..d750d26b9 100644
--- a/sound/songs/se_w081.s
+++ b/sound/songs/se_m_string_shot.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w081_grp, voicegroup128
-	.equ	se_w081_pri, 4
-	.equ	se_w081_rev, reverb_set+50
-	.equ	se_w081_mvl, 127
-	.equ	se_w081_key, 0
-	.equ	se_w081_tbs, 1
-	.equ	se_w081_exg, 0
-	.equ	se_w081_cmp, 1
+	.equ	se_m_string_shot_grp, voicegroup128
+	.equ	se_m_string_shot_pri, 4
+	.equ	se_m_string_shot_rev, reverb_set+50
+	.equ	se_m_string_shot_mvl, 127
+	.equ	se_m_string_shot_key, 0
+	.equ	se_m_string_shot_tbs, 1
+	.equ	se_m_string_shot_exg, 0
+	.equ	se_m_string_shot_cmp, 1
 
 	.section .rodata
-	.global	se_w081
+	.global	se_m_string_shot
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w081_1:
-	.byte	KEYSH , se_w081_key+0
-	.byte	TEMPO , 250*se_w081_tbs/2
+se_m_string_shot_1:
+	.byte	KEYSH , se_m_string_shot_key+0
+	.byte	TEMPO , 250*se_m_string_shot_tbs/2
 	.byte		VOICE , 22
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w081_mvl/mxv
+	.byte		VOL   , 110*se_m_string_shot_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N48   , Fn4 , v108
 	.byte	W03
@@ -50,31 +50,31 @@ se_w081_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte	W06
-	.byte		VOL   , 90*se_w081_mvl/mxv
+	.byte		VOL   , 90*se_m_string_shot_mvl/mxv
 	.byte	W03
-	.byte		        71*se_w081_mvl/mxv
+	.byte		        71*se_m_string_shot_mvl/mxv
 	.byte	W03
-	.byte		        58*se_w081_mvl/mxv
+	.byte		        58*se_m_string_shot_mvl/mxv
 	.byte	W03
-	.byte		        41*se_w081_mvl/mxv
+	.byte		        41*se_m_string_shot_mvl/mxv
 	.byte	W03
-	.byte		        27*se_w081_mvl/mxv
+	.byte		        27*se_m_string_shot_mvl/mxv
 	.byte	W03
-	.byte		        7*se_w081_mvl/mxv
+	.byte		        7*se_m_string_shot_mvl/mxv
 	.byte	W03
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w081:
+se_m_string_shot:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w081_pri	@ Priority
-	.byte	se_w081_rev	@ Reverb.
+	.byte	se_m_string_shot_pri	@ Priority
+	.byte	se_m_string_shot_rev	@ Reverb.
 
-	.word	se_w081_grp
+	.word	se_m_string_shot_grp
 
-	.word	se_w081_1
+	.word	se_m_string_shot_1
 
 	.end
diff --git a/sound/songs/se_w081b.s b/sound/songs/se_m_string_shot2.s
index d20162cd3..7bd0a7427 100644
--- a/sound/songs/se_w081b.s
+++ b/sound/songs/se_m_string_shot2.s
@@ -1,26 +1,26 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w081b_grp, voicegroup128
-	.equ	se_w081b_pri, 4
-	.equ	se_w081b_rev, reverb_set+50
-	.equ	se_w081b_mvl, 127
-	.equ	se_w081b_key, 0
-	.equ	se_w081b_tbs, 1
-	.equ	se_w081b_exg, 0
-	.equ	se_w081b_cmp, 1
+	.equ	se_m_string_shot2_grp, voicegroup128
+	.equ	se_m_string_shot2_pri, 4
+	.equ	se_m_string_shot2_rev, reverb_set+50
+	.equ	se_m_string_shot2_mvl, 127
+	.equ	se_m_string_shot2_key, 0
+	.equ	se_m_string_shot2_tbs, 1
+	.equ	se_m_string_shot2_exg, 0
+	.equ	se_m_string_shot2_cmp, 1
 
 	.section .rodata
-	.global	se_w081b
+	.global	se_m_string_shot2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w081b_1:
-	.byte	KEYSH , se_w081b_key+0
-	.byte	TEMPO , 250*se_w081b_tbs/2
+se_m_string_shot2_1:
+	.byte	KEYSH , se_m_string_shot2_key+0
+	.byte	TEMPO , 250*se_m_string_shot2_tbs/2
 	.byte		VOICE , 10
 	.byte		BENDR , 12
-	.byte		VOL   , 105*se_w081b_mvl/mxv
+	.byte		VOL   , 105*se_m_string_shot2_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v+0
 	.byte		N09   , En4 , v112
@@ -93,17 +93,17 @@ se_w081b_1:
 
 @********************** Track  2 **********************@
 
-se_w081b_2:
-	.byte	KEYSH , se_w081b_key+0
+se_m_string_shot2_2:
+	.byte	KEYSH , se_m_string_shot2_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 105*se_w081b_mvl/mxv
+	.byte		VOL   , 105*se_m_string_shot2_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte		N09   , Cn3 , v052
 	.byte	W12
 	.byte		PAN   , c_v-7
 	.byte		N09   , Gn2 
 	.byte	W12
-se_w081b_2_000:
+se_m_string_shot2_2_000:
 	.byte		PAN   , c_v+9
 	.byte		N09   , Cn3 , v052
 	.byte	W12
@@ -112,23 +112,23 @@ se_w081b_2_000:
 	.byte	W12
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w081b_2_000
+	 .word	se_m_string_shot2_2_000
 	.byte	PATT
-	 .word	se_w081b_2_000
+	 .word	se_m_string_shot2_2_000
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w081b:
+se_m_string_shot2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w081b_pri	@ Priority
-	.byte	se_w081b_rev	@ Reverb.
+	.byte	se_m_string_shot2_pri	@ Priority
+	.byte	se_m_string_shot2_rev	@ Reverb.
 
-	.word	se_w081b_grp
+	.word	se_m_string_shot2_grp
 
-	.word	se_w081b_1
-	.word	se_w081b_2
+	.word	se_m_string_shot2_1
+	.word	se_m_string_shot2_2
 
 	.end
diff --git a/sound/songs/se_w048.s b/sound/songs/se_m_supersonic.s
index 8046eae58..f791c9b15 100644
--- a/sound/songs/se_w048.s
+++ b/sound/songs/se_m_supersonic.s
@@ -1,47 +1,47 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w048_grp, voicegroup128
-	.equ	se_w048_pri, 4
-	.equ	se_w048_rev, reverb_set+50
-	.equ	se_w048_mvl, 127
-	.equ	se_w048_key, 0
-	.equ	se_w048_tbs, 1
-	.equ	se_w048_exg, 0
-	.equ	se_w048_cmp, 1
+	.equ	se_m_supersonic_grp, voicegroup128
+	.equ	se_m_supersonic_pri, 4
+	.equ	se_m_supersonic_rev, reverb_set+50
+	.equ	se_m_supersonic_mvl, 127
+	.equ	se_m_supersonic_key, 0
+	.equ	se_m_supersonic_tbs, 1
+	.equ	se_m_supersonic_exg, 0
+	.equ	se_m_supersonic_cmp, 1
 
 	.section .rodata
-	.global	se_w048
+	.global	se_m_supersonic
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w048_1:
-	.byte	KEYSH , se_w048_key+0
-	.byte	TEMPO , 150*se_w048_tbs/2
+se_m_supersonic_1:
+	.byte	KEYSH , se_m_supersonic_key+0
+	.byte	TEMPO , 150*se_m_supersonic_tbs/2
 	.byte		VOICE , 43
 	.byte		BENDR , 2
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 61*se_w048_mvl/mxv
+	.byte		VOL   , 61*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-4
 	.byte		N07   , Gs4 , v127
 	.byte	W01
 	.byte		PAN   , c_v+6
-	.byte		VOL   , 75*se_w048_mvl/mxv
+	.byte		VOL   , 75*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-1
 	.byte	W01
 	.byte		PAN   , c_v-7
-	.byte		VOL   , 93*se_w048_mvl/mxv
+	.byte		VOL   , 93*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v+2
 	.byte	W01
 	.byte		PAN   , c_v+9
-	.byte		VOL   , 110*se_w048_mvl/mxv
+	.byte		VOL   , 110*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v+4
 	.byte	W01
 	.byte		PAN   , c_v-12
 	.byte		BEND  , c_v+7
 	.byte	W02
 	.byte	W02
-	.byte		VOL   , 0*se_w048_mvl/mxv
+	.byte		VOL   , 0*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-4
 	.byte		N32   
@@ -50,68 +50,68 @@ se_w048_1:
 	.byte		BEND  , c_v-1
 	.byte	W01
 	.byte		PAN   , c_v-7
-	.byte		VOL   , 36*se_w048_mvl/mxv
+	.byte		VOL   , 36*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v+2
 	.byte	W02
 	.byte		PAN   , c_v+9
-	.byte		VOL   , 67*se_w048_mvl/mxv
+	.byte		VOL   , 67*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-1
 	.byte	W01
 	.byte		PAN   , c_v-13
-	.byte		VOL   , 84*se_w048_mvl/mxv
+	.byte		VOL   , 84*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-4
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-6
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 92*se_w048_mvl/mxv
+	.byte		VOL   , 92*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-8
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-7
 	.byte	W02
 	.byte		PAN   , c_v+6
-	.byte		VOL   , 99*se_w048_mvl/mxv
+	.byte		VOL   , 99*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-4
 	.byte	W01
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v-1
 	.byte	W01
-	.byte		VOL   , 105*se_w048_mvl/mxv
+	.byte		VOL   , 105*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte		BEND  , c_v+2
 	.byte	W01
-	.byte		VOL   , 110*se_w048_mvl/mxv
+	.byte		VOL   , 110*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-13
 	.byte		BEND  , c_v-1
 	.byte	W01
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-4
 	.byte	W02
-	.byte		VOL   , 46*se_w048_mvl/mxv
+	.byte		VOL   , 46*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-1
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+2
 	.byte	W01
-	.byte		VOL   , 67*se_w048_mvl/mxv
+	.byte		VOL   , 67*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v-1
 	.byte	W01
 	.byte		PAN   , c_v+9
 	.byte		BEND  , c_v-4
 	.byte	W01
-	.byte		VOL   , 84*se_w048_mvl/mxv
+	.byte		VOL   , 84*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-13
 	.byte		BEND  , c_v-6
 	.byte	W02
-	.byte		VOL   , 100*se_w048_mvl/mxv
+	.byte		VOL   , 100*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-8
 	.byte	W01
-	.byte		VOL   , 110*se_w048_mvl/mxv
+	.byte		VOL   , 110*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v-7
 	.byte	W01
@@ -121,26 +121,26 @@ se_w048_1:
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-1
 	.byte	W01
-	.byte		VOL   , 101*se_w048_mvl/mxv
+	.byte		VOL   , 101*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v+2
 	.byte	W02
-	.byte		VOL   , 85*se_w048_mvl/mxv
+	.byte		VOL   , 85*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte		BEND  , c_v-1
 	.byte	W01
-	.byte		VOL   , 75*se_w048_mvl/mxv
+	.byte		VOL   , 75*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-13
 	.byte		BEND  , c_v-4
 	.byte	W01
-	.byte		VOL   , 48*se_w048_mvl/mxv
+	.byte		VOL   , 48*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v-1
 	.byte		BEND  , c_v-6
 	.byte	W01
-	.byte		VOL   , 24*se_w048_mvl/mxv
+	.byte		VOL   , 24*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-8
 	.byte	W01
-	.byte		VOL   , 6*se_w048_mvl/mxv
+	.byte		VOL   , 6*se_m_supersonic_mvl/mxv
 	.byte		BEND  , c_v-7
 	.byte	W02
 	.byte	FINE
@@ -148,14 +148,14 @@ se_w048_1:
 @******************************************************@
 	.align	2
 
-se_w048:
+se_m_supersonic:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w048_pri	@ Priority
-	.byte	se_w048_rev	@ Reverb.
+	.byte	se_m_supersonic_pri	@ Priority
+	.byte	se_m_supersonic_rev	@ Reverb.
 
-	.word	se_w048_grp
+	.word	se_m_supersonic_grp
 
-	.word	se_w048_1
+	.word	se_m_supersonic_1
 
 	.end
diff --git a/sound/songs/se_w057.s b/sound/songs/se_m_surf.s
index 6d74168ce..d3e307782 100644
--- a/sound/songs/se_w057.s
+++ b/sound/songs/se_m_surf.s
@@ -1,43 +1,43 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w057_grp, voicegroup128
-	.equ	se_w057_pri, 4
-	.equ	se_w057_rev, reverb_set+50
-	.equ	se_w057_mvl, 127
-	.equ	se_w057_key, 0
-	.equ	se_w057_tbs, 1
-	.equ	se_w057_exg, 0
-	.equ	se_w057_cmp, 1
+	.equ	se_m_surf_grp, voicegroup128
+	.equ	se_m_surf_pri, 4
+	.equ	se_m_surf_rev, reverb_set+50
+	.equ	se_m_surf_mvl, 127
+	.equ	se_m_surf_key, 0
+	.equ	se_m_surf_tbs, 1
+	.equ	se_m_surf_exg, 0
+	.equ	se_m_surf_cmp, 1
 
 	.section .rodata
-	.global	se_w057
+	.global	se_m_surf
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w057_1:
-	.byte	KEYSH , se_w057_key+0
-	.byte	TEMPO , 150*se_w057_tbs/2
+se_m_surf_1:
+	.byte	KEYSH , se_m_surf_key+0
+	.byte	TEMPO , 150*se_m_surf_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
-	.byte		VOL   , 27*se_w057_mvl/mxv
+	.byte		VOL   , 27*se_m_surf_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte		N96   , Cn3 , v112
 	.byte	W04
-	.byte		VOL   , 45*se_w057_mvl/mxv
+	.byte		VOL   , 45*se_m_surf_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-4
 	.byte	W02
 	.byte		BEND  , c_v+4
 	.byte	W01
-	.byte		VOL   , 60*se_w057_mvl/mxv
+	.byte		VOL   , 60*se_m_surf_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-10
 	.byte	W02
 	.byte		BEND  , c_v+9
 	.byte	W01
-	.byte		VOL   , 88*se_w057_mvl/mxv
+	.byte		VOL   , 88*se_m_surf_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-5
 	.byte	W02
@@ -45,7 +45,7 @@ se_w057_1:
 	.byte	W04
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 110*se_w057_mvl/mxv
+	.byte		VOL   , 110*se_m_surf_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+19
 	.byte	W03
@@ -65,29 +65,29 @@ se_w057_1:
 	.byte	W04
 	.byte		PAN   , c_v-10
 	.byte	W01
-	.byte		VOL   , 98*se_w057_mvl/mxv
+	.byte		VOL   , 98*se_m_surf_mvl/mxv
 	.byte	W05
-	.byte		        81*se_w057_mvl/mxv
+	.byte		        81*se_m_surf_mvl/mxv
 	.byte		PAN   , c_v-5
 	.byte		BEND  , c_v+12
 	.byte	W06
-	.byte		VOL   , 68*se_w057_mvl/mxv
+	.byte		VOL   , 68*se_m_surf_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W03
 	.byte		BEND  , c_v+17
 	.byte	W01
-	.byte		VOL   , 50*se_w057_mvl/mxv
+	.byte		VOL   , 50*se_m_surf_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+4
 	.byte	W03
-	.byte		VOL   , 31*se_w057_mvl/mxv
+	.byte		VOL   , 31*se_m_surf_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v+11
 	.byte		BEND  , c_v+22
 	.byte	W02
-	.byte		VOL   , 11*se_w057_mvl/mxv
+	.byte		VOL   , 11*se_m_surf_mvl/mxv
 	.byte	W04
-	.byte		        6*se_w057_mvl/mxv
+	.byte		        6*se_m_surf_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+30
 	.byte	W06
@@ -96,14 +96,14 @@ se_w057_1:
 @******************************************************@
 	.align	2
 
-se_w057:
+se_m_surf:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w057_pri	@ Priority
-	.byte	se_w057_rev	@ Reverb.
+	.byte	se_m_surf_pri	@ Priority
+	.byte	se_m_surf_rev	@ Reverb.
 
-	.word	se_w057_grp
+	.word	se_m_surf_grp
 
-	.word	se_w057_1
+	.word	se_m_surf_1
 
 	.end
diff --git a/sound/songs/se_m_swagger.s b/sound/songs/se_m_swagger.s
new file mode 100644
index 000000000..9b4b5756b
--- /dev/null
+++ b/sound/songs/se_m_swagger.s
@@ -0,0 +1,77 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_swagger_grp, voicegroup128
+	.equ	se_m_swagger_pri, 4
+	.equ	se_m_swagger_rev, reverb_set+50
+	.equ	se_m_swagger_mvl, 127
+	.equ	se_m_swagger_key, 0
+	.equ	se_m_swagger_tbs, 1
+	.equ	se_m_swagger_exg, 0
+	.equ	se_m_swagger_cmp, 1
+
+	.section .rodata
+	.global	se_m_swagger
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_swagger_1:
+	.byte	KEYSH , se_m_swagger_key+0
+	.byte	TEMPO , 190*se_m_swagger_tbs/2
+	.byte		VOICE , 2
+	.byte		BENDR , 8
+	.byte		PAN   , c_v+0
+	.byte		VOL   , 28*se_m_swagger_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N15   , An1 , v127
+	.byte	W01
+	.byte		VOL   , 60*se_m_swagger_mvl/mxv
+	.byte	W01
+	.byte		        111*se_m_swagger_mvl/mxv
+	.byte	W01
+	.byte		        120*se_m_swagger_mvl/mxv
+	.byte	W01
+	.byte		BEND  , c_v-3
+	.byte	W02
+	.byte		PAN   , c_v+5
+	.byte		BEND  , c_v-6
+	.byte	W01
+	.byte		PAN   , c_v-4
+	.byte		BEND  , c_v-8
+	.byte	W01
+	.byte		VOL   , 109*se_m_swagger_mvl/mxv
+	.byte		PAN   , c_v+9
+	.byte		BEND  , c_v-10
+	.byte	W01
+	.byte		PAN   , c_v-9
+	.byte		BEND  , c_v-14
+	.byte	W01
+	.byte		VOL   , 95*se_m_swagger_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v-19
+	.byte	W02
+	.byte		VOL   , 71*se_m_swagger_mvl/mxv
+	.byte		BEND  , c_v-29
+	.byte	W01
+	.byte		VOL   , 41*se_m_swagger_mvl/mxv
+	.byte		BEND  , c_v-38
+	.byte	W01
+	.byte		VOL   , 15*se_m_swagger_mvl/mxv
+	.byte		BEND  , c_v-52
+	.byte	W04
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_swagger:
+	.byte	1	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_swagger_pri	@ Priority
+	.byte	se_m_swagger_rev	@ Reverb.
+
+	.word	se_m_swagger_grp
+
+	.word	se_m_swagger_1
+
+	.end
diff --git a/sound/songs/se_w207b.s b/sound/songs/se_m_swagger2.s
index 9d199e8d3..0a0d76767 100644
--- a/sound/songs/se_w207b.s
+++ b/sound/songs/se_m_swagger2.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w207b_grp, voicegroup128
-	.equ	se_w207b_pri, 4
-	.equ	se_w207b_rev, reverb_set+50
-	.equ	se_w207b_mvl, 127
-	.equ	se_w207b_key, 0
-	.equ	se_w207b_tbs, 1
-	.equ	se_w207b_exg, 0
-	.equ	se_w207b_cmp, 1
+	.equ	se_m_swagger2_grp, voicegroup128
+	.equ	se_m_swagger2_pri, 4
+	.equ	se_m_swagger2_rev, reverb_set+50
+	.equ	se_m_swagger2_mvl, 127
+	.equ	se_m_swagger2_key, 0
+	.equ	se_m_swagger2_tbs, 1
+	.equ	se_m_swagger2_exg, 0
+	.equ	se_m_swagger2_cmp, 1
 
 	.section .rodata
-	.global	se_w207b
+	.global	se_m_swagger2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w207b_1:
-	.byte	KEYSH , se_w207b_key+0
-	.byte	TEMPO , 150*se_w207b_tbs/2
+se_m_swagger2_1:
+	.byte	KEYSH , se_m_swagger2_key+0
+	.byte	TEMPO , 150*se_m_swagger2_tbs/2
 	.byte		VOICE , 56
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 65*se_w207b_mvl/mxv
+	.byte		VOL   , 65*se_m_swagger2_mvl/mxv
 	.byte		BEND  , c_v+8
 	.byte		N01   , Cs6 , v112
 	.byte	W01
@@ -43,14 +43,14 @@ se_w207b_1:
 @******************************************************@
 	.align	2
 
-se_w207b:
+se_m_swagger2:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w207b_pri	@ Priority
-	.byte	se_w207b_rev	@ Reverb.
+	.byte	se_m_swagger2_pri	@ Priority
+	.byte	se_m_swagger2_rev	@ Reverb.
 
-	.word	se_w207b_grp
+	.word	se_m_swagger2_grp
 
-	.word	se_w207b_1
+	.word	se_m_swagger2_1
 
 	.end
diff --git a/sound/songs/se_w230.s b/sound/songs/se_m_sweet_scent.s
index b446b3448..0abf858d2 100644
--- a/sound/songs/se_w230.s
+++ b/sound/songs/se_m_sweet_scent.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w230_grp, voicegroup128
-	.equ	se_w230_pri, 4
-	.equ	se_w230_rev, reverb_set+50
-	.equ	se_w230_mvl, 127
-	.equ	se_w230_key, 0
-	.equ	se_w230_tbs, 1
-	.equ	se_w230_exg, 0
-	.equ	se_w230_cmp, 1
+	.equ	se_m_sweet_scent_grp, voicegroup128
+	.equ	se_m_sweet_scent_pri, 4
+	.equ	se_m_sweet_scent_rev, reverb_set+50
+	.equ	se_m_sweet_scent_mvl, 127
+	.equ	se_m_sweet_scent_key, 0
+	.equ	se_m_sweet_scent_tbs, 1
+	.equ	se_m_sweet_scent_exg, 0
+	.equ	se_m_sweet_scent_cmp, 1
 
 	.section .rodata
-	.global	se_w230
+	.global	se_m_sweet_scent
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w230_1:
-	.byte	KEYSH , se_w230_key+0
-	.byte	TEMPO , 150*se_w230_tbs/2
+se_m_sweet_scent_1:
+	.byte	KEYSH , se_m_sweet_scent_key+0
+	.byte	TEMPO , 150*se_m_sweet_scent_tbs/2
 	.byte		VOICE , 61
 	.byte		BENDR , 44
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w230_mvl/mxv
+	.byte		VOL   , 110*se_m_sweet_scent_mvl/mxv
 	.byte		BEND  , c_v+2
 	.byte		N36   , En3 , v096
 	.byte	W12
@@ -61,67 +61,67 @@ se_w230_1:
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+12
 	.byte	W04
-	.byte		VOL   , 103*se_w230_mvl/mxv
+	.byte		VOL   , 103*se_m_sweet_scent_mvl/mxv
 	.byte	W04
-	.byte		        97*se_w230_mvl/mxv
+	.byte		        97*se_m_sweet_scent_mvl/mxv
 	.byte	W04
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+12
 	.byte	W01
-	.byte		VOL   , 91*se_w230_mvl/mxv
+	.byte		VOL   , 91*se_m_sweet_scent_mvl/mxv
 	.byte	W05
-	.byte		        81*se_w230_mvl/mxv
+	.byte		        81*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        72*se_w230_mvl/mxv
+	.byte		        72*se_m_sweet_scent_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+13
 	.byte	W01
-	.byte		VOL   , 62*se_w230_mvl/mxv
+	.byte		VOL   , 62*se_m_sweet_scent_mvl/mxv
 	.byte	W02
-	.byte		        51*se_w230_mvl/mxv
+	.byte		        51*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        39*se_w230_mvl/mxv
+	.byte		        39*se_m_sweet_scent_mvl/mxv
 	.byte	W02
-	.byte		        24*se_w230_mvl/mxv
+	.byte		        24*se_m_sweet_scent_mvl/mxv
 	.byte	W02
-	.byte		        12*se_w230_mvl/mxv
+	.byte		        12*se_m_sweet_scent_mvl/mxv
 	.byte	W02
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w230_2:
-	.byte	KEYSH , se_w230_key+0
+se_m_sweet_scent_2:
+	.byte	KEYSH , se_m_sweet_scent_key+0
 	.byte		VOICE , 22
 	.byte		BENDR , 44
 	.byte		PAN   , c_v+1
-	.byte		VOL   , 38*se_w230_mvl/mxv
+	.byte		VOL   , 38*se_m_sweet_scent_mvl/mxv
 	.byte		BEND  , c_v+1
 	.byte		TIE   , Gn3 , v100
 	.byte	W03
-	.byte		VOL   , 50*se_w230_mvl/mxv
+	.byte		VOL   , 50*se_m_sweet_scent_mvl/mxv
 	.byte	W04
-	.byte		        62*se_w230_mvl/mxv
+	.byte		        62*se_m_sweet_scent_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v-1
 	.byte	W01
-	.byte		VOL   , 65*se_w230_mvl/mxv
+	.byte		VOL   , 65*se_m_sweet_scent_mvl/mxv
 	.byte	W04
-	.byte		        74*se_w230_mvl/mxv
+	.byte		        74*se_m_sweet_scent_mvl/mxv
 	.byte	W04
-	.byte		        78*se_w230_mvl/mxv
+	.byte		        78*se_m_sweet_scent_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte	W03
-	.byte		VOL   , 86*se_w230_mvl/mxv
+	.byte		VOL   , 86*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        95*se_w230_mvl/mxv
+	.byte		        95*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        105*se_w230_mvl/mxv
+	.byte		        105*se_m_sweet_scent_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-4
 	.byte	W03
-	.byte		VOL   , 110*se_w230_mvl/mxv
+	.byte		VOL   , 110*se_m_sweet_scent_mvl/mxv
 	.byte	W13
 	.byte		BEND  , c_v-2
 	.byte	W04
@@ -140,37 +140,37 @@ se_w230_2:
 	.byte	W14
 	.byte		        c_v+3
 	.byte	W08
-	.byte		VOL   , 105*se_w230_mvl/mxv
+	.byte		VOL   , 105*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        101*se_w230_mvl/mxv
+	.byte		        101*se_m_sweet_scent_mvl/mxv
 	.byte	W05
-	.byte		        96*se_w230_mvl/mxv
+	.byte		        96*se_m_sweet_scent_mvl/mxv
 	.byte	W04
 	.byte		BEND  , c_v+2
 	.byte	W01
-	.byte		VOL   , 91*se_w230_mvl/mxv
+	.byte		VOL   , 91*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        86*se_w230_mvl/mxv
+	.byte		        86*se_m_sweet_scent_mvl/mxv
 	.byte	W05
-	.byte		        78*se_w230_mvl/mxv
+	.byte		        78*se_m_sweet_scent_mvl/mxv
 	.byte	W03
 	.byte	W02
-	.byte		        68*se_w230_mvl/mxv
+	.byte		        68*se_m_sweet_scent_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v+1
 	.byte	W04
-	.byte		VOL   , 58*se_w230_mvl/mxv
+	.byte		VOL   , 58*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		        48*se_w230_mvl/mxv
+	.byte		        48*se_m_sweet_scent_mvl/mxv
 	.byte	W04
-	.byte		        37*se_w230_mvl/mxv
+	.byte		        37*se_m_sweet_scent_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte	W04
-	.byte		VOL   , 23*se_w230_mvl/mxv
+	.byte		VOL   , 23*se_m_sweet_scent_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-1
 	.byte	W02
-	.byte		VOL   , 12*se_w230_mvl/mxv
+	.byte		VOL   , 12*se_m_sweet_scent_mvl/mxv
 	.byte	W03
 	.byte		EOT   
 	.byte	FINE
@@ -178,15 +178,15 @@ se_w230_2:
 @******************************************************@
 	.align	2
 
-se_w230:
+se_m_sweet_scent:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w230_pri	@ Priority
-	.byte	se_w230_rev	@ Reverb.
+	.byte	se_m_sweet_scent_pri	@ Priority
+	.byte	se_m_sweet_scent_rev	@ Reverb.
 
-	.word	se_w230_grp
+	.word	se_m_sweet_scent_grp
 
-	.word	se_w230_1
-	.word	se_w230_2
+	.word	se_m_sweet_scent_1
+	.word	se_m_sweet_scent_2
 
 	.end
diff --git a/sound/songs/se_w129.s b/sound/songs/se_m_swift.s
index 61b101462..10649a80e 100644
--- a/sound/songs/se_w129.s
+++ b/sound/songs/se_m_swift.s
@@ -1,45 +1,45 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w129_grp, voicegroup128
-	.equ	se_w129_pri, 4
-	.equ	se_w129_rev, reverb_set+50
-	.equ	se_w129_mvl, 127
-	.equ	se_w129_key, 0
-	.equ	se_w129_tbs, 1
-	.equ	se_w129_exg, 0
-	.equ	se_w129_cmp, 1
+	.equ	se_m_swift_grp, voicegroup128
+	.equ	se_m_swift_pri, 4
+	.equ	se_m_swift_rev, reverb_set+50
+	.equ	se_m_swift_mvl, 127
+	.equ	se_m_swift_key, 0
+	.equ	se_m_swift_tbs, 1
+	.equ	se_m_swift_exg, 0
+	.equ	se_m_swift_cmp, 1
 
 	.section .rodata
-	.global	se_w129
+	.global	se_m_swift
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w129_1:
-	.byte	KEYSH , se_w129_key+0
-	.byte	TEMPO , 180*se_w129_tbs/2
+se_m_swift_1:
+	.byte	KEYSH , se_m_swift_key+0
+	.byte	TEMPO , 180*se_m_swift_tbs/2
 	.byte		VOICE , 16
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 100*se_w129_mvl/mxv
+	.byte		VOL   , 100*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , Ds6 , v100
 	.byte	W01
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 90*se_w129_mvl/mxv
+	.byte		VOL   , 90*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 77*se_w129_mvl/mxv
+	.byte		VOL   , 77*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 37*se_w129_mvl/mxv
+	.byte		VOL   , 37*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W02
-	.byte		VOL   , 100*se_w129_mvl/mxv
+	.byte		VOL   , 100*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   
 	.byte	W01
@@ -47,18 +47,18 @@ se_w129_1:
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 90*se_w129_mvl/mxv
+	.byte		VOL   , 90*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 77*se_w129_mvl/mxv
+	.byte		VOL   , 77*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 37*se_w129_mvl/mxv
+	.byte		VOL   , 37*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W02
-	.byte		VOL   , 100*se_w129_mvl/mxv
+	.byte		VOL   , 100*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N06   , Ds6 , v056
 	.byte	W01
@@ -66,25 +66,25 @@ se_w129_1:
 	.byte		BEND  , c_v-11
 	.byte	W01
 	.byte		PAN   , c_v-6
-	.byte		VOL   , 90*se_w129_mvl/mxv
+	.byte		VOL   , 90*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		VOL   , 77*se_w129_mvl/mxv
+	.byte		VOL   , 77*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-37
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		VOL   , 37*se_w129_mvl/mxv
+	.byte		VOL   , 37*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v-47
 	.byte	W02
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w129_2:
-	.byte	KEYSH , se_w129_key+0
+se_m_swift_2:
+	.byte	KEYSH , se_m_swift_key+0
 	.byte		VOICE , 53
-	.byte		VOL   , 100*se_w129_mvl/mxv
+	.byte		VOL   , 100*se_m_swift_mvl/mxv
 	.byte	W02
 	.byte		N06   , Cn6 , v040
 	.byte	W04
@@ -97,15 +97,15 @@ se_w129_2:
 @******************************************************@
 	.align	2
 
-se_w129:
+se_m_swift:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w129_pri	@ Priority
-	.byte	se_w129_rev	@ Reverb.
+	.byte	se_m_swift_pri	@ Priority
+	.byte	se_m_swift_rev	@ Reverb.
 
-	.word	se_w129_grp
+	.word	se_m_swift_grp
 
-	.word	se_w129_1
-	.word	se_w129_2
+	.word	se_m_swift_1
+	.word	se_m_swift_2
 
 	.end
diff --git a/sound/songs/se_w298.s b/sound/songs/se_m_teeter_dance.s
index d21e4b710..8238afeb2 100644
--- a/sound/songs/se_w298.s
+++ b/sound/songs/se_m_teeter_dance.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w298_grp, voicegroup128
-	.equ	se_w298_pri, 4
-	.equ	se_w298_rev, reverb_set+50
-	.equ	se_w298_mvl, 127
-	.equ	se_w298_key, 0
-	.equ	se_w298_tbs, 1
-	.equ	se_w298_exg, 0
-	.equ	se_w298_cmp, 1
+	.equ	se_m_teeter_dance_grp, voicegroup128
+	.equ	se_m_teeter_dance_pri, 4
+	.equ	se_m_teeter_dance_rev, reverb_set+50
+	.equ	se_m_teeter_dance_mvl, 127
+	.equ	se_m_teeter_dance_key, 0
+	.equ	se_m_teeter_dance_tbs, 1
+	.equ	se_m_teeter_dance_exg, 0
+	.equ	se_m_teeter_dance_cmp, 1
 
 	.section .rodata
-	.global	se_w298
+	.global	se_m_teeter_dance
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w298_1:
-	.byte	KEYSH , se_w298_key+0
-	.byte	TEMPO , 170*se_w298_tbs/2
+se_m_teeter_dance_1:
+	.byte	KEYSH , se_m_teeter_dance_key+0
+	.byte	TEMPO , 170*se_m_teeter_dance_tbs/2
 	.byte		VOICE , 37
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w298_mvl/mxv
+	.byte		VOL   , 110*se_m_teeter_dance_mvl/mxv
 	.byte		BEND  , c_v-4
 	.byte		N03   , Gn4 , v100
 	.byte	W06
@@ -66,13 +66,13 @@ se_w298_1:
 
 @********************** Track  2 **********************@
 
-se_w298_2:
-	.byte	KEYSH , se_w298_key+0
+se_m_teeter_dance_2:
+	.byte	KEYSH , se_m_teeter_dance_key+0
 	.byte		VOICE , 47
 	.byte		XCMD  , xIECV , 10
 	.byte		        xIECL , 8
 	.byte		MOD   , 20
-	.byte		VOL   , 44*se_w298_mvl/mxv
+	.byte		VOL   , 44*se_m_teeter_dance_mvl/mxv
 	.byte		BEND  , c_v-2
 	.byte	W03
 	.byte		N03   , Gn3 , v112
@@ -107,15 +107,15 @@ se_w298_2:
 @******************************************************@
 	.align	2
 
-se_w298:
+se_m_teeter_dance:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w298_pri	@ Priority
-	.byte	se_w298_rev	@ Reverb.
+	.byte	se_m_teeter_dance_pri	@ Priority
+	.byte	se_m_teeter_dance_rev	@ Reverb.
 
-	.word	se_w298_grp
+	.word	se_m_teeter_dance_grp
 
-	.word	se_w298_1
-	.word	se_w298_2
+	.word	se_m_teeter_dance_1
+	.word	se_m_teeter_dance_2
 
 	.end
diff --git a/sound/songs/se_w100.s b/sound/songs/se_m_teleport.s
index e2a43dbcc..2c4ad40e8 100644
--- a/sound/songs/se_w100.s
+++ b/sound/songs/se_m_teleport.s
@@ -1,58 +1,58 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w100_grp, voicegroup128
-	.equ	se_w100_pri, 4
-	.equ	se_w100_rev, reverb_set+50
-	.equ	se_w100_mvl, 127
-	.equ	se_w100_key, 0
-	.equ	se_w100_tbs, 1
-	.equ	se_w100_exg, 0
-	.equ	se_w100_cmp, 1
+	.equ	se_m_teleport_grp, voicegroup128
+	.equ	se_m_teleport_pri, 4
+	.equ	se_m_teleport_rev, reverb_set+50
+	.equ	se_m_teleport_mvl, 127
+	.equ	se_m_teleport_key, 0
+	.equ	se_m_teleport_tbs, 1
+	.equ	se_m_teleport_exg, 0
+	.equ	se_m_teleport_cmp, 1
 
 	.section .rodata
-	.global	se_w100
+	.global	se_m_teleport
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w100_1:
-	.byte	KEYSH , se_w100_key+0
-	.byte	TEMPO , 150*se_w100_tbs/2
+se_m_teleport_1:
+	.byte	KEYSH , se_m_teleport_key+0
+	.byte	TEMPO , 150*se_m_teleport_tbs/2
 	.byte		VOICE , 45
 	.byte		BENDR , 24
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 32*se_w100_mvl/mxv
+	.byte		VOL   , 32*se_m_teleport_mvl/mxv
 	.byte		MOD   , 30
 	.byte		BEND  , c_v+0
 	.byte		N06   , Cn3 , v127
 	.byte	W01
 	.byte		BEND  , c_v+4
 	.byte	W01
-	.byte		VOL   , 49*se_w100_mvl/mxv
+	.byte		VOL   , 49*se_m_teleport_mvl/mxv
 	.byte		PAN   , c_v+5
 	.byte		BEND  , c_v+9
 	.byte	W01
 	.byte		        c_v+16
 	.byte	W01
-	.byte		VOL   , 61*se_w100_mvl/mxv
+	.byte		VOL   , 61*se_m_teleport_mvl/mxv
 	.byte		BEND  , c_v+24
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+2
 	.byte		N06   , Dn3 , v116
 	.byte	W01
-	.byte		VOL   , 71*se_w100_mvl/mxv
+	.byte		VOL   , 71*se_m_teleport_mvl/mxv
 	.byte		BEND  , c_v+7
 	.byte	W01
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+12
 	.byte	W01
-	.byte		VOL   , 81*se_w100_mvl/mxv
+	.byte		VOL   , 81*se_m_teleport_mvl/mxv
 	.byte		BEND  , c_v+18
 	.byte	W01
 	.byte		        c_v+27
 	.byte	W02
-	.byte		VOL   , 95*se_w100_mvl/mxv
+	.byte		VOL   , 95*se_m_teleport_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+4
 	.byte		N06   , En3 , v112
@@ -92,20 +92,20 @@ se_w100_1:
 	.byte	W01
 	.byte		        c_v+34
 	.byte	W02
-	.byte		VOL   , 82*se_w100_mvl/mxv
+	.byte		VOL   , 82*se_m_teleport_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+14
 	.byte		N06   , An3 , v100
 	.byte	W01
 	.byte		BEND  , c_v+18
 	.byte	W01
-	.byte		VOL   , 71*se_w100_mvl/mxv
+	.byte		VOL   , 71*se_m_teleport_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v+23
 	.byte	W01
 	.byte		        c_v+30
 	.byte	W01
-	.byte		VOL   , 61*se_w100_mvl/mxv
+	.byte		VOL   , 61*se_m_teleport_mvl/mxv
 	.byte		BEND  , c_v+38
 	.byte	W02
 	.byte		PAN   , c_v+0
@@ -152,14 +152,14 @@ se_w100_1:
 @******************************************************@
 	.align	2
 
-se_w100:
+se_m_teleport:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w100_pri	@ Priority
-	.byte	se_w100_rev	@ Reverb.
+	.byte	se_m_teleport_pri	@ Priority
+	.byte	se_m_teleport_rev	@ Reverb.
 
-	.word	se_w100_grp
+	.word	se_m_teleport_grp
 
-	.word	se_w100_1
+	.word	se_m_teleport_1
 
 	.end
diff --git a/sound/songs/se_w086.s b/sound/songs/se_m_thunder_wave.s
index 37bf21db0..c26535500 100644
--- a/sound/songs/se_w086.s
+++ b/sound/songs/se_m_thunder_wave.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w086_grp, voicegroup128
-	.equ	se_w086_pri, 4
-	.equ	se_w086_rev, reverb_set+50
-	.equ	se_w086_mvl, 127
-	.equ	se_w086_key, 0
-	.equ	se_w086_tbs, 1
-	.equ	se_w086_exg, 0
-	.equ	se_w086_cmp, 1
+	.equ	se_m_thunder_wave_grp, voicegroup128
+	.equ	se_m_thunder_wave_pri, 4
+	.equ	se_m_thunder_wave_rev, reverb_set+50
+	.equ	se_m_thunder_wave_mvl, 127
+	.equ	se_m_thunder_wave_key, 0
+	.equ	se_m_thunder_wave_tbs, 1
+	.equ	se_m_thunder_wave_exg, 0
+	.equ	se_m_thunder_wave_cmp, 1
 
 	.section .rodata
-	.global	se_w086
+	.global	se_m_thunder_wave
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w086_1:
-	.byte	KEYSH , se_w086_key+0
-	.byte	TEMPO , 150*se_w086_tbs/2
+se_m_thunder_wave_1:
+	.byte	KEYSH , se_m_thunder_wave_key+0
+	.byte	TEMPO , 150*se_m_thunder_wave_tbs/2
 	.byte		VOICE , 18
-	.byte		VOL   , 110*se_w086_mvl/mxv
+	.byte		VOL   , 110*se_m_thunder_wave_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+32
@@ -45,21 +45,21 @@ se_w086_1:
 	.byte	W02
 	.byte		N13   , Gn3 
 	.byte	W02
-	.byte		VOL   , 96*se_w086_mvl/mxv
+	.byte		VOL   , 96*se_m_thunder_wave_mvl/mxv
 	.byte	W01
-	.byte		        85*se_w086_mvl/mxv
+	.byte		        85*se_m_thunder_wave_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-23
 	.byte	W01
-	.byte		VOL   , 66*se_w086_mvl/mxv
+	.byte		VOL   , 66*se_m_thunder_wave_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-40
 	.byte	W01
-	.byte		VOL   , 36*se_w086_mvl/mxv
+	.byte		VOL   , 36*se_m_thunder_wave_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-54
 	.byte	W02
-	.byte		VOL   , 12*se_w086_mvl/mxv
+	.byte		VOL   , 12*se_m_thunder_wave_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-64
 	.byte	W21
@@ -67,10 +67,10 @@ se_w086_1:
 
 @********************** Track  2 **********************@
 
-se_w086_2:
-	.byte	KEYSH , se_w086_key+0
+se_m_thunder_wave_2:
+	.byte	KEYSH , se_m_thunder_wave_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 110*se_w086_mvl/mxv
+	.byte		VOL   , 110*se_m_thunder_wave_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte		N02   , En3 , v052
 	.byte	W04
@@ -92,15 +92,15 @@ se_w086_2:
 @******************************************************@
 	.align	2
 
-se_w086:
+se_m_thunder_wave:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w086_pri	@ Priority
-	.byte	se_w086_rev	@ Reverb.
+	.byte	se_m_thunder_wave_pri	@ Priority
+	.byte	se_m_thunder_wave_rev	@ Reverb.
 
-	.word	se_w086_grp
+	.word	se_m_thunder_wave_grp
 
-	.word	se_w086_1
-	.word	se_w086_2
+	.word	se_m_thunder_wave_1
+	.word	se_m_thunder_wave_2
 
 	.end
diff --git a/sound/songs/se_w085.s b/sound/songs/se_m_thunderbolt.s
index 21e8fc6df..3b3790313 100644
--- a/sound/songs/se_w085.s
+++ b/sound/songs/se_m_thunderbolt.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w085_grp, voicegroup128
-	.equ	se_w085_pri, 4
-	.equ	se_w085_rev, reverb_set+50
-	.equ	se_w085_mvl, 127
-	.equ	se_w085_key, 0
-	.equ	se_w085_tbs, 1
-	.equ	se_w085_exg, 0
-	.equ	se_w085_cmp, 1
+	.equ	se_m_thunderbolt_grp, voicegroup128
+	.equ	se_m_thunderbolt_pri, 4
+	.equ	se_m_thunderbolt_rev, reverb_set+50
+	.equ	se_m_thunderbolt_mvl, 127
+	.equ	se_m_thunderbolt_key, 0
+	.equ	se_m_thunderbolt_tbs, 1
+	.equ	se_m_thunderbolt_exg, 0
+	.equ	se_m_thunderbolt_cmp, 1
 
 	.section .rodata
-	.global	se_w085
+	.global	se_m_thunderbolt
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w085_1:
-	.byte	KEYSH , se_w085_key+0
-	.byte	TEMPO , 220*se_w085_tbs/2
+se_m_thunderbolt_1:
+	.byte	KEYSH , se_m_thunderbolt_key+0
+	.byte	TEMPO , 220*se_m_thunderbolt_tbs/2
 	.byte		VOICE , 18
-	.byte		VOL   , 120*se_w085_mvl/mxv
+	.byte		VOL   , 120*se_m_thunderbolt_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+32
@@ -55,23 +55,23 @@ se_w085_1:
 	.byte	W01
 	.byte		BEND  , c_v-23
 	.byte	W02
-	.byte		VOL   , 100*se_w085_mvl/mxv
+	.byte		VOL   , 100*se_m_thunderbolt_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-40
 	.byte	W01
-	.byte		VOL   , 86*se_w085_mvl/mxv
+	.byte		VOL   , 86*se_m_thunderbolt_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-54
 	.byte	W01
 	.byte		PAN   , c_v+10
-	.byte		VOL   , 68*se_w085_mvl/mxv
+	.byte		VOL   , 68*se_m_thunderbolt_mvl/mxv
 	.byte	W02
-	.byte		        37*se_w085_mvl/mxv
+	.byte		        37*se_m_thunderbolt_mvl/mxv
 	.byte		BEND  , c_v-64
 	.byte	W01
 	.byte		PAN   , c_v+16
 	.byte	W02
-	.byte		VOL   , 17*se_w085_mvl/mxv
+	.byte		VOL   , 17*se_m_thunderbolt_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+10
 	.byte	W15
@@ -79,10 +79,10 @@ se_w085_1:
 
 @********************** Track  2 **********************@
 
-se_w085_2:
-	.byte	KEYSH , se_w085_key+0
+se_m_thunderbolt_2:
+	.byte	KEYSH , se_m_thunderbolt_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 120*se_w085_mvl/mxv
+	.byte		VOL   , 120*se_m_thunderbolt_mvl/mxv
 	.byte		PAN   , c_v-7
 	.byte		N02   , En3 , v048
 	.byte	W05
@@ -103,15 +103,15 @@ se_w085_2:
 @******************************************************@
 	.align	2
 
-se_w085:
+se_m_thunderbolt:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w085_pri	@ Priority
-	.byte	se_w085_rev	@ Reverb.
+	.byte	se_m_thunderbolt_pri	@ Priority
+	.byte	se_m_thunderbolt_rev	@ Reverb.
 
-	.word	se_w085_grp
+	.word	se_m_thunderbolt_grp
 
-	.word	se_w085_1
-	.word	se_w085_2
+	.word	se_m_thunderbolt_1
+	.word	se_m_thunderbolt_2
 
 	.end
diff --git a/sound/songs/se_w085b.s b/sound/songs/se_m_thunderbolt2.s
index b42007094..506820395 100644
--- a/sound/songs/se_w085b.s
+++ b/sound/songs/se_m_thunderbolt2.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w085b_grp, voicegroup128
-	.equ	se_w085b_pri, 4
-	.equ	se_w085b_rev, reverb_set+50
-	.equ	se_w085b_mvl, 127
-	.equ	se_w085b_key, 0
-	.equ	se_w085b_tbs, 1
-	.equ	se_w085b_exg, 0
-	.equ	se_w085b_cmp, 1
+	.equ	se_m_thunderbolt2_grp, voicegroup128
+	.equ	se_m_thunderbolt2_pri, 4
+	.equ	se_m_thunderbolt2_rev, reverb_set+50
+	.equ	se_m_thunderbolt2_mvl, 127
+	.equ	se_m_thunderbolt2_key, 0
+	.equ	se_m_thunderbolt2_tbs, 1
+	.equ	se_m_thunderbolt2_exg, 0
+	.equ	se_m_thunderbolt2_cmp, 1
 
 	.section .rodata
-	.global	se_w085b
+	.global	se_m_thunderbolt2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w085b_1:
-	.byte	KEYSH , se_w085b_key+0
-	.byte	TEMPO , 220*se_w085b_tbs/2
+se_m_thunderbolt2_1:
+	.byte	KEYSH , se_m_thunderbolt2_key+0
+	.byte	TEMPO , 220*se_m_thunderbolt2_tbs/2
 	.byte		VOICE , 18
-	.byte		VOL   , 100*se_w085b_mvl/mxv
+	.byte		VOL   , 100*se_m_thunderbolt2_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -44,10 +44,10 @@ se_w085b_1:
 
 @********************** Track  2 **********************@
 
-se_w085b_2:
-	.byte	KEYSH , se_w085b_key+0
+se_m_thunderbolt2_2:
+	.byte	KEYSH , se_m_thunderbolt2_key+0
 	.byte		VOICE , 5
-	.byte		VOL   , 100*se_w085b_mvl/mxv
+	.byte		VOL   , 100*se_m_thunderbolt2_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte		N02   , Gn3 , v072
 	.byte	W06
@@ -71,15 +71,15 @@ se_w085b_2:
 @******************************************************@
 	.align	2
 
-se_w085b:
+se_m_thunderbolt2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w085b_pri	@ Priority
-	.byte	se_w085b_rev	@ Reverb.
+	.byte	se_m_thunderbolt2_pri	@ Priority
+	.byte	se_m_thunderbolt2_rev	@ Reverb.
 
-	.word	se_w085b_grp
+	.word	se_m_thunderbolt2_grp
 
-	.word	se_w085b_1
-	.word	se_w085b_2
+	.word	se_m_thunderbolt2_1
+	.word	se_m_thunderbolt2_2
 
 	.end
diff --git a/sound/songs/se_w092.s b/sound/songs/se_m_toxic.s
index b82665340..0e3ebe220 100644
--- a/sound/songs/se_w092.s
+++ b/sound/songs/se_m_toxic.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w092_grp, voicegroup128
-	.equ	se_w092_pri, 4
-	.equ	se_w092_rev, reverb_set+50
-	.equ	se_w092_mvl, 127
-	.equ	se_w092_key, 0
-	.equ	se_w092_tbs, 1
-	.equ	se_w092_exg, 0
-	.equ	se_w092_cmp, 1
+	.equ	se_m_toxic_grp, voicegroup128
+	.equ	se_m_toxic_pri, 4
+	.equ	se_m_toxic_rev, reverb_set+50
+	.equ	se_m_toxic_mvl, 127
+	.equ	se_m_toxic_key, 0
+	.equ	se_m_toxic_tbs, 1
+	.equ	se_m_toxic_exg, 0
+	.equ	se_m_toxic_cmp, 1
 
 	.section .rodata
-	.global	se_w092
+	.global	se_m_toxic
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w092_1:
-	.byte	KEYSH , se_w092_key+0
-	.byte	TEMPO , 150*se_w092_tbs/2
+se_m_toxic_1:
+	.byte	KEYSH , se_m_toxic_key+0
+	.byte	TEMPO , 150*se_m_toxic_tbs/2
 	.byte		VOICE , 31
-	.byte		VOL   , 110*se_w092_mvl/mxv
+	.byte		VOL   , 110*se_m_toxic_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -74,14 +74,14 @@ se_w092_1:
 @******************************************************@
 	.align	2
 
-se_w092:
+se_m_toxic:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w092_pri	@ Priority
-	.byte	se_w092_rev	@ Reverb.
+	.byte	se_m_toxic_pri	@ Priority
+	.byte	se_m_toxic_rev	@ Reverb.
 
-	.word	se_w092_grp
+	.word	se_m_toxic_grp
 
-	.word	se_w092_1
+	.word	se_m_toxic_1
 
 	.end
diff --git a/sound/songs/se_w161.s b/sound/songs/se_m_tri_attack.s
index 8b378b121..448998e77 100644
--- a/sound/songs/se_w161.s
+++ b/sound/songs/se_m_tri_attack.s
@@ -1,40 +1,40 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w161_grp, voicegroup128
-	.equ	se_w161_pri, 4
-	.equ	se_w161_rev, reverb_set+50
-	.equ	se_w161_mvl, 127
-	.equ	se_w161_key, 0
-	.equ	se_w161_tbs, 1
-	.equ	se_w161_exg, 0
-	.equ	se_w161_cmp, 1
+	.equ	se_m_tri_attack_grp, voicegroup128
+	.equ	se_m_tri_attack_pri, 4
+	.equ	se_m_tri_attack_rev, reverb_set+50
+	.equ	se_m_tri_attack_mvl, 127
+	.equ	se_m_tri_attack_key, 0
+	.equ	se_m_tri_attack_tbs, 1
+	.equ	se_m_tri_attack_exg, 0
+	.equ	se_m_tri_attack_cmp, 1
 
 	.section .rodata
-	.global	se_w161
+	.global	se_m_tri_attack
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w161_1:
-	.byte	KEYSH , se_w161_key+0
-	.byte	TEMPO , 220*se_w161_tbs/2
+se_m_tri_attack_1:
+	.byte	KEYSH , se_m_tri_attack_key+0
+	.byte	TEMPO , 220*se_m_tri_attack_tbs/2
 	.byte		VOICE , 58
 	.byte		BENDR , 24
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 19*se_w161_mvl/mxv
+	.byte		VOL   , 19*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v-32
 	.byte		N16   , Gn1 , v127
 	.byte	W01
-	.byte		VOL   , 43*se_w161_mvl/mxv
+	.byte		VOL   , 43*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 72*se_w161_mvl/mxv
+	.byte		VOL   , 72*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v-8
 	.byte	W01
-	.byte		VOL   , 92*se_w161_mvl/mxv
+	.byte		VOL   , 92*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v+7
 	.byte	W01
-	.byte		VOL   , 109*se_w161_mvl/mxv
+	.byte		VOL   , 109*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v+19
 	.byte	W02
 	.byte		        c_v+28
@@ -43,29 +43,29 @@ se_w161_1:
 	.byte	W01
 	.byte		        c_v+28
 	.byte	W01
-	.byte		VOL   , 102*se_w161_mvl/mxv
+	.byte		VOL   , 102*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v+19
 	.byte	W01
-	.byte		VOL   , 88*se_w161_mvl/mxv
+	.byte		VOL   , 88*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v+5
 	.byte	W02
-	.byte		VOL   , 69*se_w161_mvl/mxv
+	.byte		VOL   , 69*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v-9
 	.byte	W01
-	.byte		VOL   , 37*se_w161_mvl/mxv
+	.byte		VOL   , 37*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v-20
 	.byte	W01
-	.byte		VOL   , 17*se_w161_mvl/mxv
+	.byte		VOL   , 17*se_m_tri_attack_mvl/mxv
 	.byte		BEND  , c_v-34
 	.byte	W10
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w161_2:
-	.byte	KEYSH , se_w161_key+0
+se_m_tri_attack_2:
+	.byte	KEYSH , se_m_tri_attack_key+0
 	.byte		VOICE , 4
-	.byte		VOL   , 110*se_w161_mvl/mxv
+	.byte		VOL   , 110*se_m_tri_attack_mvl/mxv
 	.byte		N02   , Gs3 , v032
 	.byte	W02
 	.byte		        Gn3 
@@ -85,15 +85,15 @@ se_w161_2:
 @******************************************************@
 	.align	2
 
-se_w161:
+se_m_tri_attack:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w161_pri	@ Priority
-	.byte	se_w161_rev	@ Reverb.
+	.byte	se_m_tri_attack_pri	@ Priority
+	.byte	se_m_tri_attack_rev	@ Reverb.
 
-	.word	se_w161_grp
+	.word	se_m_tri_attack_grp
 
-	.word	se_w161_1
-	.word	se_w161_2
+	.word	se_m_tri_attack_1
+	.word	se_m_tri_attack_2
 
 	.end
diff --git a/sound/songs/se_w161b.s b/sound/songs/se_m_tri_attack2.s
index 87c27eb7e..0afade13c 100644
--- a/sound/songs/se_w161b.s
+++ b/sound/songs/se_m_tri_attack2.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w161b_grp, voicegroup128
-	.equ	se_w161b_pri, 4
-	.equ	se_w161b_rev, reverb_set+50
-	.equ	se_w161b_mvl, 127
-	.equ	se_w161b_key, 0
-	.equ	se_w161b_tbs, 1
-	.equ	se_w161b_exg, 0
-	.equ	se_w161b_cmp, 1
+	.equ	se_m_tri_attack2_grp, voicegroup128
+	.equ	se_m_tri_attack2_pri, 4
+	.equ	se_m_tri_attack2_rev, reverb_set+50
+	.equ	se_m_tri_attack2_mvl, 127
+	.equ	se_m_tri_attack2_key, 0
+	.equ	se_m_tri_attack2_tbs, 1
+	.equ	se_m_tri_attack2_exg, 0
+	.equ	se_m_tri_attack2_cmp, 1
 
 	.section .rodata
-	.global	se_w161b
+	.global	se_m_tri_attack2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w161b_1:
-	.byte	KEYSH , se_w161b_key+0
-	.byte	TEMPO , 220*se_w161b_tbs/2
+se_m_tri_attack2_1:
+	.byte	KEYSH , se_m_tri_attack2_key+0
+	.byte	TEMPO , 220*se_m_tri_attack2_tbs/2
 	.byte		VOICE , 18
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w161b_mvl/mxv
+	.byte		VOL   , 110*se_m_tri_attack2_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		N09   , An3 , v127
 	.byte	W03
@@ -65,28 +65,28 @@ se_w161b_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-22
 	.byte	W06
-	.byte		VOL   , 103*se_w161b_mvl/mxv
+	.byte		VOL   , 103*se_m_tri_attack2_mvl/mxv
 	.byte		PAN   , c_v+10
 	.byte	W03
 	.byte		BEND  , c_v-32
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte	W03
-	.byte		VOL   , 95*se_w161b_mvl/mxv
+	.byte		VOL   , 95*se_m_tri_attack2_mvl/mxv
 	.byte		BEND  , c_v-38
 	.byte	W03
 	.byte		PAN   , c_v-9
 	.byte	W05
 	.byte		BEND  , c_v-45
 	.byte	W01
-	.byte		VOL   , 66*se_w161b_mvl/mxv
+	.byte		VOL   , 66*se_m_tri_attack2_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte	W05
 	.byte		        c_v+10
 	.byte	W01
 	.byte		BEND  , c_v-52
 	.byte	W03
-	.byte		VOL   , 21*se_w161b_mvl/mxv
+	.byte		VOL   , 21*se_m_tri_attack2_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte	W04
@@ -94,10 +94,10 @@ se_w161b_1:
 
 @********************** Track  2 **********************@
 
-se_w161b_2:
-	.byte	KEYSH , se_w161b_key+0
+se_m_tri_attack2_2:
+	.byte	KEYSH , se_m_tri_attack2_key+0
 	.byte		VOICE , 4
-	.byte		VOL   , 110*se_w161b_mvl/mxv
+	.byte		VOL   , 110*se_m_tri_attack2_mvl/mxv
 	.byte		N06   , Cn3 , v060
 	.byte	W09
 	.byte		N15   
@@ -110,15 +110,15 @@ se_w161b_2:
 @******************************************************@
 	.align	2
 
-se_w161b:
+se_m_tri_attack2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w161b_pri	@ Priority
-	.byte	se_w161b_rev	@ Reverb.
+	.byte	se_m_tri_attack2_pri	@ Priority
+	.byte	se_m_tri_attack2_rev	@ Reverb.
 
-	.word	se_w161b_grp
+	.word	se_m_tri_attack2_grp
 
-	.word	se_w161b_1
-	.word	se_w161b_2
+	.word	se_m_tri_attack2_1
+	.word	se_m_tri_attack2_2
 
 	.end
diff --git a/sound/songs/se_w239.s b/sound/songs/se_m_twister.s
index fc18c1d5c..e95e9b322 100644
--- a/sound/songs/se_w239.s
+++ b/sound/songs/se_m_twister.s
@@ -1,44 +1,44 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w239_grp, voicegroup128
-	.equ	se_w239_pri, 4
-	.equ	se_w239_rev, reverb_set+50
-	.equ	se_w239_mvl, 127
-	.equ	se_w239_key, 0
-	.equ	se_w239_tbs, 1
-	.equ	se_w239_exg, 0
-	.equ	se_w239_cmp, 1
+	.equ	se_m_twister_grp, voicegroup128
+	.equ	se_m_twister_pri, 4
+	.equ	se_m_twister_rev, reverb_set+50
+	.equ	se_m_twister_mvl, 127
+	.equ	se_m_twister_key, 0
+	.equ	se_m_twister_tbs, 1
+	.equ	se_m_twister_exg, 0
+	.equ	se_m_twister_cmp, 1
 
 	.section .rodata
-	.global	se_w239
+	.global	se_m_twister
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w239_1:
-	.byte	KEYSH , se_w239_key+0
-	.byte	TEMPO , 150*se_w239_tbs/2
+se_m_twister_1:
+	.byte	KEYSH , se_m_twister_key+0
+	.byte	TEMPO , 150*se_m_twister_tbs/2
 	.byte		VOICE , 22
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 67*se_w239_mvl/mxv
+	.byte		VOL   , 67*se_m_twister_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte		TIE   , Dn2 , v127
 	.byte	W03
-	.byte		VOL   , 83*se_w239_mvl/mxv
+	.byte		VOL   , 83*se_m_twister_mvl/mxv
 	.byte		BEND  , c_v+22
 	.byte	W03
-	.byte		VOL   , 88*se_w239_mvl/mxv
+	.byte		VOL   , 88*se_m_twister_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte	W03
-	.byte		VOL   , 95*se_w239_mvl/mxv
+	.byte		VOL   , 95*se_m_twister_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+8
 	.byte	W01
-	.byte		VOL   , 105*se_w239_mvl/mxv
+	.byte		VOL   , 105*se_m_twister_mvl/mxv
 	.byte		PAN   , c_v-8
 	.byte	W03
-	.byte		VOL   , 115*se_w239_mvl/mxv
+	.byte		VOL   , 115*se_m_twister_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v+0
 	.byte	W01
@@ -101,7 +101,7 @@ se_w239_1:
 	.byte		PAN   , c_v-8
 	.byte	W03
 	.byte		        c_v-11
-	.byte		VOL   , 103*se_w239_mvl/mxv
+	.byte		VOL   , 103*se_m_twister_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v-17
 	.byte	W01
@@ -109,41 +109,41 @@ se_w239_1:
 	.byte	W05
 	.byte		PAN   , c_v-9
 	.byte	W01
-	.byte		VOL   , 97*se_w239_mvl/mxv
+	.byte		VOL   , 97*se_m_twister_mvl/mxv
 	.byte	W05
 	.byte		PAN   , c_v-3
 	.byte	W01
 	.byte		BEND  , c_v+12
 	.byte	W02
 	.byte		PAN   , c_v+6
-	.byte		VOL   , 88*se_w239_mvl/mxv
+	.byte		VOL   , 88*se_m_twister_mvl/mxv
 	.byte	W03
 	.byte		PAN   , c_v+10
 	.byte	W02
 	.byte		BEND  , c_v+7
 	.byte	W02
-	.byte		VOL   , 79*se_w239_mvl/mxv
+	.byte		VOL   , 79*se_m_twister_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+16
 	.byte	W04
-	.byte		VOL   , 62*se_w239_mvl/mxv
+	.byte		VOL   , 62*se_m_twister_mvl/mxv
 	.byte		BEND  , c_v+0
 	.byte	W02
 	.byte		PAN   , c_v+13
 	.byte	W04
-	.byte		VOL   , 45*se_w239_mvl/mxv
+	.byte		VOL   , 45*se_m_twister_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+8
 	.byte	W01
 	.byte		BEND  , c_v-7
 	.byte	W01
-	.byte		VOL   , 33*se_w239_mvl/mxv
+	.byte		VOL   , 33*se_m_twister_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W03
 	.byte		        c_v-8
 	.byte	W01
-	.byte		VOL   , 18*se_w239_mvl/mxv
+	.byte		VOL   , 18*se_m_twister_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-11
 	.byte	W03
@@ -152,43 +152,43 @@ se_w239_1:
 
 @********************** Track  2 **********************@
 
-se_w239_2:
-	.byte	KEYSH , se_w239_key+0
+se_m_twister_2:
+	.byte	KEYSH , se_m_twister_key+0
 	.byte		VOICE , 25
-	.byte		VOL   , 67*se_w239_mvl/mxv
+	.byte		VOL   , 67*se_m_twister_mvl/mxv
 	.byte		TIE   , Gs4 , v012
 	.byte	W03
-	.byte		VOL   , 83*se_w239_mvl/mxv
+	.byte		VOL   , 83*se_m_twister_mvl/mxv
 	.byte	W03
-	.byte		        88*se_w239_mvl/mxv
+	.byte		        88*se_m_twister_mvl/mxv
 	.byte	W03
-	.byte		        95*se_w239_mvl/mxv
+	.byte		        95*se_m_twister_mvl/mxv
 	.byte	W03
-	.byte		        105*se_w239_mvl/mxv
+	.byte		        105*se_m_twister_mvl/mxv
 	.byte	W03
-	.byte		        115*se_w239_mvl/mxv
+	.byte		        115*se_m_twister_mvl/mxv
 	.byte	W09
 	.byte	W24
 	.byte	W24
 	.byte	W24
 	.byte	W21
-	.byte		        103*se_w239_mvl/mxv
+	.byte		        103*se_m_twister_mvl/mxv
 	.byte	W03
 	.byte	W07
-	.byte		        97*se_w239_mvl/mxv
+	.byte		        97*se_m_twister_mvl/mxv
 	.byte	W08
-	.byte		        88*se_w239_mvl/mxv
+	.byte		        88*se_m_twister_mvl/mxv
 	.byte	W07
-	.byte		        79*se_w239_mvl/mxv
+	.byte		        79*se_m_twister_mvl/mxv
 	.byte	W02
 	.byte	W04
-	.byte		        62*se_w239_mvl/mxv
+	.byte		        62*se_m_twister_mvl/mxv
 	.byte	W06
-	.byte		        45*se_w239_mvl/mxv
+	.byte		        45*se_m_twister_mvl/mxv
 	.byte	W04
-	.byte		        33*se_w239_mvl/mxv
+	.byte		        33*se_m_twister_mvl/mxv
 	.byte	W05
-	.byte		        18*se_w239_mvl/mxv
+	.byte		        18*se_m_twister_mvl/mxv
 	.byte	W05
 	.byte		EOT   
 	.byte	FINE
@@ -196,15 +196,15 @@ se_w239_2:
 @******************************************************@
 	.align	2
 
-se_w239:
+se_m_twister:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w239_pri	@ Priority
-	.byte	se_w239_rev	@ Reverb.
+	.byte	se_m_twister_pri	@ Priority
+	.byte	se_m_twister_rev	@ Reverb.
 
-	.word	se_w239_grp
+	.word	se_m_twister_grp
 
-	.word	se_w239_1
-	.word	se_w239_2
+	.word	se_m_twister_1
+	.word	se_m_twister_2
 
 	.end
diff --git a/sound/songs/se_w253.s b/sound/songs/se_m_uproar.s
index e33de4550..c60cccee4 100644
--- a/sound/songs/se_w253.s
+++ b/sound/songs/se_m_uproar.s
@@ -1,41 +1,41 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w253_grp, voicegroup128
-	.equ	se_w253_pri, 4
-	.equ	se_w253_rev, reverb_set+50
-	.equ	se_w253_mvl, 127
-	.equ	se_w253_key, 0
-	.equ	se_w253_tbs, 1
-	.equ	se_w253_exg, 0
-	.equ	se_w253_cmp, 1
+	.equ	se_m_uproar_grp, voicegroup128
+	.equ	se_m_uproar_pri, 4
+	.equ	se_m_uproar_rev, reverb_set+50
+	.equ	se_m_uproar_mvl, 127
+	.equ	se_m_uproar_key, 0
+	.equ	se_m_uproar_tbs, 1
+	.equ	se_m_uproar_exg, 0
+	.equ	se_m_uproar_cmp, 1
 
 	.section .rodata
-	.global	se_w253
+	.global	se_m_uproar
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w253_1:
-	.byte	KEYSH , se_w253_key+0
-	.byte	TEMPO , 150*se_w253_tbs/2
+se_m_uproar_1:
+	.byte	KEYSH , se_m_uproar_key+0
+	.byte	TEMPO , 150*se_m_uproar_tbs/2
 	.byte		VOICE , 60
 	.byte		BENDR , 12
-	.byte		VOL   , 25*se_w253_mvl/mxv
+	.byte		VOL   , 25*se_m_uproar_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte		N24   , Gs2 , v127
 	.byte	W01
 	.byte		PAN   , c_v+2
-	.byte		VOL   , 51*se_w253_mvl/mxv
+	.byte		VOL   , 51*se_m_uproar_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+5
-	.byte		VOL   , 74*se_w253_mvl/mxv
+	.byte		VOL   , 74*se_m_uproar_mvl/mxv
 	.byte	W01
-	.byte		        89*se_w253_mvl/mxv
+	.byte		        89*se_m_uproar_mvl/mxv
 	.byte		BEND  , c_v+1
 	.byte	W01
 	.byte		PAN   , c_v+2
-	.byte		VOL   , 100*se_w253_mvl/mxv
+	.byte		VOL   , 100*se_m_uproar_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte	W01
@@ -57,30 +57,30 @@ se_w253_1:
 	.byte	W02
 	.byte		        c_v+0
 	.byte	W01
-	.byte		VOL   , 85*se_w253_mvl/mxv
+	.byte		VOL   , 85*se_m_uproar_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W01
 	.byte		        c_v-4
-	.byte		VOL   , 62*se_w253_mvl/mxv
+	.byte		VOL   , 62*se_m_uproar_mvl/mxv
 	.byte	W01
-	.byte		        33*se_w253_mvl/mxv
+	.byte		        33*se_m_uproar_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v-2
-	.byte		VOL   , 11*se_w253_mvl/mxv
+	.byte		VOL   , 11*se_m_uproar_mvl/mxv
 	.byte	W02
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w253:
+se_m_uproar:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w253_pri	@ Priority
-	.byte	se_w253_rev	@ Reverb.
+	.byte	se_m_uproar_pri	@ Priority
+	.byte	se_m_uproar_rev	@ Reverb.
 
-	.word	se_w253_grp
+	.word	se_m_uproar_grp
 
-	.word	se_w253_1
+	.word	se_m_uproar_1
 
 	.end
diff --git a/sound/songs/se_m_vital_throw.s b/sound/songs/se_m_vital_throw.s
new file mode 100644
index 000000000..c89d003b6
--- /dev/null
+++ b/sound/songs/se_m_vital_throw.s
@@ -0,0 +1,75 @@
+	.include "MPlayDef.s"
+
+	.equ	se_m_vital_throw_grp, voicegroup128
+	.equ	se_m_vital_throw_pri, 4
+	.equ	se_m_vital_throw_rev, reverb_set+50
+	.equ	se_m_vital_throw_mvl, 127
+	.equ	se_m_vital_throw_key, 0
+	.equ	se_m_vital_throw_tbs, 1
+	.equ	se_m_vital_throw_exg, 0
+	.equ	se_m_vital_throw_cmp, 1
+
+	.section .rodata
+	.global	se_m_vital_throw
+	.align	2
+
+@********************** Track  1 **********************@
+
+se_m_vital_throw_1:
+	.byte	KEYSH , se_m_vital_throw_key+0
+	.byte	TEMPO , 220*se_m_vital_throw_tbs/2
+	.byte		VOICE , 22
+	.byte		VOL   , 110*se_m_vital_throw_mvl/mxv
+	.byte		BENDR , 12
+	.byte		PAN   , c_v+16
+	.byte		BEND  , c_v+46
+	.byte		N09   , Cn3 , v127
+	.byte	W03
+	.byte		VOL   , 104*se_m_vital_throw_mvl/mxv
+	.byte		PAN   , c_v+0
+	.byte		BEND  , c_v+23
+	.byte	W03
+	.byte		VOL   , 93*se_m_vital_throw_mvl/mxv
+	.byte		PAN   , c_v-16
+	.byte		BEND  , c_v-15
+	.byte	W03
+	.byte		VOICE , 21
+	.byte		VOL   , 110*se_m_vital_throw_mvl/mxv
+	.byte		BEND  , c_v+0
+	.byte		N03   , Gn4 
+	.byte	W06
+	.byte		PAN   , c_v+16
+	.byte		N03   , Cn5 
+	.byte	W09
+	.byte	FINE
+
+@********************** Track  2 **********************@
+
+se_m_vital_throw_2:
+	.byte	KEYSH , se_m_vital_throw_key+0
+	.byte		VOICE , 4
+	.byte		VOL   , 110*se_m_vital_throw_mvl/mxv
+	.byte	W09
+	.byte		PAN   , c_v+8
+	.byte		N03   , Cn3 , v052
+	.byte	W06
+	.byte		PAN   , c_v-7
+	.byte		N03   
+	.byte	W09
+	.byte	FINE
+
+@******************************************************@
+	.align	2
+
+se_m_vital_throw:
+	.byte	2	@ NumTrks
+	.byte	0	@ NumBlks
+	.byte	se_m_vital_throw_pri	@ Priority
+	.byte	se_m_vital_throw_rev	@ Reverb.
+
+	.word	se_m_vital_throw_grp
+
+	.word	se_m_vital_throw_1
+	.word	se_m_vital_throw_2
+
+	.end
diff --git a/sound/songs/se_w233b.s b/sound/songs/se_m_vital_throw2.s
index 65d256d9a..3bffdeb25 100644
--- a/sound/songs/se_w233b.s
+++ b/sound/songs/se_m_vital_throw2.s
@@ -1,25 +1,25 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w233b_grp, voicegroup128
-	.equ	se_w233b_pri, 4
-	.equ	se_w233b_rev, reverb_set+50
-	.equ	se_w233b_mvl, 127
-	.equ	se_w233b_key, 0
-	.equ	se_w233b_tbs, 1
-	.equ	se_w233b_exg, 0
-	.equ	se_w233b_cmp, 1
+	.equ	se_m_vital_throw2_grp, voicegroup128
+	.equ	se_m_vital_throw2_pri, 4
+	.equ	se_m_vital_throw2_rev, reverb_set+50
+	.equ	se_m_vital_throw2_mvl, 127
+	.equ	se_m_vital_throw2_key, 0
+	.equ	se_m_vital_throw2_tbs, 1
+	.equ	se_m_vital_throw2_exg, 0
+	.equ	se_m_vital_throw2_cmp, 1
 
 	.section .rodata
-	.global	se_w233b
+	.global	se_m_vital_throw2
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w233b_1:
-	.byte	KEYSH , se_w233b_key+0
-	.byte	TEMPO , 220*se_w233b_tbs/2
+se_m_vital_throw2_1:
+	.byte	KEYSH , se_m_vital_throw2_key+0
+	.byte	TEMPO , 220*se_m_vital_throw2_tbs/2
 	.byte		VOICE , 6
-	.byte		VOL   , 110*se_w233b_mvl/mxv
+	.byte		VOL   , 110*se_m_vital_throw2_mvl/mxv
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
@@ -57,16 +57,16 @@ se_w233b_1:
 	.byte	W01
 	.byte		        c_v-29
 	.byte	W01
-	.byte		VOL   , 86*se_w233b_mvl/mxv
+	.byte		VOL   , 86*se_m_vital_throw2_mvl/mxv
 	.byte		BEND  , c_v-39
 	.byte	W02
-	.byte		VOL   , 69*se_w233b_mvl/mxv
+	.byte		VOL   , 69*se_m_vital_throw2_mvl/mxv
 	.byte		BEND  , c_v-45
 	.byte	W01
-	.byte		VOL   , 53*se_w233b_mvl/mxv
+	.byte		VOL   , 53*se_m_vital_throw2_mvl/mxv
 	.byte		BEND  , c_v-56
 	.byte	W01
-	.byte		VOL   , 20*se_w233b_mvl/mxv
+	.byte		VOL   , 20*se_m_vital_throw2_mvl/mxv
 	.byte		BEND  , c_v-64
 	.byte	W04
 	.byte		        c_v-64
@@ -74,12 +74,12 @@ se_w233b_1:
 
 @********************** Track  2 **********************@
 
-se_w233b_2:
-	.byte	KEYSH , se_w233b_key+0
+se_m_vital_throw2_2:
+	.byte	KEYSH , se_m_vital_throw2_key+0
 	.byte		VOICE , 5
 	.byte		XCMD  , xIECV , 10
 	.byte		        xIECL , 8
-	.byte		VOL   , 110*se_w233b_mvl/mxv
+	.byte		VOL   , 110*se_m_vital_throw2_mvl/mxv
 	.byte		PAN   , c_v+9
 	.byte		N03   , Gs2 , v052
 	.byte	W06
@@ -94,15 +94,15 @@ se_w233b_2:
 @******************************************************@
 	.align	2
 
-se_w233b:
+se_m_vital_throw2:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w233b_pri	@ Priority
-	.byte	se_w233b_rev	@ Reverb.
+	.byte	se_m_vital_throw2_pri	@ Priority
+	.byte	se_m_vital_throw2_rev	@ Reverb.
 
-	.word	se_w233b_grp
+	.word	se_m_vital_throw2_grp
 
-	.word	se_w233b_1
-	.word	se_w233b_2
+	.word	se_m_vital_throw2_1
+	.word	se_m_vital_throw2_2
 
 	.end
diff --git a/sound/songs/se_w127.s b/sound/songs/se_m_waterfall.s
index 695697698..a07e7e971 100644
--- a/sound/songs/se_w127.s
+++ b/sound/songs/se_m_waterfall.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w127_grp, voicegroup128
-	.equ	se_w127_pri, 4
-	.equ	se_w127_rev, reverb_set+50
-	.equ	se_w127_mvl, 127
-	.equ	se_w127_key, 0
-	.equ	se_w127_tbs, 1
-	.equ	se_w127_exg, 0
-	.equ	se_w127_cmp, 1
+	.equ	se_m_waterfall_grp, voicegroup128
+	.equ	se_m_waterfall_pri, 4
+	.equ	se_m_waterfall_rev, reverb_set+50
+	.equ	se_m_waterfall_mvl, 127
+	.equ	se_m_waterfall_key, 0
+	.equ	se_m_waterfall_tbs, 1
+	.equ	se_m_waterfall_exg, 0
+	.equ	se_m_waterfall_cmp, 1
 
 	.section .rodata
-	.global	se_w127
+	.global	se_m_waterfall
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w127_1:
-	.byte	KEYSH , se_w127_key+0
-	.byte	TEMPO , 150*se_w127_tbs/2
+se_m_waterfall_1:
+	.byte	KEYSH , se_m_waterfall_key+0
+	.byte	TEMPO , 150*se_m_waterfall_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 115*se_w127_mvl/mxv
+	.byte		VOL   , 115*se_m_waterfall_mvl/mxv
 	.byte		BEND  , c_v-18
 	.byte		N60   , Gn2 , v127
 	.byte	W03
@@ -54,62 +54,62 @@ se_w127_1:
 	.byte		PAN   , c_v+3
 	.byte		BEND  , c_v+7
 	.byte	W02
-	.byte		VOL   , 109*se_w127_mvl/mxv
+	.byte		VOL   , 109*se_m_waterfall_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+10
 	.byte	W02
-	.byte		VOL   , 103*se_w127_mvl/mxv
+	.byte		VOL   , 103*se_m_waterfall_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+3
 	.byte		BEND  , c_v+13
 	.byte	W03
-	.byte		VOL   , 92*se_w127_mvl/mxv
+	.byte		VOL   , 92*se_m_waterfall_mvl/mxv
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+16
 	.byte	W03
-	.byte		VOL   , 79*se_w127_mvl/mxv
+	.byte		VOL   , 79*se_m_waterfall_mvl/mxv
 	.byte		PAN   , c_v-3
 	.byte		BEND  , c_v+18
 	.byte	W02
 	.byte	W02
-	.byte		VOL   , 62*se_w127_mvl/mxv
+	.byte		VOL   , 62*se_m_waterfall_mvl/mxv
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+21
 	.byte	W04
-	.byte		VOL   , 40*se_w127_mvl/mxv
+	.byte		VOL   , 40*se_m_waterfall_mvl/mxv
 	.byte		PAN   , c_v-3
 	.byte		BEND  , c_v+26
 	.byte	W02
-	.byte		VOL   , 22*se_w127_mvl/mxv
+	.byte		VOL   , 22*se_m_waterfall_mvl/mxv
 	.byte		BEND  , c_v+33
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 8*se_w127_mvl/mxv
+	.byte		VOL   , 8*se_m_waterfall_mvl/mxv
 	.byte		BEND  , c_v+43
 	.byte	W02
 	.byte	FINE
 
 @********************** Track  2 **********************@
 
-se_w127_2:
-	.byte	KEYSH , se_w127_key+0
+se_m_waterfall_2:
+	.byte	KEYSH , se_m_waterfall_key+0
 	.byte		VOICE , 25
-	.byte		VOL   , 115*se_w127_mvl/mxv
+	.byte		VOL   , 115*se_m_waterfall_mvl/mxv
 	.byte		N06   , Cn3 , v040
 	.byte	W06
 	.byte		        Gn2 
 	.byte	W06
-se_w127_2_000:
+se_m_waterfall_2_000:
 	.byte		N06   , Cn3 , v040
 	.byte	W06
 	.byte		        Gn2 
 	.byte	W06
 	.byte	PEND
 	.byte	PATT
-	 .word	se_w127_2_000
+	 .word	se_m_waterfall_2_000
 	.byte		N06   , Cn3 , v032
 	.byte	W06
 	.byte		        Gn2 
@@ -123,15 +123,15 @@ se_w127_2_000:
 @******************************************************@
 	.align	2
 
-se_w127:
+se_m_waterfall:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w127_pri	@ Priority
-	.byte	se_w127_rev	@ Reverb.
+	.byte	se_m_waterfall_pri	@ Priority
+	.byte	se_m_waterfall_rev	@ Reverb.
 
-	.word	se_w127_grp
+	.word	se_m_waterfall_grp
 
-	.word	se_w127_1
-	.word	se_w127_2
+	.word	se_m_waterfall_1
+	.word	se_m_waterfall_2
 
 	.end
diff --git a/sound/songs/se_w250.s b/sound/songs/se_m_whirlpool.s
index 20a660411..bac3fa5bc 100644
--- a/sound/songs/se_w250.s
+++ b/sound/songs/se_m_whirlpool.s
@@ -1,27 +1,27 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w250_grp, voicegroup128
-	.equ	se_w250_pri, 4
-	.equ	se_w250_rev, reverb_set+50
-	.equ	se_w250_mvl, 127
-	.equ	se_w250_key, 0
-	.equ	se_w250_tbs, 1
-	.equ	se_w250_exg, 0
-	.equ	se_w250_cmp, 1
+	.equ	se_m_whirlpool_grp, voicegroup128
+	.equ	se_m_whirlpool_pri, 4
+	.equ	se_m_whirlpool_rev, reverb_set+50
+	.equ	se_m_whirlpool_mvl, 127
+	.equ	se_m_whirlpool_key, 0
+	.equ	se_m_whirlpool_tbs, 1
+	.equ	se_m_whirlpool_exg, 0
+	.equ	se_m_whirlpool_cmp, 1
 
 	.section .rodata
-	.global	se_w250
+	.global	se_m_whirlpool
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w250_1:
-	.byte	KEYSH , se_w250_key+0
-	.byte	TEMPO , 150*se_w250_tbs/2
+se_m_whirlpool_1:
+	.byte	KEYSH , se_m_whirlpool_key+0
+	.byte	TEMPO , 150*se_m_whirlpool_tbs/2
 	.byte		VOICE , 36
 	.byte		BENDR , 12
 	.byte		PAN   , c_v+0
-	.byte		VOL   , 115*se_w250_mvl/mxv
+	.byte		VOL   , 115*se_m_whirlpool_mvl/mxv
 	.byte		BEND  , c_v-18
 	.byte		TIE   , Dn2 , v127
 	.byte	W03
@@ -72,37 +72,37 @@ se_w250_1:
 	.byte	W05
 	.byte		PAN   , c_v+6
 	.byte	W02
-	.byte		VOL   , 103*se_w250_mvl/mxv
+	.byte		VOL   , 103*se_m_whirlpool_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W03
 	.byte		PAN   , c_v+4
 	.byte	W01
-	.byte		VOL   , 85*se_w250_mvl/mxv
+	.byte		VOL   , 85*se_m_whirlpool_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-5
 	.byte	W04
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		VOL   , 71*se_w250_mvl/mxv
+	.byte		VOL   , 71*se_m_whirlpool_mvl/mxv
 	.byte	W02
 	.byte		BEND  , c_v-8
 	.byte	W03
-	.byte		VOL   , 52*se_w250_mvl/mxv
+	.byte		VOL   , 52*se_m_whirlpool_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte	W03
 	.byte		BEND  , c_v-12
 	.byte	W01
-	.byte		VOL   , 32*se_w250_mvl/mxv
+	.byte		VOL   , 32*se_m_whirlpool_mvl/mxv
 	.byte	W02
 	.byte		PAN   , c_v-10
 	.byte	W03
-	.byte		VOL   , 11*se_w250_mvl/mxv
+	.byte		VOL   , 11*se_m_whirlpool_mvl/mxv
 	.byte		BEND  , c_v-19
 	.byte	W03
 	.byte		PAN   , c_v-15
 	.byte	W01
-	.byte		VOL   , 6*se_w250_mvl/mxv
+	.byte		VOL   , 6*se_m_whirlpool_mvl/mxv
 	.byte	W01
 	.byte		BEND  , c_v-28
 	.byte	W04
@@ -112,14 +112,14 @@ se_w250_1:
 @******************************************************@
 	.align	2
 
-se_w250:
+se_m_whirlpool:
 	.byte	1	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w250_pri	@ Priority
-	.byte	se_w250_rev	@ Reverb.
+	.byte	se_m_whirlpool_pri	@ Priority
+	.byte	se_m_whirlpool_rev	@ Reverb.
 
-	.word	se_w250_grp
+	.word	se_m_whirlpool_grp
 
-	.word	se_w250_1
+	.word	se_m_whirlpool_1
 
 	.end
diff --git a/sound/songs/se_w281.s b/sound/songs/se_m_yawn.s
index 21f27203d..c6af1f361 100644
--- a/sound/songs/se_w281.s
+++ b/sound/songs/se_m_yawn.s
@@ -1,24 +1,24 @@
 	.include "MPlayDef.s"
 
-	.equ	se_w281_grp, voicegroup128
-	.equ	se_w281_pri, 4
-	.equ	se_w281_rev, reverb_set+50
-	.equ	se_w281_mvl, 127
-	.equ	se_w281_key, 0
-	.equ	se_w281_tbs, 1
-	.equ	se_w281_exg, 0
-	.equ	se_w281_cmp, 1
+	.equ	se_m_yawn_grp, voicegroup128
+	.equ	se_m_yawn_pri, 4
+	.equ	se_m_yawn_rev, reverb_set+50
+	.equ	se_m_yawn_mvl, 127
+	.equ	se_m_yawn_key, 0
+	.equ	se_m_yawn_tbs, 1
+	.equ	se_m_yawn_exg, 0
+	.equ	se_m_yawn_cmp, 1
 
 	.section .rodata
-	.global	se_w281
+	.global	se_m_yawn
 	.align	2
 
 @********************** Track  1 **********************@
 
-se_w281_1:
-	.byte		VOL   , 110*se_w281_mvl/mxv
-	.byte	KEYSH , se_w281_key+0
-	.byte	TEMPO , 150*se_w281_tbs/2
+se_m_yawn_1:
+	.byte		VOL   , 110*se_m_yawn_mvl/mxv
+	.byte	KEYSH , se_m_yawn_key+0
+	.byte	TEMPO , 150*se_m_yawn_tbs/2
 	.byte		VOICE , 61
 	.byte		BENDR , 44
 	.byte		PAN   , c_v+0
@@ -87,41 +87,41 @@ se_w281_1:
 
 @********************** Track  2 **********************@
 
-se_w281_2:
-	.byte	KEYSH , se_w281_key+0
+se_m_yawn_2:
+	.byte	KEYSH , se_m_yawn_key+0
 	.byte		VOICE , 66
 	.byte		BENDR , 44
 	.byte		PAN   , c_v+1
-	.byte		VOL   , 110*se_w281_mvl/mxv
+	.byte		VOL   , 110*se_m_yawn_mvl/mxv
 	.byte		N48   , Dn3 , v020
 	.byte	W24
 	.byte	W03
-	.byte		VOL   , 103*se_w281_mvl/mxv
+	.byte		VOL   , 103*se_m_yawn_mvl/mxv
 	.byte	W04
-	.byte		        96*se_w281_mvl/mxv
+	.byte		        96*se_m_yawn_mvl/mxv
 	.byte	W03
-	.byte		        83*se_w281_mvl/mxv
+	.byte		        83*se_m_yawn_mvl/mxv
 	.byte	W04
-	.byte		        67*se_w281_mvl/mxv
+	.byte		        67*se_m_yawn_mvl/mxv
 	.byte	W04
-	.byte		        49*se_w281_mvl/mxv
+	.byte		        49*se_m_yawn_mvl/mxv
 	.byte	W03
-	.byte		        23*se_w281_mvl/mxv
+	.byte		        23*se_m_yawn_mvl/mxv
 	.byte	W03
 	.byte	FINE
 
 @******************************************************@
 	.align	2
 
-se_w281:
+se_m_yawn:
 	.byte	2	@ NumTrks
 	.byte	0	@ NumBlks
-	.byte	se_w281_pri	@ Priority
-	.byte	se_w281_rev	@ Reverb.
+	.byte	se_m_yawn_pri	@ Priority
+	.byte	se_m_yawn_rev	@ Reverb.
 
-	.word	se_w281_grp
+	.word	se_m_yawn_grp
 
-	.word	se_w281_1
-	.word	se_w281_2
+	.word	se_m_yawn_1
+	.word	se_m_yawn_2
 
 	.end
diff --git a/sound/songs/se_w052.s b/sound/songs/se_w052.s
deleted file mode 100644
index 50529af91..000000000
--- a/sound/songs/se_w052.s
+++ /dev/null
@@ -1,61 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w052_grp, voicegroup128
-	.equ	se_w052_pri, 4
-	.equ	se_w052_rev, reverb_set+50
-	.equ	se_w052_mvl, 127
-	.equ	se_w052_key, 0
-	.equ	se_w052_tbs, 1
-	.equ	se_w052_exg, 0
-	.equ	se_w052_cmp, 1
-
-	.section .rodata
-	.global	se_w052
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w052_1:
-	.byte	KEYSH , se_w052_key+0
-	.byte	TEMPO , 150*se_w052_tbs/2
-	.byte		VOICE , 29
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 61*se_w052_mvl/mxv
-	.byte		BEND  , c_v+8
-	.byte		N10   , Gn3 , v127
-	.byte	W01
-	.byte		VOL   , 84*se_w052_mvl/mxv
-	.byte	W01
-	.byte		        97*se_w052_mvl/mxv
-	.byte		BEND  , c_v+16
-	.byte	W01
-	.byte		VOL   , 110*se_w052_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+7
-	.byte	W02
-	.byte		        c_v-12
-	.byte	W01
-	.byte		VOL   , 89*se_w052_mvl/mxv
-	.byte	W01
-	.byte		        64*se_w052_mvl/mxv
-	.byte		BEND  , c_v-42
-	.byte	W01
-	.byte		VOL   , 34*se_w052_mvl/mxv
-	.byte	W15
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w052:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w052_pri	@ Priority
-	.byte	se_w052_rev	@ Reverb.
-
-	.word	se_w052_grp
-
-	.word	se_w052_1
-
-	.end
diff --git a/sound/songs/se_w059b.s b/sound/songs/se_w059b.s
deleted file mode 100644
index f12762957..000000000
--- a/sound/songs/se_w059b.s
+++ /dev/null
@@ -1,72 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w059b_grp, voicegroup128
-	.equ	se_w059b_pri, 4
-	.equ	se_w059b_rev, reverb_set+50
-	.equ	se_w059b_mvl, 127
-	.equ	se_w059b_key, 0
-	.equ	se_w059b_tbs, 1
-	.equ	se_w059b_exg, 0
-	.equ	se_w059b_cmp, 1
-
-	.section .rodata
-	.global	se_w059b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w059b_1:
-	.byte	KEYSH , se_w059b_key+0
-	.byte	TEMPO , 150*se_w059b_tbs/2
-	.byte		VOICE , 22
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w059b_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N24   , Gn3 , v108
-	.byte	W02
-	.byte		PAN   , c_v-19
-	.byte	W04
-	.byte		        c_v+0
-	.byte	W01
-	.byte		VOL   , 97*se_w059b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+16
-	.byte	W01
-	.byte		VOL   , 84*se_w059b_mvl/mxv
-	.byte	W03
-	.byte		        76*se_w059b_mvl/mxv
-	.byte		PAN   , c_v+2
-	.byte	W02
-	.byte		VOL   , 55*se_w059b_mvl/mxv
-	.byte		PAN   , c_v-8
-	.byte	W02
-	.byte		VOL   , 39*se_w059b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 25*se_w059b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte	W01
-	.byte		VOL   , 13*se_w059b_mvl/mxv
-	.byte	W03
-	.byte		        7*se_w059b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w059b:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w059b_pri	@ Priority
-	.byte	se_w059b_rev	@ Reverb.
-
-	.word	se_w059b_grp
-
-	.word	se_w059b_1
-
-	.end
diff --git a/sound/songs/se_w062b.s b/sound/songs/se_w062b.s
deleted file mode 100644
index 75a04e448..000000000
--- a/sound/songs/se_w062b.s
+++ /dev/null
@@ -1,131 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w062b_grp, voicegroup128
-	.equ	se_w062b_pri, 4
-	.equ	se_w062b_rev, reverb_set+50
-	.equ	se_w062b_mvl, 127
-	.equ	se_w062b_key, 0
-	.equ	se_w062b_tbs, 1
-	.equ	se_w062b_exg, 0
-	.equ	se_w062b_cmp, 1
-
-	.section .rodata
-	.global	se_w062b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w062b_1:
-	.byte	KEYSH , se_w062b_key+0
-	.byte	TEMPO , 150*se_w062b_tbs/2
-	.byte		VOICE , 9
-	.byte		BENDR , 2
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 26*se_w062b_mvl/mxv
-	.byte		BEND  , c_v-23
-	.byte		N09   , Dn5 , v127
-	.byte	W01
-	.byte		VOL   , 34*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-20
-	.byte	W01
-	.byte		VOL   , 42*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-7
-	.byte		BEND  , c_v-16
-	.byte	W01
-	.byte		VOL   , 52*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+9
-	.byte	W01
-	.byte		VOL   , 72*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-13
-	.byte		BEND  , c_v-18
-	.byte	W02
-	.byte		VOL   , 85*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-21
-	.byte	W01
-	.byte		VOL   , 102*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-6
-	.byte		BEND  , c_v-23
-	.byte	W01
-	.byte		VOL   , 120*se_w062b_mvl/mxv
-	.byte		BEND  , c_v-24
-	.byte	W02
-	.byte		VOL   , 26*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-23
-	.byte		N09   , Dn5 , v100
-	.byte	W02
-	.byte		VOL   , 34*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-20
-	.byte	W01
-	.byte		VOL   , 42*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-7
-	.byte		BEND  , c_v-16
-	.byte	W01
-	.byte		VOL   , 52*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+9
-	.byte	W01
-	.byte		VOL   , 72*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-13
-	.byte		BEND  , c_v-18
-	.byte	W01
-	.byte		VOL   , 85*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-21
-	.byte	W02
-	.byte		VOL   , 102*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-6
-	.byte		BEND  , c_v-23
-	.byte	W01
-	.byte		VOL   , 120*se_w062b_mvl/mxv
-	.byte		BEND  , c_v-24
-	.byte	W02
-	.byte		VOL   , 26*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-23
-	.byte		N09   , Dn5 , v080
-	.byte	W01
-	.byte		VOL   , 34*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-20
-	.byte	W02
-	.byte		VOL   , 42*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-7
-	.byte		BEND  , c_v-16
-	.byte	W01
-	.byte		VOL   , 52*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+9
-	.byte	W01
-	.byte		VOL   , 72*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-13
-	.byte		BEND  , c_v-18
-	.byte	W01
-	.byte		VOL   , 85*se_w062b_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v-21
-	.byte	W01
-	.byte		VOL   , 102*se_w062b_mvl/mxv
-	.byte		PAN   , c_v-6
-	.byte		BEND  , c_v-23
-	.byte	W02
-	.byte		VOL   , 120*se_w062b_mvl/mxv
-	.byte		BEND  , c_v-24
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w062b:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w062b_pri	@ Priority
-	.byte	se_w062b_rev	@ Reverb.
-
-	.word	se_w062b_grp
-
-	.word	se_w062b_1
-
-	.end
diff --git a/sound/songs/se_w077.s b/sound/songs/se_w077.s
deleted file mode 100644
index 8dd93481a..000000000
--- a/sound/songs/se_w077.s
+++ /dev/null
@@ -1,58 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w077_grp, voicegroup128
-	.equ	se_w077_pri, 4
-	.equ	se_w077_rev, reverb_set+50
-	.equ	se_w077_mvl, 127
-	.equ	se_w077_key, 0
-	.equ	se_w077_tbs, 1
-	.equ	se_w077_exg, 0
-	.equ	se_w077_cmp, 1
-
-	.section .rodata
-	.global	se_w077
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w077_1:
-	.byte	KEYSH , se_w077_key+0
-	.byte	TEMPO , 150*se_w077_tbs/2
-	.byte		VOICE , 18
-	.byte		BENDR , 12
-	.byte		VOL   , 55*se_w077_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+1
-	.byte		N01   , Cn6 , v100
-	.byte	W01
-	.byte		VOL   , 110*se_w077_mvl/mxv
-	.byte	W01
-	.byte		VOICE , 36
-	.byte		VOL   , 55*se_w077_mvl/mxv
-	.byte		N02   , Gn6 , v080
-	.byte	W01
-	.byte		VOL   , 110*se_w077_mvl/mxv
-	.byte	W04
-	.byte		PAN   , c_v+20
-	.byte		N01   , Gn6 , v024
-	.byte	W03
-	.byte		        Gn6 , v016
-	.byte	W02
-	.byte		PAN   , c_v-21
-	.byte	W12
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w077:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w077_pri	@ Priority
-	.byte	se_w077_rev	@ Reverb.
-
-	.word	se_w077_grp
-
-	.word	se_w077_1
-
-	.end
diff --git a/sound/songs/se_w082.s b/sound/songs/se_w082.s
deleted file mode 100644
index 460cdd977..000000000
--- a/sound/songs/se_w082.s
+++ /dev/null
@@ -1,150 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w082_grp, voicegroup128
-	.equ	se_w082_pri, 4
-	.equ	se_w082_rev, reverb_set+50
-	.equ	se_w082_mvl, 127
-	.equ	se_w082_key, 0
-	.equ	se_w082_tbs, 1
-	.equ	se_w082_exg, 0
-	.equ	se_w082_cmp, 1
-
-	.section .rodata
-	.global	se_w082
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w082_1:
-	.byte	KEYSH , se_w082_key+0
-	.byte	TEMPO , 150*se_w082_tbs/2
-	.byte		VOICE , 29
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 21*se_w082_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N10   , An2 , v127
-	.byte	W02
-	.byte		VOL   , 47*se_w082_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 88*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte	W01
-	.byte		VOL   , 120*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 21*se_w082_mvl/mxv
-	.byte		BEND  , c_v+10
-	.byte		N10   , Bn2 
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte	W01
-	.byte		VOL   , 47*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 88*se_w082_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-5
-	.byte		VOL   , 120*se_w082_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-2
-	.byte		VOL   , 21*se_w082_mvl/mxv
-	.byte		BEND  , c_v+18
-	.byte		N10   , Cs3 
-	.byte	W03
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 47*se_w082_mvl/mxv
-	.byte	W02
-	.byte		        88*se_w082_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 120*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte	W02
-	.byte		VOL   , 20*se_w082_mvl/mxv
-	.byte		BEND  , c_v+29
-	.byte		N10   , Dn3 
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 47*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte	W01
-	.byte		VOL   , 88*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 120*se_w082_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-5
-	.byte	W01
-	.byte		VOL   , 21*se_w082_mvl/mxv
-	.byte		BEND  , c_v+37
-	.byte		N10   , En3 
-	.byte	W02
-	.byte		PAN   , c_v-2
-	.byte		VOL   , 46*se_w082_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 102*se_w082_mvl/mxv
-	.byte	W02
-	.byte		        120*se_w082_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		        c_v-5
-	.byte		VOL   , 20*se_w082_mvl/mxv
-	.byte		BEND  , c_v+42
-	.byte		N20   , Fs3 
-	.byte	W02
-	.byte		VOL   , 47*se_w082_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 88*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte	W01
-	.byte		VOL   , 120*se_w082_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 99*se_w082_mvl/mxv
-	.byte		BEND  , c_v+50
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte	W01
-	.byte		VOL   , 74*se_w082_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v+56
-	.byte	W01
-	.byte		PAN   , c_v-2
-	.byte		VOL   , 53*se_w082_mvl/mxv
-	.byte	W03
-	.byte		        34*se_w082_mvl/mxv
-	.byte		BEND  , c_v+63
-	.byte	W01
-	.byte		VOL   , 15*se_w082_mvl/mxv
-	.byte	W23
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w082:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w082_pri	@ Priority
-	.byte	se_w082_rev	@ Reverb.
-
-	.word	se_w082_grp
-
-	.word	se_w082_1
-
-	.end
diff --git a/sound/songs/se_w104.s b/sound/songs/se_w104.s
deleted file mode 100644
index a93b52abe..000000000
--- a/sound/songs/se_w104.s
+++ /dev/null
@@ -1,71 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w104_grp, voicegroup128
-	.equ	se_w104_pri, 4
-	.equ	se_w104_rev, reverb_set+50
-	.equ	se_w104_mvl, 127
-	.equ	se_w104_key, 0
-	.equ	se_w104_tbs, 1
-	.equ	se_w104_exg, 0
-	.equ	se_w104_cmp, 1
-
-	.section .rodata
-	.global	se_w104
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w104_1:
-	.byte	KEYSH , se_w104_key+0
-	.byte	TEMPO , 150*se_w104_tbs/2
-	.byte		VOICE , 22
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w104_mvl/mxv
-	.byte		BEND  , c_v-18
-	.byte		N19   , Dn3 , v108
-	.byte	W02
-	.byte		BEND  , c_v-7
-	.byte	W01
-	.byte		VOL   , 101*se_w104_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v-9
-	.byte		BEND  , c_v+8
-	.byte	W02
-	.byte		VOL   , 84*se_w104_mvl/mxv
-	.byte		BEND  , c_v+4
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 64*se_w104_mvl/mxv
-	.byte		BEND  , c_v-13
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte	W02
-	.byte		VOL   , 45*se_w104_mvl/mxv
-	.byte		BEND  , c_v-31
-	.byte	W02
-	.byte		VOL   , 32*se_w104_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOICE , 2
-	.byte	W01
-	.byte		VOL   , 13*se_w104_mvl/mxv
-	.byte		BEND  , c_v-52
-	.byte	W08
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w104:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w104_pri	@ Priority
-	.byte	se_w104_rev	@ Reverb.
-
-	.word	se_w104_grp
-
-	.word	se_w104_1
-
-	.end
diff --git a/sound/songs/se_w112.s b/sound/songs/se_w112.s
deleted file mode 100644
index 3b741aa41..000000000
--- a/sound/songs/se_w112.s
+++ /dev/null
@@ -1,276 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w112_grp, voicegroup128
-	.equ	se_w112_pri, 4
-	.equ	se_w112_rev, reverb_set+50
-	.equ	se_w112_mvl, 127
-	.equ	se_w112_key, 0
-	.equ	se_w112_tbs, 1
-	.equ	se_w112_exg, 0
-	.equ	se_w112_cmp, 1
-
-	.section .rodata
-	.global	se_w112
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w112_1:
-	.byte	KEYSH , se_w112_key+0
-	.byte	TEMPO , 150*se_w112_tbs/2
-	.byte		VOICE , 19
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v+3
-	.byte		N06   , Cn6 , v088
-	.byte	W01
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-8
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-17
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-34
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-45
-	.byte	W02
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N06   , Cn6 , v084
-	.byte	W01
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-11
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-20
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-37
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-47
-	.byte	W02
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte		N06   , Cn6 , v076
-	.byte	W01
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-11
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-21
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-38
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-48
-	.byte	W02
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte		N06   , Cn6 , v064
-	.byte	W01
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-11
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-21
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-38
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-48
-	.byte	W02
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte		N06   , Cn6 , v056
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-12
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-22
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-39
-	.byte	W01
-	.byte		PAN   , c_v-10
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-49
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte		N06   , Cn6 , v044
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-12
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-22
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-39
-	.byte	W01
-	.byte		PAN   , c_v-10
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-49
-	.byte	W02
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte		N06   , Cn6 , v036
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-13
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-22
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-39
-	.byte	W01
-	.byte		PAN   , c_v-10
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-49
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte		N06   , Cn6 , v028
-	.byte	W01
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte		BEND  , c_v-13
-	.byte	W01
-	.byte		PAN   , c_v-6
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte		BEND  , c_v-22
-	.byte	W01
-	.byte		PAN   , c_v+8
-	.byte		VOL   , 24*se_w112_mvl/mxv
-	.byte		BEND  , c_v-39
-	.byte	W01
-	.byte		PAN   , c_v-10
-	.byte		VOL   , 11*se_w112_mvl/mxv
-	.byte		BEND  , c_v-49
-	.byte	W02
-	.byte	W06
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w112_2:
-	.byte	KEYSH , se_w112_key+0
-	.byte		VOICE , 53
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_w112_mvl/mxv
-	.byte		BEND  , c_v-5
-	.byte	W02
-	.byte		N06   , An5 , v064
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-	.byte		        56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w112_mvl/mxv
-	.byte		N06   , An5 , v056
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-se_w112_2_000:
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w112_mvl/mxv
-	.byte		N06   , An5 , v052
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-	.byte	PEND
-	.byte	PATT
-	 .word	se_w112_2_000
-	.byte		VOL   , 56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w112_mvl/mxv
-	.byte		N06   , An5 , v048
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-	.byte		        56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w112_mvl/mxv
-	.byte		N06   , An5 , v044
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-	.byte		        56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w112_mvl/mxv
-	.byte		N06   , An5 , v040
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-	.byte		        56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w112_mvl/mxv
-	.byte		N06   , An5 , v036
-	.byte	W02
-	.byte		VOL   , 88*se_w112_mvl/mxv
-	.byte	W02
-	.byte		        56*se_w112_mvl/mxv
-	.byte	W01
-	.byte		        24*se_w112_mvl/mxv
-	.byte	W05
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w112:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w112_pri	@ Priority
-	.byte	se_w112_rev	@ Reverb.
-
-	.word	se_w112_grp
-
-	.word	se_w112_1
-	.word	se_w112_2
-
-	.end
diff --git a/sound/songs/se_w120.s b/sound/songs/se_w120.s
deleted file mode 100644
index e86fac991..000000000
--- a/sound/songs/se_w120.s
+++ /dev/null
@@ -1,74 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w120_grp, voicegroup128
-	.equ	se_w120_pri, 4
-	.equ	se_w120_rev, reverb_set+50
-	.equ	se_w120_mvl, 127
-	.equ	se_w120_key, 0
-	.equ	se_w120_tbs, 1
-	.equ	se_w120_exg, 0
-	.equ	se_w120_cmp, 1
-
-	.section .rodata
-	.global	se_w120
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w120_1:
-	.byte	KEYSH , se_w120_key+0
-	.byte	TEMPO , 150*se_w120_tbs/2
-	.byte		VOICE , 41
-	.byte		VOL   , 115*se_w120_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N01   , Gn3 , v127
-	.byte	W01
-	.byte		        Cn3 
-	.byte	W01
-	.byte		N24   , An3 
-	.byte	W06
-	.byte		PAN   , c_v+6
-	.byte	W04
-	.byte		        c_v+0
-	.byte	W01
-	.byte		VOL   , 102*se_w120_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v-8
-	.byte		VOL   , 88*se_w120_mvl/mxv
-	.byte	W03
-	.byte		        78*se_w120_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 67*se_w120_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v-2
-	.byte	W01
-	.byte		PAN   , c_v+7
-	.byte		VOL   , 45*se_w120_mvl/mxv
-	.byte	W02
-	.byte		BEND  , c_v-8
-	.byte	W01
-	.byte		VOL   , 13*se_w120_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-15
-	.byte	W22
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w120:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w120_pri	@ Priority
-	.byte	se_w120_rev	@ Reverb.
-
-	.word	se_w120_grp
-
-	.word	se_w120_1
-
-	.end
diff --git a/sound/songs/se_w145b.s b/sound/songs/se_w145b.s
deleted file mode 100644
index d076bd331..000000000
--- a/sound/songs/se_w145b.s
+++ /dev/null
@@ -1,60 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w145b_grp, voicegroup128
-	.equ	se_w145b_pri, 4
-	.equ	se_w145b_rev, reverb_set+50
-	.equ	se_w145b_mvl, 127
-	.equ	se_w145b_key, 0
-	.equ	se_w145b_tbs, 1
-	.equ	se_w145b_exg, 0
-	.equ	se_w145b_cmp, 1
-
-	.section .rodata
-	.global	se_w145b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w145b_1:
-	.byte	KEYSH , se_w145b_key+0
-	.byte	TEMPO , 220*se_w145b_tbs/2
-	.byte		VOICE , 24
-	.byte		VOL   , 110*se_w145b_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte	W03
-	.byte		N09   , Gn4 , v127
-	.byte	W02
-	.byte		BEND  , c_v+31
-	.byte	W02
-	.byte		        c_v-34
-	.byte	W17
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w145b_2:
-	.byte	KEYSH , se_w145b_key+0
-	.byte		VOICE , 4
-	.byte		VOL   , 110*se_w145b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		N01   , Cn4 , v044
-	.byte	W24
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w145b:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w145b_pri	@ Priority
-	.byte	se_w145b_rev	@ Reverb.
-
-	.word	se_w145b_grp
-
-	.word	se_w145b_1
-	.word	se_w145b_2
-
-	.end
diff --git a/sound/songs/se_w146.s b/sound/songs/se_w146.s
deleted file mode 100644
index 824c66ac3..000000000
--- a/sound/songs/se_w146.s
+++ /dev/null
@@ -1,79 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w146_grp, voicegroup128
-	.equ	se_w146_pri, 4
-	.equ	se_w146_rev, reverb_set+50
-	.equ	se_w146_mvl, 127
-	.equ	se_w146_key, 0
-	.equ	se_w146_tbs, 1
-	.equ	se_w146_exg, 0
-	.equ	se_w146_cmp, 1
-
-	.section .rodata
-	.global	se_w146
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w146_1:
-	.byte	KEYSH , se_w146_key+0
-	.byte	TEMPO , 150*se_w146_tbs/2
-	.byte		VOICE , 19
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 5*se_w146_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N07   , Bn5 , v080
-	.byte	W01
-	.byte		VOL   , 55*se_w146_mvl/mxv
-	.byte		PAN   , c_v+11
-	.byte		BEND  , c_v+3
-	.byte	W01
-	.byte		VOL   , 67*se_w146_mvl/mxv
-	.byte		PAN   , c_v+22
-	.byte		BEND  , c_v+0
-	.byte	W01
-	.byte		VOL   , 90*se_w146_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-6
-	.byte	W01
-	.byte		PAN   , c_v-12
-	.byte		BEND  , c_v-14
-	.byte	W02
-	.byte		VOL   , 4*se_w146_mvl/mxv
-	.byte		PAN   , c_v-22
-	.byte		BEND  , c_v-23
-	.byte	W01
-	.byte		PAN   , c_v-13
-	.byte		BEND  , c_v+0
-	.byte		N04   , Cn6 
-	.byte	W01
-	.byte		VOL   , 66*se_w146_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+1
-	.byte	W01
-	.byte		VOL   , 90*se_w146_mvl/mxv
-	.byte		PAN   , c_v+11
-	.byte		BEND  , c_v+3
-	.byte	W01
-	.byte		VOL   , 4*se_w146_mvl/mxv
-	.byte		PAN   , c_v+21
-	.byte		BEND  , c_v+5
-	.byte	W14
-	.byte		VOL   , 90*se_w146_mvl/mxv
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w146:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w146_pri	@ Priority
-	.byte	se_w146_rev	@ Reverb.
-
-	.word	se_w146_grp
-
-	.word	se_w146_1
-
-	.end
diff --git a/sound/songs/se_w166.s b/sound/songs/se_w166.s
deleted file mode 100644
index afbe08f08..000000000
--- a/sound/songs/se_w166.s
+++ /dev/null
@@ -1,68 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w166_grp, voicegroup128
-	.equ	se_w166_pri, 4
-	.equ	se_w166_rev, reverb_set+50
-	.equ	se_w166_mvl, 127
-	.equ	se_w166_key, 0
-	.equ	se_w166_tbs, 1
-	.equ	se_w166_exg, 0
-	.equ	se_w166_cmp, 1
-
-	.section .rodata
-	.global	se_w166
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w166_1:
-	.byte	KEYSH , se_w166_key+0
-	.byte	TEMPO , 180*se_w166_tbs/2
-	.byte		VOICE , 38
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w166_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N02   , Gn4 , v127
-	.byte	W01
-	.byte		VOL   , 74*se_w166_mvl/mxv
-	.byte		BEND  , c_v-11
-	.byte	W01
-	.byte		VOICE , 31
-	.byte		VOL   , 40*se_w166_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte		N03   , Cs5 
-	.byte	W01
-	.byte		VOL   , 64*se_w166_mvl/mxv
-	.byte		PAN   , c_v-6
-	.byte		BEND  , c_v-12
-	.byte	W01
-	.byte		VOL   , 86*se_w166_mvl/mxv
-	.byte		PAN   , c_v+4
-	.byte		BEND  , c_v-16
-	.byte	W02
-	.byte		VOL   , 110*se_w166_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N02   , As5 
-	.byte	W01
-	.byte		BEND  , c_v+12
-	.byte	W01
-	.byte		VOL   , 0*se_w166_mvl/mxv
-	.byte	W04
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w166:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w166_pri	@ Priority
-	.byte	se_w166_rev	@ Reverb.
-
-	.word	se_w166_grp
-
-	.word	se_w166_1
-
-	.end
diff --git a/sound/songs/se_w172.s b/sound/songs/se_w172.s
deleted file mode 100644
index 0c5ae6754..000000000
--- a/sound/songs/se_w172.s
+++ /dev/null
@@ -1,124 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w172_grp, voicegroup128
-	.equ	se_w172_pri, 4
-	.equ	se_w172_rev, reverb_set+50
-	.equ	se_w172_mvl, 127
-	.equ	se_w172_key, 0
-	.equ	se_w172_tbs, 1
-	.equ	se_w172_exg, 0
-	.equ	se_w172_cmp, 1
-
-	.section .rodata
-	.global	se_w172
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w172_1:
-	.byte	KEYSH , se_w172_key+0
-	.byte	TEMPO , 150*se_w172_tbs/2
-	.byte		VOICE , 29
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 22*se_w172_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N30   , Dn4 , v127
-	.byte	W01
-	.byte		VOL   , 49*se_w172_mvl/mxv
-	.byte	W01
-	.byte		        71*se_w172_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w172_mvl/mxv
-	.byte		BEND  , c_v+8
-	.byte	W01
-	.byte		VOL   , 110*se_w172_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte		BEND  , c_v+16
-	.byte	W01
-	.byte		VOL   , 95*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        88*se_w172_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+7
-	.byte	W01
-	.byte		VOL   , 93*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        110*se_w172_mvl/mxv
-	.byte		PAN   , c_v-5
-	.byte		BEND  , c_v+0
-	.byte	W02
-	.byte		VOL   , 86*se_w172_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-9
-	.byte	W01
-	.byte		VOL   , 63*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        37*se_w172_mvl/mxv
-	.byte		BEND  , c_v-24
-	.byte	W03
-	.byte		VOL   , 13*se_w172_mvl/mxv
-	.byte		BEND  , c_v-46
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w172_2:
-	.byte	KEYSH , se_w172_key+0
-	.byte		VOICE , 27
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 22*se_w172_mvl/mxv
-	.byte		N30   , Gn2 , v032
-	.byte	W01
-	.byte		VOL   , 49*se_w172_mvl/mxv
-	.byte	W01
-	.byte		        71*se_w172_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w172_mvl/mxv
-	.byte	W01
-	.byte		        110*se_w172_mvl/mxv
-	.byte	W02
-	.byte	W01
-	.byte		        95*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        88*se_w172_mvl/mxv
-	.byte	W01
-	.byte		        93*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        110*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        86*se_w172_mvl/mxv
-	.byte	W01
-	.byte	W01
-	.byte		        63*se_w172_mvl/mxv
-	.byte	W02
-	.byte		        37*se_w172_mvl/mxv
-	.byte	W03
-	.byte		        13*se_w172_mvl/mxv
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	W03
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w172:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w172_pri	@ Priority
-	.byte	se_w172_rev	@ Reverb.
-
-	.word	se_w172_grp
-
-	.word	se_w172_1
-	.word	se_w172_2
-
-	.end
diff --git a/sound/songs/se_w172b.s b/sound/songs/se_w172b.s
deleted file mode 100644
index 1d4369b00..000000000
--- a/sound/songs/se_w172b.s
+++ /dev/null
@@ -1,99 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w172b_grp, voicegroup128
-	.equ	se_w172b_pri, 4
-	.equ	se_w172b_rev, reverb_set+50
-	.equ	se_w172b_mvl, 127
-	.equ	se_w172b_key, 0
-	.equ	se_w172b_tbs, 1
-	.equ	se_w172b_exg, 0
-	.equ	se_w172b_cmp, 1
-
-	.section .rodata
-	.global	se_w172b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w172b_1:
-	.byte	KEYSH , se_w172b_key+0
-	.byte	TEMPO , 150*se_w172b_tbs/2
-	.byte		VOICE , 29
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w172b_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N48   , Cn4 , v127
-	.byte	W06
-	.byte		PAN   , c_v+4
-	.byte	W03
-	.byte		BEND  , c_v+2
-	.byte	W03
-	.byte		PAN   , c_v+10
-	.byte	W03
-	.byte		BEND  , c_v+5
-	.byte	W03
-	.byte		VOL   , 98*se_w172b_mvl/mxv
-	.byte		PAN   , c_v+4
-	.byte	W03
-	.byte		BEND  , c_v+3
-	.byte	W03
-	.byte		VOL   , 88*se_w172b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		BEND  , c_v-5
-	.byte	W03
-	.byte		VOL   , 68*se_w172b_mvl/mxv
-	.byte		PAN   , c_v-5
-	.byte	W03
-	.byte		        c_v+7
-	.byte		BEND  , c_v-9
-	.byte	W03
-	.byte		VOL   , 44*se_w172b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		BEND  , c_v-15
-	.byte	W03
-	.byte		VOL   , 13*se_w172b_mvl/mxv
-	.byte		BEND  , c_v-24
-	.byte	W03
-	.byte		        c_v-40
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w172b_2:
-	.byte	KEYSH , se_w172b_key+0
-	.byte		VOICE , 27
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w172b_mvl/mxv
-	.byte		N48   , Gn2 , v032
-	.byte	W18
-	.byte		VOL   , 98*se_w172b_mvl/mxv
-	.byte	W06
-	.byte		        88*se_w172b_mvl/mxv
-	.byte	W06
-	.byte		        68*se_w172b_mvl/mxv
-	.byte	W06
-	.byte		        44*se_w172b_mvl/mxv
-	.byte	W06
-	.byte		        13*se_w172b_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w172b:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w172b_pri	@ Priority
-	.byte	se_w172b_rev	@ Reverb.
-
-	.word	se_w172b_grp
-
-	.word	se_w172b_1
-	.word	se_w172b_2
-
-	.end
diff --git a/sound/songs/se_w187.s b/sound/songs/se_w187.s
deleted file mode 100644
index d6c27b89c..000000000
--- a/sound/songs/se_w187.s
+++ /dev/null
@@ -1,72 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w187_grp, voicegroup128
-	.equ	se_w187_pri, 4
-	.equ	se_w187_rev, reverb_set+50
-	.equ	se_w187_mvl, 127
-	.equ	se_w187_key, 0
-	.equ	se_w187_tbs, 1
-	.equ	se_w187_exg, 0
-	.equ	se_w187_cmp, 1
-
-	.section .rodata
-	.global	se_w187
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w187_1:
-	.byte	KEYSH , se_w187_key+0
-	.byte	TEMPO , 150*se_w187_tbs/2
-	.byte		VOICE , 6
-	.byte		BENDR , 12
-	.byte		VOL   , 115*se_w187_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N19   , An2 , v127
-	.byte	W01
-	.byte		BEND  , c_v-6
-	.byte	W01
-	.byte		        c_v-10
-	.byte	W01
-	.byte		        c_v-14
-	.byte	W01
-	.byte		        c_v-12
-	.byte	W02
-	.byte		        c_v-14
-	.byte	W01
-	.byte		        c_v-18
-	.byte	W01
-	.byte		VOL   , 108*se_w187_mvl/mxv
-	.byte		BEND  , c_v-20
-	.byte	W01
-	.byte		        c_v-22
-	.byte	W01
-	.byte		VOL   , 94*se_w187_mvl/mxv
-	.byte	W03
-	.byte		        78*se_w187_mvl/mxv
-	.byte	W01
-	.byte		        62*se_w187_mvl/mxv
-	.byte	W01
-	.byte		        40*se_w187_mvl/mxv
-	.byte	W01
-	.byte		        27*se_w187_mvl/mxv
-	.byte	W02
-	.byte		        12*se_w187_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w187:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w187_pri	@ Priority
-	.byte	se_w187_rev	@ Reverb.
-
-	.word	se_w187_grp
-
-	.word	se_w187_1
-
-	.end
diff --git a/sound/songs/se_w195.s b/sound/songs/se_w195.s
deleted file mode 100644
index b78095248..000000000
--- a/sound/songs/se_w195.s
+++ /dev/null
@@ -1,221 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w195_grp, voicegroup128
-	.equ	se_w195_pri, 4
-	.equ	se_w195_rev, reverb_set+50
-	.equ	se_w195_mvl, 127
-	.equ	se_w195_key, 0
-	.equ	se_w195_tbs, 1
-	.equ	se_w195_exg, 0
-	.equ	se_w195_cmp, 1
-
-	.section .rodata
-	.global	se_w195
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w195_1:
-	.byte	KEYSH , se_w195_key+0
-	.byte	TEMPO , 100*se_w195_tbs/2
-	.byte		VOICE , 73
-	.byte		BENDR , 12
-	.byte		LFOS  , 40
-	.byte		PAN   , c_v+7
-	.byte		VOL   , 25*se_w195_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte	W03
-	.byte		VOL   , 29*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        33*se_w195_mvl/mxv
-	.byte		N48   , An3 , v112
-	.byte	W03
-	.byte		VOL   , 40*se_w195_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+4
-	.byte	W02
-se_w195_1_000:
-	.byte		VOL   , 45*se_w195_mvl/mxv
-	.byte		MOD   , 8
-	.byte	W03
-	.byte		VOL   , 51*se_w195_mvl/mxv
-	.byte	W03
-	.byte	PEND
-se_w195_1_001:
-	.byte		VOL   , 56*se_w195_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		VOL   , 62*se_w195_mvl/mxv
-	.byte	W03
-	.byte	PEND
-se_w195_1_002:
-	.byte		VOL   , 72*se_w195_mvl/mxv
-	.byte		PAN   , c_v-4
-	.byte	W03
-	.byte		VOL   , 81*se_w195_mvl/mxv
-	.byte	W03
-	.byte	PEND
-se_w195_1_003:
-	.byte		VOL   , 92*se_w195_mvl/mxv
-	.byte		PAN   , c_v-8
-	.byte	W03
-	.byte		VOL   , 100*se_w195_mvl/mxv
-	.byte	W03
-	.byte	PEND
-	.byte		PAN   , c_v-4
-	.byte	W06
-	.byte		VOL   , 82*se_w195_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		VOL   , 52*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        25*se_w195_mvl/mxv
-	.byte		MOD   , 0
-	.byte		PAN   , c_v+4
-	.byte	W03
-	.byte		VOL   , 29*se_w195_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+7
-	.byte	W02
-	.byte		VOL   , 33*se_w195_mvl/mxv
-	.byte		N72   , Gs3 , v112
-	.byte	W03
-	.byte		VOL   , 40*se_w195_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+4
-	.byte	W02
-	.byte	PATT
-	 .word	se_w195_1_000
-	.byte	PATT
-	 .word	se_w195_1_001
-	.byte	PATT
-	 .word	se_w195_1_002
-	.byte	PATT
-	 .word	se_w195_1_003
-	.byte		PAN   , c_v-4
-	.byte	W06
-	.byte		        c_v+0
-	.byte	W06
-	.byte		        c_v+4
-	.byte	W03
-	.byte		VOL   , 87*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        75*se_w195_mvl/mxv
-	.byte		PAN   , c_v+7
-	.byte	W03
-	.byte		VOL   , 62*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        48*se_w195_mvl/mxv
-	.byte		PAN   , c_v+4
-	.byte	W03
-	.byte		VOL   , 33*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        25*se_w195_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W02
-	.byte		VOL   , 10*se_w195_mvl/mxv
-	.byte	W03
-	.byte	W01
-	.byte		PAN   , c_v-4
-	.byte	W05
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w195_2:
-	.byte	KEYSH , se_w195_key+0
-	.byte		VOICE , 73
-	.byte		VOL   , 25*se_w195_mvl/mxv
-	.byte		PAN   , c_v-17
-	.byte		N48   , Cn4 , v100
-	.byte	W03
-	.byte		VOL   , 29*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        33*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        40*se_w195_mvl/mxv
-	.byte	W03
-se_w195_2_000:
-	.byte		VOL   , 45*se_w195_mvl/mxv
-	.byte		MOD   , 8
-	.byte	W03
-	.byte		VOL   , 51*se_w195_mvl/mxv
-	.byte	W03
-	.byte	PEND
-	.byte		        56*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        62*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        72*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        81*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        92*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        100*se_w195_mvl/mxv
-	.byte	W03
-	.byte	W06
-	.byte		        82*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        52*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        25*se_w195_mvl/mxv
-	.byte		MOD   , 0
-	.byte		N72   , Bn3 , v100
-	.byte	W03
-	.byte		VOL   , 29*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        33*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        40*se_w195_mvl/mxv
-	.byte	W03
-	.byte	PATT
-	 .word	se_w195_2_000
-	.byte		VOL   , 56*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        62*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        72*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        81*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        92*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        100*se_w195_mvl/mxv
-	.byte	W03
-	.byte	W06
-	.byte	W06
-	.byte	W03
-	.byte		        87*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        75*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        62*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        48*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        33*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        25*se_w195_mvl/mxv
-	.byte	W03
-	.byte		        10*se_w195_mvl/mxv
-	.byte	W03
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w195:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w195_pri	@ Priority
-	.byte	se_w195_rev	@ Reverb.
-
-	.word	se_w195_grp
-
-	.word	se_w195_1
-	.word	se_w195_2
-
-	.end
diff --git a/sound/songs/se_w207.s b/sound/songs/se_w207.s
deleted file mode 100644
index 1c0d0475b..000000000
--- a/sound/songs/se_w207.s
+++ /dev/null
@@ -1,77 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w207_grp, voicegroup128
-	.equ	se_w207_pri, 4
-	.equ	se_w207_rev, reverb_set+50
-	.equ	se_w207_mvl, 127
-	.equ	se_w207_key, 0
-	.equ	se_w207_tbs, 1
-	.equ	se_w207_exg, 0
-	.equ	se_w207_cmp, 1
-
-	.section .rodata
-	.global	se_w207
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w207_1:
-	.byte	KEYSH , se_w207_key+0
-	.byte	TEMPO , 190*se_w207_tbs/2
-	.byte		VOICE , 2
-	.byte		BENDR , 8
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 28*se_w207_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N15   , An1 , v127
-	.byte	W01
-	.byte		VOL   , 60*se_w207_mvl/mxv
-	.byte	W01
-	.byte		        111*se_w207_mvl/mxv
-	.byte	W01
-	.byte		        120*se_w207_mvl/mxv
-	.byte	W01
-	.byte		BEND  , c_v-3
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte		BEND  , c_v-6
-	.byte	W01
-	.byte		PAN   , c_v-4
-	.byte		BEND  , c_v-8
-	.byte	W01
-	.byte		VOL   , 109*se_w207_mvl/mxv
-	.byte		PAN   , c_v+9
-	.byte		BEND  , c_v-10
-	.byte	W01
-	.byte		PAN   , c_v-9
-	.byte		BEND  , c_v-14
-	.byte	W01
-	.byte		VOL   , 95*se_w207_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-19
-	.byte	W02
-	.byte		VOL   , 71*se_w207_mvl/mxv
-	.byte		BEND  , c_v-29
-	.byte	W01
-	.byte		VOL   , 41*se_w207_mvl/mxv
-	.byte		BEND  , c_v-38
-	.byte	W01
-	.byte		VOL   , 15*se_w207_mvl/mxv
-	.byte		BEND  , c_v-52
-	.byte	W04
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w207:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w207_pri	@ Priority
-	.byte	se_w207_rev	@ Reverb.
-
-	.word	se_w207_grp
-
-	.word	se_w207_1
-
-	.end
diff --git a/sound/songs/se_w221.s b/sound/songs/se_w221.s
deleted file mode 100644
index 68e9d0957..000000000
--- a/sound/songs/se_w221.s
+++ /dev/null
@@ -1,105 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w221_grp, voicegroup128
-	.equ	se_w221_pri, 4
-	.equ	se_w221_rev, reverb_set+50
-	.equ	se_w221_mvl, 127
-	.equ	se_w221_key, 0
-	.equ	se_w221_tbs, 1
-	.equ	se_w221_exg, 0
-	.equ	se_w221_cmp, 1
-
-	.section .rodata
-	.global	se_w221
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w221_1:
-	.byte	KEYSH , se_w221_key+0
-	.byte	TEMPO , 150*se_w221_tbs/2
-	.byte		VOICE , 29
-	.byte		BENDR , 12
-	.byte		VOL   , 110*se_w221_mvl/mxv
-	.byte		PAN   , c_v+5
-	.byte		BEND  , c_v+0
-	.byte		N04   , Cn3 , v127
-	.byte	W03
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		N18   , Gn4 
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte	W01
-	.byte		VOL   , 98*se_w221_mvl/mxv
-	.byte		BEND  , c_v+2
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 83*se_w221_mvl/mxv
-	.byte		BEND  , c_v+6
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte	W01
-	.byte		BEND  , c_v+9
-	.byte	W01
-	.byte		VOL   , 63*se_w221_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		BEND  , c_v+13
-	.byte	W02
-	.byte		VOL   , 44*se_w221_mvl/mxv
-	.byte		PAN   , c_v-5
-	.byte	W02
-	.byte		VOL   , 28*se_w221_mvl/mxv
-	.byte		BEND  , c_v+20
-	.byte	W01
-	.byte		PAN   , c_v-2
-	.byte	W01
-	.byte		VOL   , 12*se_w221_mvl/mxv
-	.byte	W02
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w221_2:
-	.byte	KEYSH , se_w221_key+0
-	.byte		VOICE , 27
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 110*se_w221_mvl/mxv
-	.byte		N01   , Gn2 , v032
-	.byte	W02
-	.byte		N01   
-	.byte	W02
-	.byte		N18   
-	.byte	W03
-	.byte		VOL   , 98*se_w221_mvl/mxv
-	.byte	W03
-	.byte		        83*se_w221_mvl/mxv
-	.byte	W04
-	.byte		        63*se_w221_mvl/mxv
-	.byte	W04
-	.byte		        44*se_w221_mvl/mxv
-	.byte	W02
-	.byte		        28*se_w221_mvl/mxv
-	.byte	W02
-	.byte		        12*se_w221_mvl/mxv
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w221:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w221_pri	@ Priority
-	.byte	se_w221_rev	@ Reverb.
-
-	.word	se_w221_grp
-
-	.word	se_w221_1
-	.word	se_w221_2
-
-	.end
diff --git a/sound/songs/se_w221b.s b/sound/songs/se_w221b.s
deleted file mode 100644
index ed0120acf..000000000
--- a/sound/songs/se_w221b.s
+++ /dev/null
@@ -1,180 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w221b_grp, voicegroup128
-	.equ	se_w221b_pri, 4
-	.equ	se_w221b_rev, reverb_set+50
-	.equ	se_w221b_mvl, 127
-	.equ	se_w221b_key, 0
-	.equ	se_w221b_tbs, 1
-	.equ	se_w221b_exg, 0
-	.equ	se_w221b_cmp, 1
-
-	.section .rodata
-	.global	se_w221b
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w221b_1:
-	.byte	KEYSH , se_w221b_key+0
-	.byte	TEMPO , 150*se_w221b_tbs/2
-	.byte		VOICE , 29
-	.byte		BENDR , 12
-	.byte		VOL   , 22*se_w221b_mvl/mxv
-	.byte		PAN   , c_v+5
-	.byte		BEND  , c_v+0
-	.byte		N96   , Gn3 , v127
-	.byte	W01
-	.byte		VOL   , 49*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		        71*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 95*se_w221b_mvl/mxv
-	.byte		BEND  , c_v+8
-	.byte	W01
-	.byte		VOL   , 110*se_w221b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte		BEND  , c_v+16
-	.byte	W03
-	.byte		VOL   , 97*se_w221b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+7
-	.byte	W03
-	.byte		PAN   , c_v+5
-	.byte		BEND  , c_v+0
-	.byte	W01
-	.byte		VOL   , 84*se_w221b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v-9
-	.byte	W03
-	.byte		VOL   , 76*se_w221b_mvl/mxv
-	.byte		PAN   , c_v-5
-	.byte		BEND  , c_v-24
-	.byte	W03
-	.byte		PAN   , c_v-2
-	.byte		BEND  , c_v-46
-	.byte	W03
-	.byte		VOL   , 84*se_w221b_mvl/mxv
-	.byte		PAN   , c_v+5
-	.byte	W03
-	.byte		        c_v+0
-	.byte	W01
-	.byte		VOL   , 92*se_w221b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte	W01
-	.byte		BEND  , c_v-32
-	.byte	W02
-	.byte		PAN   , c_v+0
-	.byte	W01
-	.byte		VOL   , 86*se_w221b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte	W02
-	.byte		BEND  , c_v-18
-	.byte	W01
-	.byte		VOL   , 78*se_w221b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		        c_v-5
-	.byte	W02
-	.byte		VOL   , 71*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v-2
-	.byte	W03
-	.byte		        c_v+5
-	.byte	W03
-	.byte		        c_v+0
-	.byte		VOL   , 78*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-5
-	.byte	W02
-	.byte		VOL   , 86*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		        c_v+5
-	.byte	W02
-	.byte		VOL   , 90*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		        c_v-5
-	.byte	W03
-	.byte		        c_v-2
-	.byte	W01
-	.byte		VOL   , 80*se_w221b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v+5
-	.byte	W03
-	.byte		        c_v+0
-	.byte	W01
-	.byte		VOL   , 86*se_w221b_mvl/mxv
-	.byte	W02
-	.byte		PAN   , c_v-5
-	.byte	W03
-	.byte		        c_v+0
-	.byte		VOL   , 83*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+5
-	.byte		VOL   , 63*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		        37*se_w221b_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte	W03
-	.byte		        c_v-5
-	.byte		VOL   , 13*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v-2
-	.byte	W03
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w221b_2:
-	.byte	KEYSH , se_w221b_key+0
-	.byte		VOICE , 27
-	.byte		VOL   , 22*se_w221b_mvl/mxv
-	.byte		N96   , Gn2 , v032
-	.byte	W01
-	.byte		VOL   , 49*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		        71*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		        95*se_w221b_mvl/mxv
-	.byte	W01
-	.byte		        110*se_w221b_mvl/mxv
-	.byte	W05
-	.byte		        97*se_w221b_mvl/mxv
-	.byte	W15
-	.byte	W24
-	.byte	W24
-	.byte	W09
-	.byte		        83*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		        63*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		        37*se_w221b_mvl/mxv
-	.byte	W03
-	.byte		        13*se_w221b_mvl/mxv
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w221b:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w221b_pri	@ Priority
-	.byte	se_w221b_rev	@ Reverb.
-
-	.word	se_w221b_grp
-
-	.word	se_w221b_1
-	.word	se_w221b_2
-
-	.end
diff --git a/sound/songs/se_w233.s b/sound/songs/se_w233.s
deleted file mode 100644
index 84381fc0e..000000000
--- a/sound/songs/se_w233.s
+++ /dev/null
@@ -1,75 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w233_grp, voicegroup128
-	.equ	se_w233_pri, 4
-	.equ	se_w233_rev, reverb_set+50
-	.equ	se_w233_mvl, 127
-	.equ	se_w233_key, 0
-	.equ	se_w233_tbs, 1
-	.equ	se_w233_exg, 0
-	.equ	se_w233_cmp, 1
-
-	.section .rodata
-	.global	se_w233
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w233_1:
-	.byte	KEYSH , se_w233_key+0
-	.byte	TEMPO , 220*se_w233_tbs/2
-	.byte		VOICE , 22
-	.byte		VOL   , 110*se_w233_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+16
-	.byte		BEND  , c_v+46
-	.byte		N09   , Cn3 , v127
-	.byte	W03
-	.byte		VOL   , 104*se_w233_mvl/mxv
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+23
-	.byte	W03
-	.byte		VOL   , 93*se_w233_mvl/mxv
-	.byte		PAN   , c_v-16
-	.byte		BEND  , c_v-15
-	.byte	W03
-	.byte		VOICE , 21
-	.byte		VOL   , 110*se_w233_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		N03   , Gn4 
-	.byte	W06
-	.byte		PAN   , c_v+16
-	.byte		N03   , Cn5 
-	.byte	W09
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w233_2:
-	.byte	KEYSH , se_w233_key+0
-	.byte		VOICE , 4
-	.byte		VOL   , 110*se_w233_mvl/mxv
-	.byte	W09
-	.byte		PAN   , c_v+8
-	.byte		N03   , Cn3 , v052
-	.byte	W06
-	.byte		PAN   , c_v-7
-	.byte		N03   
-	.byte	W09
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w233:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w233_pri	@ Priority
-	.byte	se_w233_rev	@ Reverb.
-
-	.word	se_w233_grp
-
-	.word	se_w233_1
-	.word	se_w233_2
-
-	.end
diff --git a/sound/songs/se_w240.s b/sound/songs/se_w240.s
deleted file mode 100644
index 744cc3b88..000000000
--- a/sound/songs/se_w240.s
+++ /dev/null
@@ -1,116 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w240_grp, voicegroup128
-	.equ	se_w240_pri, 4
-	.equ	se_w240_rev, reverb_set+50
-	.equ	se_w240_mvl, 127
-	.equ	se_w240_key, 0
-	.equ	se_w240_tbs, 1
-	.equ	se_w240_exg, 0
-	.equ	se_w240_cmp, 1
-
-	.section .rodata
-	.global	se_w240
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w240_1:
-	.byte	KEYSH , se_w240_key+0
-	.byte	TEMPO , 220*se_w240_tbs/2
-	.byte		VOICE , 36
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		VOL   , 20*se_w240_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte		TIE   , Gn3 , v064
-	.byte	W03
-	.byte		VOL   , 37*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        53*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        60*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        71*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        81*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        93*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        110*se_w240_mvl/mxv
-	.byte	W03
-	.byte		PAN   , c_v+3
-	.byte	W06
-	.byte		        c_v+11
-	.byte	W12
-	.byte		        c_v+20
-	.byte	W06
-	.byte		        c_v+25
-	.byte	W12
-	.byte		        c_v+14
-	.byte	W06
-	.byte		        c_v+8
-	.byte	W06
-	.byte	W06
-	.byte		        c_v-3
-	.byte	W12
-	.byte		        c_v-16
-	.byte	W06
-	.byte	W06
-	.byte		        c_v-26
-	.byte	W12
-	.byte		        c_v-16
-	.byte	W06
-	.byte		VOL   , 104*se_w240_mvl/mxv
-	.byte		PAN   , c_v-5
-	.byte	W03
-	.byte		VOL   , 101*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        98*se_w240_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte	W03
-	.byte		VOL   , 93*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        90*se_w240_mvl/mxv
-	.byte		PAN   , c_v+14
-	.byte	W03
-	.byte		VOL   , 86*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        83*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        77*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        73*se_w240_mvl/mxv
-	.byte		PAN   , c_v+24
-	.byte	W03
-	.byte		VOL   , 66*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        58*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        44*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        32*se_w240_mvl/mxv
-	.byte		PAN   , c_v+15
-	.byte	W03
-	.byte		VOL   , 16*se_w240_mvl/mxv
-	.byte	W03
-	.byte		        1*se_w240_mvl/mxv
-	.byte		PAN   , c_v+4
-	.byte	W06
-	.byte		EOT   
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w240:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w240_pri	@ Priority
-	.byte	se_w240_rev	@ Reverb.
-
-	.word	se_w240_grp
-
-	.word	se_w240_1
-
-	.end
diff --git a/sound/songs/se_w260.s b/sound/songs/se_w260.s
deleted file mode 100644
index 70e58fda1..000000000
--- a/sound/songs/se_w260.s
+++ /dev/null
@@ -1,67 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w260_grp, voicegroup128
-	.equ	se_w260_pri, 4
-	.equ	se_w260_rev, reverb_set+50
-	.equ	se_w260_mvl, 127
-	.equ	se_w260_key, 0
-	.equ	se_w260_tbs, 1
-	.equ	se_w260_exg, 0
-	.equ	se_w260_cmp, 1
-
-	.section .rodata
-	.global	se_w260
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w260_1:
-	.byte	KEYSH , se_w260_key+0
-	.byte	TEMPO , 150*se_w260_tbs/2
-	.byte		VOICE , 41
-	.byte		VOL   , 100*se_w260_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+0
-	.byte		BEND  , c_v+0
-	.byte		N01   , Dn5 , v127
-	.byte	W01
-	.byte		        Gn4 
-	.byte	W01
-	.byte		N09   , En5 
-	.byte	W02
-	.byte		PAN   , c_v+6
-	.byte	W02
-	.byte		VOL   , 92*se_w260_mvl/mxv
-	.byte		PAN   , c_v-8
-	.byte	W01
-	.byte		VOL   , 83*se_w260_mvl/mxv
-	.byte		PAN   , c_v+6
-	.byte	W01
-	.byte		VOL   , 71*se_w260_mvl/mxv
-	.byte		PAN   , c_v-8
-	.byte		BEND  , c_v-4
-	.byte	W01
-	.byte		VOL   , 46*se_w260_mvl/mxv
-	.byte		PAN   , c_v+11
-	.byte		BEND  , c_v-8
-	.byte	W01
-	.byte		VOL   , 22*se_w260_mvl/mxv
-	.byte		PAN   , c_v-12
-	.byte		BEND  , c_v-15
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w260:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w260_pri	@ Priority
-	.byte	se_w260_rev	@ Reverb.
-
-	.word	se_w260_grp
-
-	.word	se_w260_1
-
-	.end
diff --git a/sound/songs/se_w327.s b/sound/songs/se_w327.s
deleted file mode 100644
index 1efa6c33f..000000000
--- a/sound/songs/se_w327.s
+++ /dev/null
@@ -1,103 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_w327_grp, voicegroup128
-	.equ	se_w327_pri, 4
-	.equ	se_w327_rev, reverb_set+50
-	.equ	se_w327_mvl, 127
-	.equ	se_w327_key, 0
-	.equ	se_w327_tbs, 1
-	.equ	se_w327_exg, 0
-	.equ	se_w327_cmp, 1
-
-	.section .rodata
-	.global	se_w327
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_w327_1:
-	.byte	KEYSH , se_w327_key+0
-	.byte	TEMPO , 220*se_w327_tbs/2
-	.byte		VOICE , 41
-	.byte		VOL   , 110*se_w327_mvl/mxv
-	.byte		BENDR , 12
-	.byte		PAN   , c_v+6
-	.byte		BEND  , c_v+0
-	.byte		N02   , Cn4 , v127
-	.byte	W03
-	.byte		VOL   , 104*se_w327_mvl/mxv
-	.byte	W03
-	.byte		        93*se_w327_mvl/mxv
-	.byte		PAN   , c_v-6
-	.byte		N02   , Cn5 
-	.byte	W03
-	.byte		VOL   , 110*se_w327_mvl/mxv
-	.byte	W01
-	.byte		VOICE , 22
-	.byte		PAN   , c_v+0
-	.byte		N24   , Cn4 , v060
-	.byte	W02
-	.byte	W02
-	.byte		BEND  , c_v+0
-	.byte	W04
-	.byte		        c_v+1
-	.byte	W03
-	.byte		        c_v+1
-	.byte	W01
-	.byte		VOL   , 105*se_w327_mvl/mxv
-	.byte	W02
-	.byte		BEND  , c_v+0
-	.byte	W01
-	.byte		VOL   , 103*se_w327_mvl/mxv
-	.byte	W02
-	.byte		        91*se_w327_mvl/mxv
-	.byte		BEND  , c_v+0
-	.byte	W03
-	.byte		VOL   , 77*se_w327_mvl/mxv
-	.byte		BEND  , c_v-1
-	.byte	W02
-	.byte		VOL   , 61*se_w327_mvl/mxv
-	.byte		BEND  , c_v-2
-	.byte	W01
-	.byte		VOL   , 38*se_w327_mvl/mxv
-	.byte	W01
-	.byte		        15*se_w327_mvl/mxv
-	.byte		BEND  , c_v-3
-	.byte	W02
-	.byte	FINE
-
-@********************** Track  2 **********************@
-
-se_w327_2:
-	.byte	KEYSH , se_w327_key+0
-	.byte		VOICE , 4
-	.byte		VOL   , 110*se_w327_mvl/mxv
-	.byte		N02   , Cn3 , v060
-	.byte	W03
-	.byte		        Gn2 
-	.byte	W03
-	.byte		        Gs4 
-	.byte	W04
-	.byte		        Gs4 , v020
-	.byte	W02
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	W06
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_w327:
-	.byte	2	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_w327_pri	@ Priority
-	.byte	se_w327_rev	@ Reverb.
-
-	.word	se_w327_grp
-
-	.word	se_w327_1
-	.word	se_w327_2
-
-	.end
diff --git a/sound/songs/se_z_scroll.s b/sound/songs/se_z_scroll.s
deleted file mode 100644
index d8c792b17..000000000
--- a/sound/songs/se_z_scroll.s
+++ /dev/null
@@ -1,46 +0,0 @@
-	.include "MPlayDef.s"
-
-	.equ	se_z_scroll_grp, voicegroup127
-	.equ	se_z_scroll_pri, 5
-	.equ	se_z_scroll_rev, reverb_set+50
-	.equ	se_z_scroll_mvl, 127
-	.equ	se_z_scroll_key, 0
-	.equ	se_z_scroll_tbs, 1
-	.equ	se_z_scroll_exg, 0
-	.equ	se_z_scroll_cmp, 1
-
-	.section .rodata
-	.global	se_z_scroll
-	.align	2
-
-@********************** Track  1 **********************@
-
-se_z_scroll_1:
-	.byte	KEYSH , se_z_scroll_key+0
-	.byte	TEMPO , 100*se_z_scroll_tbs/2
-	.byte		VOICE , 4
-	.byte		BENDR , 12
-	.byte		XCMD  , xIECV , 10
-	.byte		        xIECL , 8
-	.byte		VOL   , 40*se_z_scroll_mvl/mxv
-	.byte		BEND  , c_v+4
-	.byte		N01   , Gn4 , v127
-	.byte	W01
-	.byte		        Gn4 , v020
-	.byte	W02
-	.byte	FINE
-
-@******************************************************@
-	.align	2
-
-se_z_scroll:
-	.byte	1	@ NumTrks
-	.byte	0	@ NumBlks
-	.byte	se_z_scroll_pri	@ Priority
-	.byte	se_z_scroll_rev	@ Reverb.
-
-	.word	se_z_scroll_grp
-
-	.word	se_z_scroll_1
-
-	.end
diff --git a/src/agb_flash.c b/src/agb_flash.c
index eeccf1116..15ab0932d 100644
--- a/src/agb_flash.c
+++ b/src/agb_flash.c
@@ -293,4 +293,4 @@ u32 ProgramFlashSectorAndVerifyNBytes(u16 sectorNum, u8 *src, u32 n)
     }
 
     return result;
-}
\ No newline at end of file
+}
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index f4769145d..c8d43e12e 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -3178,14 +3178,14 @@ static void AnimItemSteal_Step3(struct Sprite* sprite)
 
     sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);
     if (sprite->pos2.y == 0)
-        PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(63));
+        PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(63));
 
     if (moveAlongLinearPath(sprite))
     {
         sprite->pos2.y = 0;
         sprite->data[0] = 0;
         sprite->callback = AnimItemSteal_Step2;
-        PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64));
+        PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(-64));
     }
 }
 
@@ -4260,7 +4260,7 @@ static void AnimLockOnTarget_Step1(struct Sprite* sprite)
         sprite->callback = StartAnimLinearTranslation;
         StoreSpriteCallbackInData6(sprite, AnimLockOnTarget_Step2);
         sprite->data[5] += 0x100;
-        PlaySE12WithPanning(SE_W199, BattleAnimAdjustPanning(63));
+        PlaySE12WithPanning(SE_M_LOCK_ON, BattleAnimAdjustPanning(63));
         break;
     }
 
@@ -4346,7 +4346,7 @@ static void AnimLockOnTarget_Step4(struct Sprite* sprite)
         sprite->data[2]++;
         pal = sprite->oam.paletteNum;
         LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4);
-        PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(63));
+        PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(63));
     }
     else if (sprite->data[1] == 0)
     {
@@ -4821,7 +4821,7 @@ static void AnimSharpenSphere_Step(struct Sprite* sprite)
         {
             sprite->data[4]++;
             if (!(sprite->data[4] & 1))
-                PlaySE12WithPanning(SE_W207B, sprite->data[5]);
+                PlaySE12WithPanning(SE_M_SWAGGER2, sprite->data[5]);
         }
 
         sprite->data[0] = 0;
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index f7d1eea10..d891a4d01 100755
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -1632,7 +1632,7 @@ static void AirCutterProjectileStep1(u8 taskId)
         gTasks[taskId].data[gTasks[taskId].data[1] + 13] = spriteId;
         gTasks[taskId].data[0] = gTasks[taskId].data[3];
         gTasks[taskId].data[1]++;
-        PlaySE12WithPanning(SE_W059B, BattleAnimAdjustPanning(-63));
+        PlaySE12WithPanning(SE_M_BLIZZARD2, BattleAnimAdjustPanning(-63));
         if (gTasks[taskId].data[1] > 2)
             gTasks[taskId].func = AirCutterProjectileStep2;
     }
@@ -1829,7 +1829,7 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite)
     int i;
     u16 rand;
     s16* ptr;
-    PlaySE12WithPanning(SE_W030, BattleAnimAdjustPanning(63));
+    PlaySE12WithPanning(SE_M_HORN_ATTACK, BattleAnimAdjustPanning(63));
     sprite->pos1.x += sprite->pos2.x;
     sprite->pos1.y += sprite->pos2.y;
     sprite->pos2.y = 0;
@@ -2502,7 +2502,7 @@ static void AnimPencil_Step(struct Sprite *sprite)
             sprite->pos1.y -= 1;
             sprite->data[2]++;
             if (sprite->data[2] % 10 == 0)
-                PlaySE12WithPanning(SE_W166, sprite->data[6]);
+                PlaySE12WithPanning(SE_M_SKETCH, sprite->data[6]);
         }
         sprite->data[4] += sprite->data[3];
         if (sprite->data[4] > 31)
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index afdc90049..bad46f144 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -1647,7 +1647,7 @@ static void AnimClappingHand_Step(struct Sprite *sprite)
             sprite->data[2]++;
             if (sprite->data[3] == 0)
             {
-                PlaySE1WithPanning(SE_W227, BattleAnimAdjustPanning(-64));
+                PlaySE1WithPanning(SE_M_ENCORE, BattleAnimAdjustPanning(-64));
             }
         }
     }
@@ -1931,7 +1931,7 @@ static void TormentAttacker_Step(u8 taskId)
 
         y = task->data[3] + task->data[5];
         spriteId = CreateSprite(&gThoughtBubbleSpriteTemplate, x, y, 6 - task->data[1]);
-        PlaySE12WithPanning(SE_W118, BattleAnimAdjustPanning(-64));
+        PlaySE12WithPanning(SE_M_METRONOME, BattleAnimAdjustPanning(-64));
 
         if (spriteId != MAX_SPRITES)
         {
@@ -2412,7 +2412,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
         gTasks[taskId].data[11] = gBattle_BG1_Y;
 
         gTasks[taskId].data[0]++;
-        PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(-64));
+        PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(-64));
         break;
     case 1:
         if (gTasks[taskId].data[4]++ > 0)
@@ -2447,7 +2447,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
         {
             gTasks[taskId].data[3] = 0;
             gTasks[taskId].data[0] = 1;
-            PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(-64));
+            PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(-64));
         }
         break;
     case 4:
@@ -4769,7 +4769,7 @@ static void AnimTask_MonToSubstituteDoll(u8 taskId)
 
         if (gSprites[spriteId].pos2.y == 0)
         {
-            PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64));
+            PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(-64));
             gTasks[taskId].data[10] -= 0x800;
             gTasks[taskId].data[0]++;
         }
@@ -4791,7 +4791,7 @@ static void AnimTask_MonToSubstituteDoll(u8 taskId)
 
         if (gSprites[spriteId].pos2.y == 0)
         {
-            PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(-64));
+            PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(-64));
             DestroyAnimVisualTask(taskId);
         }
         break;
@@ -4828,7 +4828,7 @@ static void AnimBlockX_Step(struct Sprite *sprite)
         sprite->pos2.y += 10;
         if (sprite->pos2.y >= 0)
         {
-            PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(63));
+            PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(63));
             sprite->pos2.y = 0;
             sprite->data[0]++;
         }
@@ -4838,7 +4838,7 @@ static void AnimBlockX_Step(struct Sprite *sprite)
         sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3);
         if (sprite->data[1] > 0x7F)
         {
-            PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(63));
+            PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(63));
             sprite->data[1] = 0;
             sprite->pos2.y = 0;
             sprite->data[0]++;
@@ -4857,7 +4857,7 @@ static void AnimBlockX_Step(struct Sprite *sprite)
     case 3:
         if (++sprite->data[1] > 8)
         {
-            PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(63));
+            PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(63));
             sprite->data[1] = 0;
             sprite->data[0]++;
         }
@@ -5152,7 +5152,7 @@ static void sub_815FE80(struct Sprite *sprite)
     case 0:
         if (gBattleAnimArgs[7] == -1)
         {
-            PlaySE12WithPanning(SE_W233, BattleAnimAdjustPanning(63));
+            PlaySE12WithPanning(SE_M_VITAL_THROW, BattleAnimAdjustPanning(63));
             sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16;
             sprite->data[0] = -32;
             sprite->data[7]++;
diff --git a/src/battle_anim_electric.c b/src/battle_anim_electric.c
index c153dbc10..a57e88b03 100644
--- a/src/battle_anim_electric.c
+++ b/src/battle_anim_electric.c
@@ -1242,7 +1242,7 @@ static bool8 sub_810B430(struct Task *task, u8 taskId)
     if (task->data[4] == 0 && task->data[5] > 0)
     {
         task->data[14] += task->data[15];
-        PlaySE12WithPanning(SE_W085, task->data[14]);
+        PlaySE12WithPanning(SE_M_THUNDERBOLT, task->data[14]);
     }
 
     if ((task->data[5] < 0 && task->data[7] <= task->data[8])
diff --git a/src/battle_anim_fire.c b/src/battle_anim_fire.c
index f02ecae19..c8402f727 100644
--- a/src/battle_anim_fire.c
+++ b/src/battle_anim_fire.c
@@ -1136,7 +1136,7 @@ static void AnimWillOWispOrb_Step(struct Sprite *sprite)
 
         if ((initialData5 == 0 || initialData5 > 196) && newData5 > 0 && sprite->data[7] == 0)
         {
-            PlaySE12WithPanning(SE_W172, gAnimCustomPanning);
+            PlaySE12WithPanning(SE_M_FLAME_WHEEL, gAnimCustomPanning);
         }
     }
     else
diff --git a/src/battle_anim_ghost.c b/src/battle_anim_ghost.c
index b8de6b0e1..632954351 100644
--- a/src/battle_anim_ghost.c
+++ b/src/battle_anim_ghost.c
@@ -252,7 +252,7 @@ static void AnimConfuseRayBallBounce_Step1(struct Sprite *sprite)
         return;
     if (r0 <= 0)
         return;
-    PlaySE12WithPanning(SE_W109, gAnimCustomPanning);
+    PlaySE12WithPanning(SE_M_CONFUSE_RAY, gAnimCustomPanning);
 }
 
 static void AnimConfuseRayBallBounce_Step2(struct Sprite *sprite)
@@ -271,7 +271,7 @@ static void AnimConfuseRayBallBounce_Step2(struct Sprite *sprite)
     if (r2 == 0 || r2 > 196)
     {
         if (r0 > 0)
-            PlaySE(SE_W109);
+            PlaySE(SE_M_CONFUSE_RAY);
     }
 
     if (sprite->data[6] == 0)
diff --git a/src/battle_anim_psychic.c b/src/battle_anim_psychic.c
index 25340f9c6..3f451998c 100644
--- a/src/battle_anim_psychic.c
+++ b/src/battle_anim_psychic.c
@@ -1137,7 +1137,7 @@ static void AnimPsychoBoost(struct Sprite *sprite)
     case 1:
         if (sprite->affineAnimEnded)
         {
-            PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(-64));
+            PlaySE12WithPanning(SE_M_TELEPORT, BattleAnimAdjustPanning(-64));
             ChangeSpriteAffineAnim(sprite, 1);
             sprite->data[0]++;
         }
diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c
index 436ac60a3..29ba49346 100644
--- a/src/battle_anim_rock.c
+++ b/src/battle_anim_rock.c
@@ -631,7 +631,7 @@ static void AnimTask_Rollout_Step(u8 taskId)
             task->data[0]++;
         }
 
-        PlaySE12WithPanning(SE_W029, task->data[13]);
+        PlaySE12WithPanning(SE_M_HEADBUTT, task->data[13]);
         break;
     case 1:
         if (--task->data[11] == 0)
@@ -661,7 +661,7 @@ static void AnimTask_Rollout_Step(u8 taskId)
             task->data[9] = 0;
             sub_8111214(task);
             task->data[13] += task->data[14];
-            PlaySE12WithPanning(SE_W091, task->data[13]);
+            PlaySE12WithPanning(SE_M_DIG, task->data[13]);
         }
 
         if (--task->data[8] == 0)
diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c
index bf0d1d438..3deb2065e 100755
--- a/src/battle_anim_special.c
+++ b/src/battle_anim_special.c
@@ -788,7 +788,7 @@ static void sub_8171030(u8 taskId)
 {
     if (gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].animCmdIndex == 1)
     {
-        PlaySE12WithPanning(SE_NAGERU, 0);
+        PlaySE12WithPanning(SE_BALL_THROW, 0);
         gSprites[gTasks[taskId].data[0]].callback = sub_8171104;
         CreateTask(sub_81710A8, 10);
         gTasks[taskId].func = sub_8170EF0;
@@ -873,7 +873,7 @@ static void sub_8171240(struct Sprite *sprite)
     taskId = sprite->data[5];
 
     if (++gTasks[taskId].data[1] == 11)
-        PlaySE(SE_SUIKOMU);
+        PlaySE(SE_BALL_TRADE);
 
     switch (gTasks[taskId].data[0])
     {
@@ -952,16 +952,16 @@ static void sub_81713D0(struct Sprite *sprite)
             switch (bounceCount)
             {
             case 1:
-                PlaySE(SE_KON);
+                PlaySE(SE_BALL_BOUNCE_1);
                 break;
             case 2:
-                PlaySE(SE_KON2);
+                PlaySE(SE_BALL_BOUNCE_2);
                 break;
             case 3:
-                PlaySE(SE_KON3);
+                PlaySE(SE_BALL_BOUNCE_3);
                 break;
             default:
-                PlaySE(SE_KON4);
+                PlaySE(SE_BALL_BOUNCE_4);
                 break;
             }
         }
@@ -1005,7 +1005,7 @@ static void sub_81714D4(struct Sprite *sprite)
         StartSpriteAffineAnim(sprite, 1);
         gBattleSpritesDataPtr->animationData->field_C = 0;
         sprite->callback = sub_8171520;
-        PlaySE(SE_BOWA);
+        PlaySE(SE_BALL);
     }
 }
 
@@ -1147,7 +1147,7 @@ static void sub_8171520(struct Sprite *sprite)
             else
                 StartSpriteAffineAnim(sprite, 1);
 
-            PlaySE(SE_BOWA);
+            PlaySE(SE_BALL);
         }
         break;
     }
@@ -1178,7 +1178,7 @@ static void sub_81717F8(struct Sprite *sprite)
     sprite->data[4]++;
     if (sprite->data[4] == 40)
     {
-        PlaySE(SE_RG_GETTING);
+        PlaySE(SE_RG_BALL_CLICK);
         BlendPalettes(0x10000 << sprite->oam.paletteNum, 6, RGB(0, 0, 0));
         sub_81719EC(sprite);
     }
@@ -1191,7 +1191,7 @@ static void sub_81717F8(struct Sprite *sprite)
         gDoingBattleAnim = 0;
         UpdateOamPriorityInAllHealthboxes(1);
         m4aMPlayAllStop();
-        PlaySE(MUS_RG_FAN6);
+        PlaySE(MUS_RG_CAUGHT_INTRO);
     }
     else if (sprite->data[4] == 315)
     {
@@ -1403,7 +1403,7 @@ u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId)
     gTasks[taskId].data[3] = priority;
     gTasks[taskId].data[4] = subpriority;
     gTasks[taskId].data[15] = ballId;
-    PlaySE(SE_BOWA2);
+    PlaySE(SE_BALL_OPEN);
 
     return taskId;
 }
@@ -2113,7 +2113,7 @@ static void sub_8172FEC(u8 taskId)
             else
                 pan = 63;
 
-            PlaySE12WithPanning(SE_REAPOKE, pan);
+            PlaySE12WithPanning(SE_SHINY, pan);
         }
     }
 
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c
index ab2f42264..9790cf9ea 100644
--- a/src/battle_anim_utility_funcs.c
+++ b/src/battle_anim_utility_funcs.c
@@ -535,9 +535,9 @@ static void sub_81170EC(u8 taskId)
     gTasks[taskId].func = sub_81172EC;
 
     if (sAnimStatsChangeData->data[0] == 0)
-        PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(-64));
+        PlaySE12WithPanning(SE_M_STAT_INCREASE, BattleAnimAdjustPanning2(-64));
     else
-        PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(-64));
+        PlaySE12WithPanning(SE_M_STAT_DECREASE, BattleAnimAdjustPanning2(-64));
 }
 
 static void sub_81172EC(u8 taskId)
diff --git a/src/battle_arena.c b/src/battle_arena.c
index 42a967fc6..0ffba4910 100644
--- a/src/battle_arena.c
+++ b/src/battle_arena.c
@@ -563,7 +563,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state)
         }
         break;
     case 4:
-        PlaySE(SE_HANTEI1);
+        PlaySE(SE_ARENA_TIMEUP1);
         ShowJudgmentSprite(80, 40, ARENA_CATEGORY_MIND, B_POSITION_PLAYER_LEFT);
         ShowJudgmentSprite(160, 40, ARENA_CATEGORY_MIND, B_POSITION_OPPONENT_LEFT);
         BattleStringExpandPlaceholdersToDisplayedString(gText_Judgement);
@@ -572,7 +572,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state)
         ret = 1;
         break;
     case 5:
-        PlaySE(SE_HANTEI1);
+        PlaySE(SE_ARENA_TIMEUP1);
         ShowJudgmentSprite(80, 56, ARENA_CATEGORY_SKILL, B_POSITION_PLAYER_LEFT);
         ShowJudgmentSprite(160, 56, ARENA_CATEGORY_SKILL, B_POSITION_OPPONENT_LEFT);
         BattleStringExpandPlaceholdersToDisplayedString(gText_Judgement);
@@ -581,7 +581,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state)
         ret = 1;
         break;
     case 6:
-        PlaySE(SE_HANTEI1);
+        PlaySE(SE_ARENA_TIMEUP1);
         ShowJudgmentSprite(80, 72, ARENA_CATEGORY_BODY, B_POSITION_PLAYER_LEFT);
         ShowJudgmentSprite(160, 72, ARENA_CATEGORY_BODY, B_POSITION_OPPONENT_LEFT);
         BattleStringExpandPlaceholdersToDisplayedString(gText_Judgement);
@@ -590,7 +590,7 @@ u8 BattleArena_ShowJudgmentWindow(u8 *state)
         ret = 1;
         break;
     case 7:
-        PlaySE(SE_HANTEI2);
+        PlaySE(SE_ARENA_TIMEUP2);
         if (gBattleTextBuff1[0] > gBattleTextBuff2[0])
         {
             ret = 2;
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 00c504bfd..7c9b05b25 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -1105,7 +1105,7 @@ void InitLinkBattleVsScreen(u8 taskId)
             if (gTasks[taskId].data[5] != 0)
                 DrawLinkBattleVsScreenOutcomeText();
 
-            PlaySE(SE_W231);
+            PlaySE(SE_M_HARDEN);
             DestroyTask(taskId);
             gSprites[gBattleStruct->linkBattleVsSpriteId_V].invisible = FALSE;
             gSprites[gBattleStruct->linkBattleVsSpriteId_S].invisible = FALSE;
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index ce22c605f..9bc4713cd 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -1357,7 +1357,7 @@ static void LinkOpponentHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
+            PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET);
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
             gBattlerControllerFuncs[gActiveBattler] = sub_8064C14;
         }
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index ece4c24bc..79f56aaed 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -1179,7 +1179,7 @@ static void LinkPartnerHandleFaintAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
-            PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
+            PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER);
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index daf2c260e..a82351ed7 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -1394,7 +1394,7 @@ static void OpponentHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
+            PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET);
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
             gBattlerControllerFuncs[gActiveBattler] = sub_805FAC4;
         }
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 08ce9f09c..259b20035 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -853,7 +853,7 @@ static void sub_80586F8(void)
     {
         if (gReceivedRemoteLinkPlayers == 0)
         {
-            m4aSongNumStop(SE_HINSI);
+            m4aSongNumStop(SE_LOW_HEALTH);
             gMain.inBattle = 0;
             gMain.callback1 = gPreBattleCallback1;
             SetMainCallback2(sub_8038D64);
@@ -866,7 +866,7 @@ static void sub_80586F8(void)
     {
         if (IsLinkTaskFinished())
         {
-            m4aSongNumStop(SE_HINSI);
+            m4aSongNumStop(SE_LOW_HEALTH);
             gMain.inBattle = 0;
             gMain.callback1 = gPreBattleCallback1;
             SetMainCallback2(sub_8038D64);
@@ -895,7 +895,7 @@ void sub_80587B0(void)
         }
         else
         {
-            m4aSongNumStop(SE_HINSI);
+            m4aSongNumStop(SE_LOW_HEALTH);
             gMain.inBattle = 0;
             gMain.callback1 = gPreBattleCallback1;
             SetMainCallback2(gMain.savedCallback);
@@ -2392,7 +2392,7 @@ static void PlayerHandleFaintAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
-            PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
+            PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER);
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 21c1fdd5b..fd6616746 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -1371,7 +1371,7 @@ static void PlayerPartnerHandleFaintAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
-            PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
+            PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER);
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 35383611b..92e8d2386 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -1284,7 +1284,7 @@ static void RecordedOpponentHandleFaintAnimation(void)
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
-            PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
+            PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET);
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
             gBattlerControllerFuncs[gActiveBattler] = sub_8186D58;
         }
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 5f3b3ea65..2362e3c84 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -1286,7 +1286,7 @@ static void RecordedPlayerHandleFaintAnimation(void)
         {
             gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
             HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
-            PlaySE12WithPanning(SE_POKE_DEAD, -64);
+            PlaySE12WithPanning(SE_FAINT, -64);
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
             gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
             gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 1638e2f57..b1bb61aaf 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -1055,7 +1055,7 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId)
         if (!gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong)
         {
             if (!gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong)
-                PlaySE(SE_HINSI);
+                PlaySE(SE_LOW_HEALTH);
             gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 1;
         }
     }
@@ -1064,12 +1064,12 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId)
         gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 0;
         if (!IsDoubleBattle())
         {
-            m4aSongNumStop(SE_HINSI);
+            m4aSongNumStop(SE_LOW_HEALTH);
             return;
         }
         if (IsDoubleBattle() && !gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong)
         {
-            m4aSongNumStop(SE_HINSI);
+            m4aSongNumStop(SE_LOW_HEALTH);
             return;
         }
     }
@@ -1083,7 +1083,7 @@ void BattleStopLowHpSound(void)
     if (IsDoubleBattle())
         gBattleSpritesDataPtr->battlerData[playerBattler ^ BIT_FLANK].lowHpSong = 0;
 
-    m4aSongNumStop(SE_HINSI);
+    m4aSongNumStop(SE_LOW_HEALTH);
 }
 
 u8 GetMonHPBarLevel(struct Pokemon *mon)
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 12273addb..719af6a06 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -1649,7 +1649,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
         gBattleSpritesDataPtr->animationData->field_9_x1C++;
     }
 
-    PlaySE12WithPanning(SE_TB_START, 0);
+    PlaySE12WithPanning(SE_BALL_TRAY_ENTER, 0);
     return taskId;
 }
 
@@ -1852,9 +1852,9 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite)
             pan = SOUND_PAN_ATTACKER;
 
         if (sprite->data[7] != 0)
-            PlaySE2WithPanning(SE_TB_KARA, pan);
+            PlaySE2WithPanning(SE_BALL_TRAY_EXIT, pan);
         else
-            PlaySE1WithPanning(SE_TB_KON, pan);
+            PlaySE1WithPanning(SE_BALL_TRAY_BALL, pan);
 
         sprite->callback = SpriteCallbackDummy;
     }
diff --git a/src/battle_main.c b/src/battle_main.c
index 03e958c61..935a53ffe 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -1869,7 +1869,7 @@ static void FreeRestoreBattleData(void)
     gScanlineEffect.state = 3;
     gMain.inBattle = 0;
     ZeroEnemyPartyMons();
-    m4aSongNumStop(SE_HINSI);
+    m4aSongNumStop(SE_LOW_HEALTH);
     FreeMonSpritesGfx();
     FreeBattleSpritesData();
     FreeBattleResources();
@@ -2114,7 +2114,7 @@ void sub_8038B74(struct Sprite *sprite)
 {
     StartSpriteAffineAnim(sprite, 1);
     sprite->callback = sub_8038B04;
-    PlaySE(SE_BT_START);
+    PlaySE(SE_MUGSHOT);
 }
 
 static void sub_8038B94(u8 taskId)
@@ -5010,9 +5010,9 @@ static void HandleEndTurn_BattleWon(void)
         gBattlescriptCurrInstr = BattleScript_FrontierTrainerBattleWon;
 
         if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN)
-            PlayBGM(MUS_KACHI3);
+            PlayBGM(MUS_VICTORY_GYM_LEADER);
         else
-            PlayBGM(MUS_KACHI1);
+            PlayBGM(MUS_VICTORY_TRAINER);
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK))
     {
@@ -5023,7 +5023,7 @@ static void HandleEndTurn_BattleWon(void)
         {
         case TRAINER_CLASS_ELITE_FOUR:
         case TRAINER_CLASS_CHAMPION:
-            PlayBGM(MUS_KACHI5);
+            PlayBGM(MUS_VICTORY_LEAGUE);
             break;
         case TRAINER_CLASS_TEAM_AQUA:
         case TRAINER_CLASS_TEAM_MAGMA:
@@ -5031,13 +5031,13 @@ static void HandleEndTurn_BattleWon(void)
         case TRAINER_CLASS_AQUA_LEADER:
         case TRAINER_CLASS_MAGMA_ADMIN:
         case TRAINER_CLASS_MAGMA_LEADER:
-            PlayBGM(MUS_KACHI4);
+            PlayBGM(MUS_VICTORY_AQUA_MAGMA);
             break;
         case TRAINER_CLASS_LEADER:
-            PlayBGM(MUS_KACHI3);
+            PlayBGM(MUS_VICTORY_GYM_LEADER);
             break;
         default:
-            PlayBGM(MUS_KACHI1);
+            PlayBGM(MUS_VICTORY_TRAINER);
             break;
         }
     }
@@ -5270,7 +5270,7 @@ static void ReturnFromBattleToOverworld(void)
             SetRoamerInactive();
     }
 
-    m4aSongNumStop(SE_HINSI);
+    m4aSongNumStop(SE_LOW_HEALTH);
     SetMainCallback2(gMain.savedCallback);
 }
 
@@ -5817,7 +5817,7 @@ static void HandleAction_GoNear(void)
 static void HandleAction_SafariZoneRun(void)
 {
     gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber];
-    PlaySE(SE_NIGERU);
+    PlaySE(SE_FLEE);
     gCurrentTurnActionNumber = gBattlersCount;
     gBattleOutcome = B_OUTCOME_RAN;
 }
diff --git a/src/battle_message.c b/src/battle_message.c
index 191fffb01..59ad0cee4 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -315,23 +315,23 @@ static const u8 sText_StatsWontIncrease2[] = _("{B_ATK_NAME_WITH_PREFIX}'s stats
 static const u8 sText_StatsWontDecrease2[] = _("{B_DEF_NAME_WITH_PREFIX}'s stats won't\ngo any lower!");
 static const u8 sText_CriticalHit[] = _("A critical hit!");
 static const u8 sText_OneHitKO[] = _("It's a one-hit KO!");
-static const u8 sText_123Poof[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_KON}Poof!\p");
+static const u8 sText_123Poof[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p");
 static const u8 sText_AndEllipsis[] = _("And…\p");
 static const u8 sText_HMMovesCantBeForgotten[] = _("HM moves can't be\nforgotten now.\p");
 static const u8 sText_NotVeryEffective[] = _("It's not very effective…");
 static const u8 sText_SuperEffective[] = _("It's super effective!");
-static const u8 sText_GotAwaySafely[] = _("{PLAY_SE SE_NIGERU}Got away safely!\p");
-static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE SE_NIGERU}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p");
-static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE SE_NIGERU}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p");
-static const u8 sText_WildPkmnFled[] = _("{PLAY_SE SE_NIGERU}Wild {B_BUFF1} fled!");
+static const u8 sText_GotAwaySafely[] = _("{PLAY_SE SE_FLEE}Got away safely!\p");
+static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE SE_FLEE}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p");
+static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE SE_FLEE}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p");
+static const u8 sText_WildPkmnFled[] = _("{PLAY_SE SE_FLEE}Wild {B_BUFF1} fled!");
 static const u8 sText_PlayerDefeatedLinkTrainer[] = _("Player defeated\n{B_LINK_OPPONENT1_NAME}!");
 static const u8 sText_TwoLinkTrainersDefeated[] = _("Player beat {B_LINK_OPPONENT1_NAME}\nand {B_LINK_OPPONENT2_NAME}!");
 static const u8 sText_PlayerLostAgainstLinkTrainer[] = _("Player lost against\n{B_LINK_OPPONENT1_NAME}!");
 static const u8 sText_PlayerLostToTwo[] = _("Player lost to {B_LINK_OPPONENT1_NAME}\nand {B_LINK_OPPONENT2_NAME}!");
 static const u8 sText_PlayerBattledToDrawLinkTrainer[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME}!");
 static const u8 sText_PlayerBattledToDrawVsTwo[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!");
-static const u8 sText_WildFled[] = _("{PLAY_SE SE_NIGERU}{B_LINK_OPPONENT1_NAME} fled!");
-static const u8 sText_TwoWildFled[] = _("{PLAY_SE SE_NIGERU}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!");
+static const u8 sText_WildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME} fled!");
+static const u8 sText_TwoWildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!");
 static const u8 sText_NoRunningFromTrainers[] = _("No! There's no running\nfrom a TRAINER battle!\p");
 static const u8 sText_CantEscape[] = _("Can't escape!\p");
 static const u8 sText_DontLeaveBirch[] = _("PROF. BIRCH: Don't leave me like this!\p");
@@ -381,7 +381,7 @@ static const u8 sText_PkmnCuriousAboutX[] = _("{B_OPPONENT_MON1_NAME} is curious
 static const u8 sText_PkmnEnthralledByX[] = _("{B_OPPONENT_MON1_NAME} is enthralled by\nthe {B_BUFF1}!");
 static const u8 sText_PkmnIgnoredX[] = _("{B_OPPONENT_MON1_NAME} completely ignored\nthe {B_BUFF1}!");
 static const u8 sText_ThrewPokeblockAtPkmn[] = _("{B_PLAYER_NAME} threw a {POKEBLOCK}\nat the {B_OPPONENT_MON1_NAME}!");
-static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE SE_PINPON}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p");
+static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE SE_DING_DONG}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p");
 static const u8 sText_OpponentMon1Appeared[] = _("{B_OPPONENT_MON1_NAME} appeared!\p");
 static const u8 sText_WildPkmnAppeared[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p");
 static const u8 sText_WildPkmnAppeared2[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p");
@@ -474,8 +474,8 @@ static const u8 sText_PkmnBrokeFree[] = _("Oh, no!\nThe POKéMON broke free!");
 static const u8 sText_ItAppearedCaught[] = _("Aww!\nIt appeared to be caught!");
 static const u8 sText_AarghAlmostHadIt[] = _("Aargh!\nAlmost had it!");
 static const u8 sText_ShootSoClose[] = _("Shoot!\nIt was so close, too!");
-static const u8 sText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_KACHI22}\p");
-static const u8 sText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_KACHI22}{PAUSE 127}");
+static const u8 sText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}\p");
+static const u8 sText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}{PAUSE 127}");
 static const u8 sText_GiveNicknameCaptured[] = _("Give a nickname to the\ncaptured {B_OPPONENT_MON1_NAME}?");
 static const u8 sText_PkmnSentToPC[] = _("{B_OPPONENT_MON1_NAME} was sent to\n{B_PC_CREATOR_NAME} PC.");
 static const u8 sText_Someones[] = _("someone's");
@@ -1346,7 +1346,7 @@ static const u8 sText_QuestionForfeitMatch[] = _("Would you like to forfeit the
 static const u8 sText_ForfeitedMatch[] = _("{B_PLAYER_NAME} forfeited the match!");
 static const u8 sText_Trainer1WinText[] = _("{B_TRAINER1_WIN_TEXT}");
 static const u8 sText_Trainer2WinText[] = _("{B_TRAINER2_WIN_TEXT}");
-static const u8 sText_Trainer1Fled[] = _( "{PLAY_SE SE_NIGERU}{B_TRAINER1_CLASS} {B_TRAINER1_NAME} fled!");
+static const u8 sText_Trainer1Fled[] = _( "{PLAY_SE SE_FLEE}{B_TRAINER1_CLASS} {B_TRAINER1_NAME} fled!");
 static const u8 sText_PlayerLostAgainstTrainer1[] = _("Player lost against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!");
 static const u8 sText_PlayerBattledToDrawTrainer1[] = _("Player battled to a draw against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!");
 const u8 gText_RecordBattleToPass[] = _("Would you like to record your battle\non your FRONTIER PASS?");
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index b2e02b287..a41d52845 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -1977,11 +1977,11 @@ static void Cmd_effectivenesssound(void)
         switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED)))
         {
         case MOVE_RESULT_SUPER_EFFECTIVE:
-            BtlController_EmitPlaySE(0, SE_KOUKA_H);
+            BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE);
             MarkBattlerForControllerExec(gActiveBattler);
             break;
         case MOVE_RESULT_NOT_VERY_EFFECTIVE:
-            BtlController_EmitPlaySE(0, SE_KOUKA_L);
+            BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE);
             MarkBattlerForControllerExec(gActiveBattler);
             break;
         case MOVE_RESULT_DOESNT_AFFECT_FOE:
@@ -1994,17 +1994,17 @@ static void Cmd_effectivenesssound(void)
         default:
             if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE)
             {
-                BtlController_EmitPlaySE(0, SE_KOUKA_H);
+                BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE);
                 MarkBattlerForControllerExec(gActiveBattler);
             }
             else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE)
             {
-                BtlController_EmitPlaySE(0, SE_KOUKA_L);
+                BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE);
                 MarkBattlerForControllerExec(gActiveBattler);
             }
             else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)))
             {
-                BtlController_EmitPlaySE(0, SE_KOUKA_M);
+                BtlController_EmitPlaySE(0, SE_EFFECTIVE);
                 MarkBattlerForControllerExec(gActiveBattler);
             }
             break;
@@ -3320,7 +3320,7 @@ static void Cmd_getexp(void)
                 if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gBattleMons[0].hp && !gBattleStruct->wildVictorySong)
                 {
                     BattleStopLowHpSound();
-                    PlayBGM(MUS_KACHI2);
+                    PlayBGM(MUS_VICTORY_WILD);
                     gBattleStruct->wildVictorySong++;
                 }
 
@@ -6428,7 +6428,7 @@ static void Cmd_various(void)
             gBattleOutcome = B_OUTCOME_MON_TELEPORTED;
         break;
     case VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC:
-        BtlController_EmitPlayFanfareOrBGM(0, MUS_KACHI1, TRUE);
+        BtlController_EmitPlayFanfareOrBGM(0, MUS_VICTORY_TRAINER, TRUE);
         MarkBattlerForControllerExec(gActiveBattler);
         break;
     }
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 0c0ef72d3..3c20d9ffe 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -518,22 +518,22 @@ void BattleSetup_StartLegendaryBattle(void)
     default:
     case SPECIES_GROUDON:
         gBattleTypeFlags |= BATTLE_TYPE_GROUDON;
-        CreateBattleStartTask(B_TRANSITION_GROUDON, MUS_BATTLE34);
+        CreateBattleStartTask(B_TRANSITION_GROUDON, MUS_VS_KYOGRE_GROUDON);
         break;
     case SPECIES_KYOGRE:
         gBattleTypeFlags |= BATTLE_TYPE_KYOGRE;
-        CreateBattleStartTask(B_TRANSITION_KYOGRE, MUS_BATTLE34);
+        CreateBattleStartTask(B_TRANSITION_KYOGRE, MUS_VS_KYOGRE_GROUDON);
         break;
     case SPECIES_RAYQUAZA:
         gBattleTypeFlags |= BATTLE_TYPE_RAYQUAZA;
-        CreateBattleStartTask(B_TRANSITION_RAYQUAZA, MUS_VS_REKKU);
+        CreateBattleStartTask(B_TRANSITION_RAYQUAZA, MUS_VS_RAYQUAZA);
         break;
     case SPECIES_DEOXYS:
-        CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_DEO);
+        CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_DEOXYS);
         break;
     case SPECIES_LUGIA:
     case SPECIES_HO_OH:
-        CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_DEN);
+        CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RG_VS_LEGEND);
         break;
     case SPECIES_MEW:
         CreateBattleStartTask(B_TRANSITION_GRID_SQUARES, MUS_VS_MEW);
@@ -553,9 +553,9 @@ void StartGroudonKyogreBattle(void)
     gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
 
     if (gGameVersion == VERSION_RUBY)
-        CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_BATTLE34); // GROUDON
+        CreateBattleStartTask(B_TRANSITION_SHARDS, MUS_VS_KYOGRE_GROUDON); // GROUDON
     else
-        CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_BATTLE34); // KYOGRE
+        CreateBattleStartTask(B_TRANSITION_RIPPLE, MUS_VS_KYOGRE_GROUDON); // KYOGRE
 
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
@@ -588,7 +588,7 @@ void StartRegiBattle(void)
         transitionId = B_TRANSITION_GRID_SQUARES;
         break;
     }
-    CreateBattleStartTask(transitionId, MUS_BATTLE36);
+    CreateBattleStartTask(transitionId, MUS_VS_REGI);
 
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
@@ -1454,46 +1454,46 @@ void SetUpTrainerEncounterMusic(void)
         switch (GetTrainerEncounterMusicId(trainerId))
         {
         case TRAINER_ENCOUNTER_MUSIC_MALE:
-            music = MUS_BOYEYE;
+            music = MUS_ENCOUNTER_MALE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_FEMALE:
-            music = MUS_GIRLEYE;
+            music = MUS_ENCOUNTER_FEMALE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_GIRL:
-            music = MUS_SYOUJOEYE;
+            music = MUS_ENCOUNTER_GIRL;
             break;
         case TRAINER_ENCOUNTER_MUSIC_INTENSE:
-            music = MUS_HAGESHII;
+            music = MUS_ENCOUNTER_INTENSE;
             break;
         case TRAINER_ENCOUNTER_MUSIC_COOL:
-            music = MUS_KAKKOII;
+            music = MUS_ENCOUNTER_COOL;
             break;
         case TRAINER_ENCOUNTER_MUSIC_AQUA:
-            music = MUS_AQA_0;
+            music = MUS_ENCOUNTER_AQUA;
             break;
         case TRAINER_ENCOUNTER_MUSIC_MAGMA:
-            music = MUS_MGM0;
+            music = MUS_ENCOUNTER_MAGMA;
             break;
         case TRAINER_ENCOUNTER_MUSIC_SWIMMER:
-            music = MUS_SWIMEYE;
+            music = MUS_ENCOUNTER_SWIMMER;
             break;
         case TRAINER_ENCOUNTER_MUSIC_TWINS:
-            music = MUS_HUTAGO;
+            music = MUS_ENCOUNTER_TWINS;
             break;
         case TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR:
-            music = MUS_SITENNOU;
+            music = MUS_ENCOUNTER_ELITE_FOUR;
             break;
         case TRAINER_ENCOUNTER_MUSIC_HIKER:
-            music = MUS_YAMA_EYE;
+            music = MUS_ENCOUNTER_HIKER;
             break;
         case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER:
-            music = MUS_INTER_V;
+            music = MUS_ENCOUNTER_INTERVIEWER;
             break;
         case TRAINER_ENCOUNTER_MUSIC_RICH:
-            music = MUS_TEST;
+            music = MUS_ENCOUNTER_RICH;
             break;
         default:
-            music = MUS_AYASII;
+            music = MUS_ENCOUNTER_SUSPICIOUS;
         }
         PlayNewMapMusic(music);
     }
diff --git a/src/battle_transition.c b/src/battle_transition.c
index b0cdbd93a..559279e74 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -2227,7 +2227,7 @@ static bool8 Phase2_Mugshot_Func4(struct Task *task)
     SetTrainerPicSlideTable(task->tPlayerSpriteId, 1);
     IncrementTrainerPicState(task->tOpponentSpriteId);
 
-    PlaySE(SE_BT_START);
+    PlaySE(SE_MUGSHOT);
 
     sTransitionStructPtr->VBlank_DMA++;
     return FALSE;
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 8d6f3a8fd..399a9e7b8 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -1058,7 +1058,7 @@ static void sub_807FD08(struct Sprite* sprite)
         if (++sprite->data[5] > 3)
             DestroySprite(sprite);
         else
-            PlaySE(SE_TB_KARA);
+            PlaySE(SE_BALL_TRAY_EXIT);
     }
     sprite->pos1.x = sprite->data[1];
     sprite->pos1.y = sprite->data[2];
@@ -1295,7 +1295,7 @@ static void sub_8080018(void)
         {
             sBerryBlenderData->mainState++;
             sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
-            PlaySE(SE_RU_HYUU);
+            PlaySE(SE_FALL);
             ShowBg(2);
         }
         break;
@@ -1310,7 +1310,7 @@ static void sub_8080018(void)
             sBerryBlenderData->field_11A = 0x100;
             sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]];
             sBerryBlenderData->framesToWait = 0;
-            PlaySE(SE_TRACK_DOOR);
+            PlaySE(SE_TRUCK_DOOR);
             sub_808074C();
             Blender_PrintPlayerNames();
         }
@@ -1582,7 +1582,7 @@ static void sub_80808D4(void)
     case 13:
         sBerryBlenderData->mainState++;
         sub_808074C();
-        PlaySE(SE_RU_HYUU);
+        PlaySE(SE_FALL);
         sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
         ShowBg(2);
         break;
@@ -1597,7 +1597,7 @@ static void sub_80808D4(void)
             sBerryBlenderData->arrowPos = sUnknown_083399DC[sUnknown_083399E4[sBerryBlenderData->playersNo - 2]];
             SetGpuRegBits(REG_OFFSET_BG2CNT, 2);
             sBerryBlenderData->framesToWait = 0;
-            PlaySE(SE_TRACK_DOOR);
+            PlaySE(SE_TRUCK_DOOR);
             Blender_PrintPlayerNames();
         }
         sub_8082CB4(&sBerryBlenderData->bgAffineSrc);
@@ -1648,7 +1648,7 @@ static void sub_80808D4(void)
             sBerryBlenderData->field_154 = GetCurrentMapMusic();
 
         PlayBGM(MUS_CYCLING);
-        PlaySE(SE_MOTER);
+        PlaySE(SE_BERRY_BLENDER);
         Blender_ControlHitPitch();
         break;
     }
@@ -1873,17 +1873,17 @@ static void sub_8081288(u16 a0, u8 a1)
     {
         StartSpriteAnim(&gSprites[spriteId], 2);
         gSprites[spriteId].callback = sub_8082F9C;
-        PlaySE(SE_RU_GASHIN);
+        PlaySE(SE_ICE_STAIRS);
     }
     else if (a0 == 0x5432)
     {
         StartSpriteAnim(&gSprites[spriteId], 0);
-        PlaySE(SE_SEIKAI);
+        PlaySE(SE_SUCCESS);
     }
     else if (a0 == 0x2345)
     {
         StartSpriteAnim(&gSprites[spriteId], 1);
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
     }
     sub_8082E84();
 }
@@ -3025,7 +3025,7 @@ static void sub_8083010(struct Sprite* sprite)
         {
             sprite->data[1] = 88;
             sprite->data[0]++;
-            PlaySE(SE_KON);
+            PlaySE(SE_BALL_BOUNCE_1);
         }
         break;
     case 1:
@@ -3567,7 +3567,7 @@ static void sub_8083F3C(u8 taskId)
 {
     if (gTasks[taskId].data[0] == 0)
     {
-        PlayFanfare(MUS_FANFA1);
+        PlayFanfare(MUS_LEVEL_UP);
         gTasks[taskId].data[0]++;
     }
     if (IsFanfareTaskInactive())
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 654a3b4e3..6269f0ad9 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -825,7 +825,7 @@ u32 sub_8020C0C(MainCallback callback)
     if (callback == CB2_ReturnToField)
     {
         gTextFlags.autoScroll = TRUE;
-        PlayNewMapMusic(MUS_POKECEN);
+        PlayNewMapMusic(MUS_POKE_CENTER);
         SetMainCallback1(CB1_Overworld);
     }
 
@@ -1344,9 +1344,9 @@ void sub_80216E0(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1)
         else
         {
             if (sp4 == 1)
-                PlaySE(SE_TOY_DANGO);
+                PlaySE(SE_MUD_BALL);
             else
-                PlaySE(SE_TOY_KABE);
+                PlaySE(SE_BREAKABLE_DOOR);
 
             arg0->unk25_2 = 1;
         }
@@ -2115,7 +2115,7 @@ static u32 sub_8022E5C(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1
     case 1:
         if (IsLinkTaskFinished())
         {
-            PlayNewMapMusic(MUS_RG_SLOT);
+            PlayNewMapMusic(MUS_RG_GAME_CORNER);
             sub_8022BEC(7, 1, NULL);
             r4->unk12 = 3;
             r4->unkC = 0;
@@ -2226,7 +2226,7 @@ static u32 sub_8023070(struct BerryCrushGame *r4,  __attribute__((unused)) u8 *r
     case 2:
         r4->unk138.unk38[r4->unk138.unk0]->callback = sub_8021608;
         r4->unk138.unk38[r4->unk138.unk0]->affineAnimPaused = FALSE;
-        PlaySE(SE_NAGERU);
+        PlaySE(SE_BALL_THROW);
         break;
     case 3:
         if (r4->unk138.unk38[r4->unk138.unk0]->callback == sub_8021608)
@@ -2252,7 +2252,7 @@ static u32 sub_8023070(struct BerryCrushGame *r4,  __attribute__((unused)) u8 *r
     case 6:
         if (!IsLinkTaskFinished())
             return 0;
-        PlaySE(SE_RU_HYUU);
+        PlaySE(SE_FALL);
         sub_8022BEC(11, 1, NULL);
         r4->unk12 = 5;
         r4->unkC = 0;
@@ -2274,7 +2274,7 @@ static u32 sub_80231B8(struct BerryCrushGame *r4,  __attribute__((unused)) u8 *r
         r4->unk138.unk1 = 4;
         r4->unk138.unk0 = 0;
         r4->unk138.unk2 = gUnknown_082F326C[r4->unk138.unk1][0];
-        PlaySE(SE_W070);
+        PlaySE(SE_M_STRENGTH);
         break;
     case 1:
         r4->unk2C = gUnknown_082F326C[r4->unk138.unk1][r4->unk138.unk0];
@@ -2667,7 +2667,7 @@ static u32 sub_8023A30(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r1
     {
     case 0:
         r4->unk12 = 8;
-        PlaySE(SE_W070);
+        PlaySE(SE_M_STRENGTH);
         BlendPalettes(0xFFFFFFFF, 8, RGB(31, 31, 0));
         r4->unk138.unk0 = 2;
         break;
@@ -2724,7 +2724,7 @@ static u32 sub_8023BC0(struct BerryCrushGame *r5, u8 *r6)
     {
     case 0:
         r5->unk12 = 9;
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         BlendPalettes(0xFFFFFFFF, 8, RGB(31, 0, 0));
         r5->unk138.unk0 = 4;
         break;
diff --git a/src/bike.c b/src/bike.c
index 5cdf066a9..c4964b627 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -659,7 +659,7 @@ static void AcroBikeTransition_SideJump(u8 direction)
         }
     }
     playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
-    PlaySE(SE_JITE_PYOKO);
+    PlaySE(SE_BIKE_HOP);
     playerObjEvent->facingDirectionLocked = 1;
     PlayerSetAnimId(GetJumpMovementAction(direction), 2);
 }
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 5dee9dd4b..a1ea44e26 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -93,7 +93,7 @@ void DoBrailleDigEffect(void)
     MapGridSetMetatileIdAt(17, 9, METATILE_Cave_SealedChamberEntrance_BottomMid);
     MapGridSetMetatileIdAt(18, 9, METATILE_Cave_SealedChamberEntrance_BottomRight | METATILE_COLLISION_MASK);
     DrawWholeMapView();
-    PlaySE(SE_BAN);
+    PlaySE(SE_BANG);
     FlagSet(FLAG_SYS_BRAILLE_DIG);
     ScriptContext2_Disable();
 }
@@ -140,7 +140,7 @@ void DoBrailleRegirockEffect(void)
     MapGridSetMetatileIdAt(15, 27, 563);
     MapGridSetMetatileIdAt(16, 27, 3636);
     DrawWholeMapView();
-    PlaySE(SE_BAN);
+    PlaySE(SE_BANG);
     FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED);
     ScriptContext2_Disable();
 }
@@ -186,7 +186,7 @@ void UseFlyAncientTomb_Finish(void)
     MapGridSetMetatileIdAt(15, 27, 563);
     MapGridSetMetatileIdAt(16, 27, 3636);
     DrawWholeMapView();
-    PlaySE(SE_BAN);
+    PlaySE(SE_BANG);
     FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED);
     ScriptContext2_Disable();
 }
@@ -286,7 +286,7 @@ void DoBrailleRegirockEffect(void)
     MapGridSetMetatileIdAt(15, 27, METATILE_Cave_SealedChamberEntrance_BottomMid);
     MapGridSetMetatileIdAt(16, 27, METATILE_Cave_SealedChamberEntrance_BottomRight | METATILE_COLLISION_MASK);
     DrawWholeMapView();
-    PlaySE(SE_BAN);
+    PlaySE(SE_BANG);
     FlagSet(FLAG_SYS_REGIROCK_PUZZLE_COMPLETED);
     ScriptContext2_Disable();
 }
@@ -325,7 +325,7 @@ void DoBrailleRegisteelEffect(void)
     MapGridSetMetatileIdAt(15, 27, METATILE_Cave_SealedChamberEntrance_BottomMid);
     MapGridSetMetatileIdAt(16, 27, METATILE_Cave_SealedChamberEntrance_BottomRight | METATILE_COLLISION_MASK);
     DrawWholeMapView();
-    PlaySE(SE_BAN);
+    PlaySE(SE_BANG);
     FlagSet(FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED);
     ScriptContext2_Disable();
 }
diff --git a/src/cable_car.c b/src/cable_car.c
index 94d9d0c66..fc161284f 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -343,7 +343,7 @@ static void CableCarMainCallback_Setup(void)
         break;
     case 8:
         BeginNormalPaletteFade(0xFFFFFFFF, 3, 16, 0, RGB(0, 0, 0));
-        FadeInNewBGM(MUS_ROPEWAY, 1);
+        FadeInNewBGM(MUS_CABLE_CAR, 1);
         sub_8150B6C(1);
         gMain.state++;
         break;
diff --git a/src/cable_club.c b/src/cable_club.c
index 982bd9fd3..93f87ec9b 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -865,9 +865,9 @@ static void Task_StartWiredCableClubBattle(u8 taskId)
         break;
     case 5:
         if (gLinkPlayers[0].trainerId & 1)
-            PlayMapChosenOrBattleBGM(MUS_BATTLE32);
+            PlayMapChosenOrBattleBGM(MUS_VS_GYM_LEADER);
         else
-            PlayMapChosenOrBattleBGM(MUS_BATTLE20);
+            PlayMapChosenOrBattleBGM(MUS_VS_TRAINER);
 
         SetLinkBattleTypeFlags(gSpecialVar_0x8004);
         CleanupOverworldWindowsAndTilemaps();
@@ -930,9 +930,9 @@ static void Task_StartWirelessCableClubBattle(u8 taskId)
         break;
     case 7:
         if (gLinkPlayers[0].trainerId & 1)
-            PlayMapChosenOrBattleBGM(MUS_BATTLE32);
+            PlayMapChosenOrBattleBGM(MUS_VS_GYM_LEADER);
         else
-            PlayMapChosenOrBattleBGM(MUS_BATTLE20);
+            PlayMapChosenOrBattleBGM(MUS_VS_TRAINER);
 
         gLinkPlayers[0].linkType = LINKTYPE_BATTLE;
         SetLinkBattleTypeFlags(gSpecialVar_0x8004);
diff --git a/src/contest.c b/src/contest.c
index 4470ec2a2..fbd42a007 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -1389,7 +1389,7 @@ static void Task_RaiseCurtainAtStart(u8 taskId)
         if (gTasks[taskId].data[1]++ <= 60)
             break;
         gTasks[taskId].data[1] = 0;
-        PlaySE12WithPanning(SE_C_MAKU_U, 0);
+        PlaySE12WithPanning(SE_CONTEST_CURTAIN_RISE, 0);
         gTasks[taskId].data[0]++;
         break;
     case 1:
@@ -1961,7 +1961,7 @@ static void Task_DoAppeals(u8 taskId)
         return;
     case APPEALSTATE_UPDATE_MOVE_USERS_STATUS:
         if (DrawStatusSymbol(contestant))
-            PlaySE(SE_C_PASI);
+            PlaySE(SE_CONTEST_ICON_CHANGE);
         gTasks[taskId].tState = APPEALSTATE_UPDATE_OPPONENTS;
         return;
     case APPEALSTATE_UPDATE_OPPONENTS:
@@ -2052,9 +2052,9 @@ static void Task_DoAppeals(u8 taskId)
                 break;
         }
         if (DrawStatusSymbol(i))
-            PlaySE(SE_C_PASI);
+            PlaySE(SE_CONTEST_ICON_CHANGE);
         else
-            PlaySE(SE_C_SYU);
+            PlaySE(SE_CONTEST_ICON_CLEAR);
         if (eContestantStatus[i].judgesAttentionWasRemoved)
         {
             StopFlashJudgeAttentionEye(i);
@@ -2243,7 +2243,7 @@ static void Task_DoAppeals(u8 taskId)
         {
         case 0:
             BlendAudienceBackground(-1, 1);
-            PlayFanfare(MUS_ME_ZANNEN);
+            PlayFanfare(MUS_TOO_BAD);
             gTasks[taskId].tCounter++;
             break;
         case 1:
@@ -2288,7 +2288,7 @@ static void Task_DoAppeals(u8 taskId)
             if (!eContest.waitForAudienceBlend)
             {
                 AnimateAudience();
-                PlaySE(SE_W227B);
+                PlaySE(SE_M_ENCORE2);
                 ShowAndUpdateApplauseMeter(1);
                 gTasks[taskId].tCounter++;
             }
@@ -2683,7 +2683,7 @@ static void Task_WaitForOutOfTimeMsg(u8 taskId)
         SetBgForCurtainDrop();
         gBattle_BG1_X = 0;
         gBattle_BG1_Y = 160;
-        PlaySE12WithPanning(SE_C_MAKU_D, 0);
+        PlaySE12WithPanning(SE_CONTEST_CURTAIN_FALL, 0);
         gTasks[taskId].data[0] = 0;
         gTasks[taskId].func = Task_DropCurtainAtAppealsEnd;
     }
@@ -3277,7 +3277,7 @@ static bool8 UpdateConditionStars(u8 contestantIdx, bool8 resetMod)
         ContestBG_FillBoxWithTile(0, GetStarTileOffset(), 19, contestantOffset, 1, numStars, 17);
         if (resetMod)
         {
-            PlaySE(SE_EXPMAX);
+            PlaySE(SE_EXP_MAX);
             eContestantStatus[contestantIdx].conditionMod = CONDITION_NO_CHANGE;
         }
     }
@@ -3286,7 +3286,7 @@ static bool8 UpdateConditionStars(u8 contestantIdx, bool8 resetMod)
         ContestBG_FillBoxWithTile(0, 0, 19, contestantOffset + numStars, 1, 3 - numStars, 17);
         if (resetMod)
         {
-            PlaySE(SE_FU_ZAKU2);
+            PlaySE(SE_CONTEST_CONDITION_LOSE);
             eContestantStatus[contestantIdx].conditionMod = CONDITION_NO_CHANGE;
         }
     }
@@ -3814,7 +3814,7 @@ static void Task_UpdateAppealHearts(u8 taskId)
         ContestBG_FillBoxWithTile(0, heartOffset, newNumHearts + 22, gContestantTurnOrder[contestant] * 5 + 2 + onSecondLine,  1, 1, 17);
         if (heartsDelta > 0)
         {
-            PlaySE(SE_C_GAJI);
+            PlaySE(SE_CONTEST_HEART);
             m4aMPlayImmInit(&gMPlayInfo_SE1);
             m4aMPlayPitchControl(&gMPlayInfo_SE1, 0xFFFF, pitchMod * 256);
         }
@@ -4189,7 +4189,7 @@ static void BlinkContestantBox(u8 spriteId, bool8 b)
     gSprites[spriteId].callback = SpriteCB_BlinkContestantBox;
     gSprites[spriteId2].callback = SpriteCallbackDummy;
     if (b == FALSE)
-        PlaySE(SE_C_PIKON);
+        PlaySE(SE_CONTEST_MONS_TURN);
     else
         PlaySE(SE_PC_LOGIN);
 }
@@ -4678,36 +4678,36 @@ static void DoJudgeSpeechBubble(u8 symbolId)
     case JUDGE_SYMBOL_SWIRL:
     case JUDGE_SYMBOL_SWIRL_UNUSED:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0];
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         break;
     case JUDGE_SYMBOL_ONE_EXCLAMATION:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 4;
-        PlaySE(SE_SEIKAI);
+        PlaySE(SE_SUCCESS);
         break;
     case JUDGE_SYMBOL_TWO_EXCLAMATIONS:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 8;
-        PlaySE(SE_SEIKAI);
+        PlaySE(SE_SUCCESS);
         break;
     case JUDGE_SYMBOL_NUMBER_ONE_UNUSED: // Identical to JUDGE_SYMBOL_NUMBER_ONE
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12;
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
         break;
     case JUDGE_SYMBOL_NUMBER_ONE:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 12;
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
         break;
     case JUDGE_SYMBOL_NUMBER_FOUR:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 16;
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
         break;
     case JUDGE_SYMBOL_STAR:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 24;
-        PlaySE(SE_W215);
+        PlaySE(SE_M_HEAL_BELL);
         break;
     case JUDGE_SYMBOL_QUESTION_MARK:
     default:
         gSprites[spriteId].oam.tileNum = gSprites[spriteId].data[0] + 20;
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
         break;
     }
     gSprites[spriteId].data[1] = 0;
@@ -5042,7 +5042,7 @@ static void DrawUnnervedSymbols(void)
             ContestBG_FillBoxWithIncrementingTile(0, symbolOffset, 20, contestantOffset, 2, 1, 17, 1);
             symbolOffset += 16;
             ContestBG_FillBoxWithIncrementingTile(0, symbolOffset, 20, contestantOffset + 1, 2, 1, 17, 1);
-            PlaySE(SE_C_PASI);
+            PlaySE(SE_CONTEST_ICON_CHANGE);
         }
     }
 }
@@ -5123,7 +5123,7 @@ static void Task_StartDropCurtainAtRoundEnd(u8 taskId)
 {
     gBattle_BG1_X = 0;
     gBattle_BG1_Y = DISPLAY_HEIGHT;
-    PlaySE12WithPanning(SE_C_MAKU_D, 0);
+    PlaySE12WithPanning(SE_CONTEST_CURTAIN_FALL, 0);
     gTasks[taskId].func = Task_UpdateCurtainDropAtRoundEnd;
 }
 
@@ -5235,7 +5235,7 @@ static void Task_StartRaiseCurtainAtRoundEnd(u8 taskId)
     else
     {
         gTasks[taskId].data[2] = 0;
-        PlaySE12WithPanning(SE_C_MAKU_U, 0);
+        PlaySE12WithPanning(SE_CONTEST_CURTAIN_RISE, 0);
         gTasks[taskId].func = Task_UpdateRaiseCurtainAtRoundEnd;
     }
 }
diff --git a/src/contest_util.c b/src/contest_util.c
index 00254248f..c60e885f2 100644
--- a/src/contest_util.c
+++ b/src/contest_util.c
@@ -533,7 +533,7 @@ static void CB2_StartShowContestResults(void)
     if (gLinkContestFlags & LINK_CONTEST_FLAG_IS_WIRELESS)
         gPaletteFade.bufferTransferDisabled = TRUE;
     else
-        PlayBGM(MUS_CON_K);
+        PlayBGM(MUS_CONTEST_RESULTS);
 
     SetVBlankCallback(VBlankCB_ShowContestResults);
 }
@@ -619,7 +619,7 @@ static void Task_ShowContestResults(u8 taskId)
         case 3:
             if (IsLinkTaskFinished() == TRUE)
             {
-                PlayBGM(MUS_CON_K);
+                PlayBGM(MUS_CONTEST_RESULTS);
                 gPaletteFade.bufferTransferDisabled = FALSE;
                 gTasks[taskId].tState++;
                 break;
@@ -1796,7 +1796,7 @@ static void Task_DrawFinalStandingNumber(u8 taskId)
             WriteSequenceToBgTilemapBuffer(2, firstTileNum + 0x10, 1, gTasks[taskId].tMonIndex * 3 + 6, 2, 1, 17, 1);
             sContestResults->data->numStandingsPrinted++;
             DestroyTask(taskId);
-            PlaySE(SE_JYUNI);
+            PlaySE(SE_CONTEST_PLACE);
         }
     }
 }
diff --git a/src/credits.c b/src/credits.c
index 8fc8a1f88..020221f30 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -1239,7 +1239,7 @@ void CB2_StartCreditsSequence(void)
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
     EnableInterrupts(INTR_FLAG_VBLANK);
     SetVBlankCallback(CreditsVBlankCallback);
-    m4aSongNumStart(MUS_THANKFOR);
+    m4aSongNumStart(MUS_CREDITS);
     SetMainCallback2(CB2_RunCreditsSequence);
     gUnknown_0203BCE5 = 0;
     sCreditsData = AllocZeroed(sizeof(struct CreditsData));
diff --git a/src/decoration.c b/src/decoration.c
index f566cc7c9..40cccbe5e 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1623,7 +1623,7 @@ static void AttemptPlaceDecoration_(u8 taskId)
     }
     else
     {
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         StringExpandPlaceholders(gStringVar4, gText_CantBePlacedHere);
         DisplayItemMessageOnField(taskId, gStringVar4, CantPlaceDecorationPrompt);
     }
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 41d8aa419..f44ecb31c 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -467,7 +467,7 @@ void StartDodrioBerryPicking(u16 a0, void (*callback)(void))
         sub_80273F0();
         sub_8026B5C(gUnknown_02022C98->unk24, &gUnknown_02022C98->unk44, &gUnknown_02022C98->unk48);
         StopMapMusic();
-        PlayNewMapMusic(MUS_RG_KINOMIKUI);
+        PlayNewMapMusic(MUS_RG_BERRY_PICK);
     }
     else
     {
@@ -877,7 +877,7 @@ static void sub_8025198(void)
         if (WaitFanfare(TRUE))
         {
             sub_8026240(6);
-            FadeOutAndPlayNewMapMusic(MUS_RG_WIN_YASEI, 4);
+            FadeOutAndPlayNewMapMusic(MUS_RG_VICTORY_WILD, 4);
         }
         break;
     }
@@ -916,7 +916,7 @@ static void sub_8025230(void)
         if (WaitFanfare(TRUE)) {
             gUnknown_02022C98->unk114 = gUnknown_02022C98->unk4A[gUnknown_02022C98->multiplayerId][5];
             sub_8026240(6);
-            FadeOutAndPlayNewMapMusic(MUS_RG_WIN_YASEI, 4);
+            FadeOutAndPlayNewMapMusic(MUS_RG_VICTORY_WILD, 4);
         }
         break;
     }
@@ -1174,7 +1174,7 @@ static void sub_8025758(void)
         gUnknown_02022C98->unk10++;
         break;
     case 4:
-        PlayNewMapMusic(MUS_RG_KINOMIKUI);
+        PlayNewMapMusic(MUS_RG_BERRY_PICK);
         sub_8028E4C();
         gUnknown_02022C98->unk10++;
         break;
@@ -1458,8 +1458,8 @@ static void sub_8025F48(void)
     {
         if (gUnknown_02022C98->unk144 == 0)
         {
-            m4aSongNumStop(SE_SEIKAI);
-            PlaySE(SE_SEIKAI);
+            m4aSongNumStop(SE_SUCCESS);
+            PlaySE(SE_SUCCESS);
             gUnknown_02022C98->unk144 = 1;
         }
     }
@@ -1480,7 +1480,7 @@ static void sub_8025F48(void)
     }
     else if (gUnknown_02022C98->unk154 == 1)
     {
-        PlayFanfareByFanfareNum(11); // MUS_ME_ZANNEN
+        PlayFanfareByFanfareNum(11); // MUS_TOO_BAD
         gUnknown_02022C98->unk154 = 2;
     }
 }
@@ -1501,8 +1501,8 @@ static void sub_8026044(void)
     {
         if (gUnknown_02022C98->unk144 == 0)
         {
-            m4aSongNumStop(SE_SEIKAI);
-            PlaySE(SE_SEIKAI);
+            m4aSongNumStop(SE_SUCCESS);
+            PlaySE(SE_SUCCESS);
             gUnknown_02022C98->unk144 = 1;
         }
     }
@@ -1522,7 +1522,7 @@ static void sub_8026044(void)
         {
             if (gUnknown_02022C98->unk148[r4] == 0)
             {
-                PlaySE(SE_FUUSEN1 + ptr->unk0[r4]);
+                PlaySE(SE_BALLOON_RED + ptr->unk0[r4]);
                 gUnknown_02022C98->unk148[r4] = 1;
             }
         }
@@ -1538,7 +1538,7 @@ static void sub_8026044(void)
     }
     else if (gUnknown_02022C98->unk154 == 1)
     {
-        PlayFanfareByFanfareNum(11); // MUS_ME_ZANNEN
+        PlayFanfareByFanfareNum(11); // MUS_TOO_BAD
         gUnknown_02022C98->unk154 = 2;
     }
 }
@@ -1792,7 +1792,7 @@ static void sub_802671C(void)
                 if (gUnknown_02022C98->unk148[i] == 0)
                 {
                     gUnknown_02022C98->unk148[i] = 1;
-                    PlaySE(SE_FUUSEN1 + ptr->unk32CC.unk14.unk0[i]);
+                    PlaySE(SE_BALLOON_RED + ptr->unk32CC.unk14.unk0[i]);
                 }
                 if (gUnknown_02022C98->unk40 < 10 || r10 == 1)
                 {
@@ -2359,19 +2359,19 @@ static void sub_8027554(void)
         {
             gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 = 2;
             gUnknown_02022C98->unkB0[gUnknown_02022C98->multiplayerId] = 6;
-            PlaySE(SE_W204);
+            PlaySE(SE_M_CHARM);
         }
         else if (gMain.newKeys & DPAD_LEFT)
         {
             gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 = 3;
             gUnknown_02022C98->unkB0[gUnknown_02022C98->multiplayerId] = 6;
-            PlaySE(SE_W204);
+            PlaySE(SE_M_CHARM);
         }
         else if (gMain.newKeys & DPAD_RIGHT)
         {
             gUnknown_02022C98->unk31A0[gUnknown_02022C98->multiplayerId].unk2C.unk0 = 1;
             gUnknown_02022C98->unkB0[gUnknown_02022C98->multiplayerId] = 6;
-            PlaySE(SE_W204);
+            PlaySE(SE_M_CHARM);
         }
         else
         {
@@ -3450,7 +3450,7 @@ static u32 sub_80285AC(struct Sprite *sprite)
     u8 mod = (++sprite->data[1] / 13) % 4;
 
     if (sprite->data[1] % 13 == 0 && mod != 0)
-        PlaySE(SE_W204);
+        PlaySE(SE_M_CHARM);
     if (sprite->data[1] >= 104)
     {
         sprite->data[0] = 0;
@@ -3567,7 +3567,7 @@ static bool32 sub_8028828(void)
                 continue;
             gUnknown_02022CF4->unkC[i] = 1;
             gUnknown_02022CF4->unk16[i] = -16;
-            PlaySE(SE_TK_KASYA);
+            PlaySE(SE_CLICK);
         }
         sprite->pos1.y += gUnknown_02022CF4->unk16[i];
     }
@@ -4320,7 +4320,7 @@ static void sub_802988C(void)
         }
         break;
     case 9:
-        PlayNewMapMusic(MUS_FANFA1);
+        PlayNewMapMusic(MUS_LEVEL_UP);
         FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[0], PIXEL_FILL(1));
         FillWindowPixelBuffer(gUnknown_02022CF8->unk3008[1], PIXEL_FILL(1));
         strWidth = GetStringWidth(1, gText_AnnouncingPrizes, -1);
@@ -4354,7 +4354,7 @@ static void sub_802988C(void)
             PutWindowTilemap(gUnknown_02022CF8->unk3008[1]);
         }
         CopyBgTilemapBufferToVram(0);
-        FadeOutAndFadeInNewMapMusic(MUS_RG_WIN_YASEI, 20, 10);
+        FadeOutAndFadeInNewMapMusic(MUS_RG_VICTORY_WILD, 20, 10);
         gUnknown_02022CF8->state++;
         break;
     case 11:
diff --git a/src/easy_chat.c b/src/easy_chat.c
index c839c0070..8e1044591 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -2023,7 +2023,7 @@ static int sub_811B368(void)
 {
     if (sEasyChatScreen->type == EASY_CHAT_TYPE_BARD_SONG)
     {
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         return 0;
     }
     else
@@ -2038,7 +2038,7 @@ static int sub_811B394(void)
     u16 easyChatWord = sub_811F578(sub_811B940());
     if (sub_811BF88(easyChatWord))
     {
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         return 0;
     }
     else
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 3ccc7ebf8..87f0a13fd 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -578,10 +578,10 @@ static void Task_EggHatchPlayBGM(u8 taskID)
         PlayRainStoppingSoundEffect();
     }
     if (gTasks[taskID].data[0] == 1)
-        PlayBGM(MUS_ME_SHINKA);
+        PlayBGM(MUS_EVOLUTION_INTRO);
     if (gTasks[taskID].data[0] > 60)
     {
-        PlayBGM(MUS_SHINKA);
+        PlayBGM(MUS_EVOLUTION);
         DestroyTask(taskID);
         // UB: task is destroyed, yet the value is incremented
     }
@@ -637,7 +637,7 @@ static void CB2_EggHatch_1(void)
         GetMonNickname2(&gPlayerParty[sEggHatchData->eggPartyID], gStringVar1);
         StringExpandPlaceholders(gStringVar4, gText_HatchedFromEgg);
         EggHatchPrintMessage(sEggHatchData->windowId, gStringVar4, 0, 3, 0xFF);
-        PlayFanfare(MUS_FANFA5);
+        PlayFanfare(MUS_EVOLVED);
         sEggHatchData->CB2_state++;
         PutWindowTilemap(sEggHatchData->windowId);
         CopyWindowToVram(sEggHatchData->windowId, 3);
@@ -716,7 +716,7 @@ static void SpriteCB_Egg_0(struct Sprite* sprite)
         sprite->pos2.x = Sin(sprite->data[1], 1);
         if (sprite->data[0] == 15)
         {
-            PlaySE(SE_BOWA);
+            PlaySE(SE_BALL);
             StartSpriteAnim(sprite, 1);
             CreateRandomEggShardSprite();
         }
@@ -739,7 +739,7 @@ static void SpriteCB_Egg_1(struct Sprite* sprite)
             sprite->pos2.x = Sin(sprite->data[1], 2);
             if (sprite->data[0] == 15)
             {
-                PlaySE(SE_BOWA);
+                PlaySE(SE_BALL);
                 StartSpriteAnim(sprite, 2);
             }
         }
@@ -766,13 +766,13 @@ static void SpriteCB_Egg_2(struct Sprite* sprite)
             sprite->pos2.x = Sin(sprite->data[1], 2);
             if (sprite->data[0] == 15)
             {
-                PlaySE(SE_BOWA);
+                PlaySE(SE_BALL);
                 StartSpriteAnim(sprite, 2);
                 CreateRandomEggShardSprite();
                 CreateRandomEggShardSprite();
             }
             if (sprite->data[0] == 30)
-                PlaySE(SE_BOWA);
+                PlaySE(SE_BALL);
         }
     }
 }
@@ -799,7 +799,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite)
     sprite->data[0]++;
     if (!gPaletteFade.active)
     {
-        PlaySE(SE_TAMAGO);
+        PlaySE(SE_EGG_HATCH);
         sprite->invisible = TRUE;
         sprite->callback = SpriteCB_Egg_5;
         sprite->data[0] = 0;
diff --git a/src/ereader_screen.c b/src/ereader_screen.c
index 823e03dd4..b4a9164b3 100755
--- a/src/ereader_screen.c
+++ b/src/ereader_screen.c
@@ -153,7 +153,7 @@ static u32 sub_81D4EE4(u8 *arg0, u16 *arg1)
     case 2:
         if (GetLinkPlayerCount_2() == 2)
         {
-            PlaySE(SE_PINPON);
+            PlaySE(SE_DING_DONG);
             CheckShouldAdvanceLinkState();
             *arg1 = 0;
             *arg0 = 3;
@@ -431,7 +431,7 @@ static void sub_81D5084(u8 taskId)
         if (sub_81D5064(&data->unk0, 120))
         {
             AddTextPrinterToWindow1(gJPText_NewTrainerHasComeToHoenn);
-            PlayFanfare(MUS_FANFA4);
+            PlayFanfare(MUS_OBTAIN_ITEM);
             data->unk8 = 19;
         }
         break;
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index 849c676b3..28bbd4ef7 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -271,7 +271,7 @@ static void EvoTask_BeginPreSet1_FadeAndPlaySE(u8 taskID)
     gTasks[taskID].tFrameCounter = 0;
     BeginNormalPaletteFade(3 << gTasks[taskID].data[1], 0xA, 0, 0x10, RGB_WHITE);
     gTasks[taskID].func = EvoTask_CreatePreEvoSparkleSet1;
-    PlaySE(SE_W025);
+    PlaySE(SE_M_MEGA_KICK);
 }
 
 static void EvoTask_CreatePreEvoSparkleSet1(u8 taskID)
@@ -311,7 +311,7 @@ static void EvoTask_BeginPreSparklesSet2(u8 taskID)
     SetEvoSparklesMatrices();
     gTasks[taskID].tFrameCounter = 0;
     gTasks[taskID].func = EvoTask_CreatePreEvoSparklesSet2;
-    PlaySE(SE_W062B);
+    PlaySE(SE_M_BUBBLE_BEAM2);
 }
 
 static void EvoTask_CreatePreEvoSparklesSet2(u8 taskID)
@@ -345,7 +345,7 @@ static void EvoTask_BeginPostSparklesSet1(u8 taskID)
     SetEvoSparklesMatrices();
     gTasks[taskID].tFrameCounter = 0;
     gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet1;
-    PlaySE(SE_REAPOKE);
+    PlaySE(SE_SHINY);
 }
 
 static void EvoTask_CreatePostEvoSparklesSet1(u8 taskID)
@@ -389,7 +389,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash(u8 taskID)
     CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30);
     BeginNormalPaletteFade(0xFFF9041C, 0, 0, 0x10, RGB_WHITE); // was 0xFFF9001C in R/S
     gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash;
-    PlaySE(SE_W080);
+    PlaySE(SE_M_PETAL_DANCE);
 }
 
 static void EvoTask_CreatePostEvoSparklesSet2_AndFlash(u8 taskID)
@@ -437,7 +437,7 @@ static void EvoTask_BeginPostSparklesSet2_AndFlash_Trade(u8 taskID)
     CpuSet(&gPlttBufferFaded[0x20], &gPlttBufferUnfaded[0x20], 0x30);
     BeginNormalPaletteFade(0xFFF90400, 0, 0, 0x10, RGB_WHITE); // was 0xFFFF0001 in R/S
     gTasks[taskID].func = EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade;
-    PlaySE(SE_W080);
+    PlaySE(SE_M_PETAL_DANCE);
 }
 
 static void EvoTask_CreatePostEvoSparklesSet2_AndFlash_Trade(u8 taskID)
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 019d48416..41d4900f7 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -630,14 +630,14 @@ static void Task_EvolutionScene(u8 taskID)
     case 3:
         if (EvoScene_IsMonAnimFinished(sEvoStructPtr->preEvoSpriteID)) // wait for animation, play tu du SE
         {
-            PlaySE(MUS_ME_SHINKA);
+            PlaySE(MUS_EVOLUTION_INTRO);
             gTasks[taskID].tState++;
         }
         break;
     case 4: // play evolution music and fade screen black
         if (!IsSEPlaying())
         {
-            PlayNewMapMusic(MUS_SHINKA);
+            PlayNewMapMusic(MUS_EVOLUTION);
             gTasks[taskID].tState++;
             BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK);
         }
@@ -713,7 +713,7 @@ static void Task_EvolutionScene(u8 taskID)
         {
             StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved);
             BattlePutTextOnWindow(gStringVar4, 0);
-            PlayBGM(MUS_FANFA5);
+            PlayBGM(MUS_EVOLVED);
             gTasks[taskID].tState++;
             SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskID].tPostEvoSpecies));
             CalculateMonStats(mon);
@@ -808,7 +808,7 @@ static void Task_EvolutionScene(u8 taskID)
         if (!IsTextPrinterActive(0) && !IsSEPlaying())
         {
             BufferMoveToLearnIntoBattleTextBuff2();
-            PlayFanfare(MUS_FANFA1);
+            PlayFanfare(MUS_LEVEL_UP);
             BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]);
             BattlePutTextOnWindow(gDisplayedStringBattle, 0);
             gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
@@ -998,15 +998,15 @@ static void Task_TradeEvolutionScene(u8 taskID)
     case 2:
         if (IsCryFinished())
         {
-            m4aSongNumStop(MUS_SHINKA);
-            PlaySE(MUS_ME_SHINKA);
+            m4aSongNumStop(MUS_EVOLUTION);
+            PlaySE(MUS_EVOLUTION_INTRO);
             gTasks[taskID].tState++;
         }
         break;
     case 3:
         if (!IsSEPlaying())
         {
-            PlayBGM(MUS_SHINKA);
+            PlayBGM(MUS_EVOLUTION);
             gTasks[taskID].tState++;
             BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK);
         }
@@ -1076,7 +1076,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         {
             StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved);
             DrawTextOnTradeWindow(0, gStringVar4, 1);
-            PlayFanfare(MUS_FANFA5);
+            PlayFanfare(MUS_EVOLVED);
             gTasks[taskID].tState++;
             SetMonData(mon, MON_DATA_SPECIES, (&gTasks[taskID].tPostEvoSpecies));
             CalculateMonStats(mon);
@@ -1109,7 +1109,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
             }
             else
             {
-                PlayBGM(MUS_SHINKA);
+                PlayBGM(MUS_EVOLUTION);
                 DrawTextOnTradeWindow(0, gText_CommunicationStandby5, 1);
                 gTasks[taskID].tState++;
             }
@@ -1153,7 +1153,7 @@ static void Task_TradeEvolutionScene(u8 taskID)
         if (!IsTextPrinterActive(0) && !IsSEPlaying())
         {
             BufferMoveToLearnIntoBattleTextBuff2();
-            PlayFanfare(MUS_FANFA1);
+            PlayFanfare(MUS_LEVEL_UP);
             BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]);
             DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1);
             gTasks[taskID].tLearnsFirstMove = 0x40; // re-used as a counter
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 3684b53e6..fab14c577 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -946,7 +946,7 @@ bool8 TryDoDiveWarp(struct MapPosition *position, u16 metatileBehavior)
         {
             StoreInitialPlayerAvatarState();
             DoDiveWarp();
-            PlaySE(SE_W291);
+            PlaySE(SE_M_DIVE);
             return TRUE;
         }
     }
@@ -956,7 +956,7 @@ bool8 TryDoDiveWarp(struct MapPosition *position, u16 metatileBehavior)
         {
             StoreInitialPlayerAvatarState();
             DoDiveWarp();
-            PlaySE(SE_W291);
+            PlaySE(SE_M_DIVE);
             return TRUE;
         }
     }
diff --git a/src/field_door.c b/src/field_door.c
index e81c3dc4b..4dcb07cca 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -526,9 +526,9 @@ u32 GetDoorSoundEffect(u32 x, u32 y)
     if (sound == DOOR_SOUND_NORMAL)
         return SE_DOOR;
     else if (sound == DOOR_SOUND_SLIDING)
-        return SE_JIDO_DOA;
+        return SE_SLIDING_DOOR;
     else if (sound == DOOR_SOUND_ARENA)
-        return SE_TU_SAA;
+        return SE_REPEL;
     else
         return SE_DOOR;
 }
diff --git a/src/field_effect.c b/src/field_effect.c
index 582551a7e..b64902c0e 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1141,7 +1141,7 @@ static void PokeballGlowEffect_PlaceBalls(struct Sprite *sprite)
         gSprites[spriteId].sEffectSpriteId = sprite->sSpriteId;
         sprite->sCounter++;
         sprite->sNumMons--;
-        PlaySE(SE_BOWA);
+        PlaySE(SE_BALL);
     }
     if (sprite->sNumMons == 0)
     {
@@ -1160,7 +1160,7 @@ static void PokeballGlowEffect_TryPlaySe(struct Sprite *sprite)
         sprite->data[3] = 0;
         if (sprite->sPlayHealSe)
         {
-            PlayFanfare(MUS_ME_ASA);
+            PlayFanfare(MUS_HEAL);
         }
     }
 }
@@ -1464,7 +1464,7 @@ static bool8 FallWarpEffect_StartFall(struct Task *task)
     task->tFallOffset = 1;
     task->tTotalFall = 0;
     gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE;
-    PlaySE(SE_RU_HYUU);
+    PlaySE(SE_FALL);
     task->tState++;
     return FALSE;
 }
@@ -1493,7 +1493,7 @@ static bool8 FallWarpEffect_Fall(struct Task *task)
     }
     if (sprite->pos2.y >= 0)
     {
-        PlaySE(SE_W070);
+        PlaySE(SE_M_STRENGTH);
         objectEvent->triggerGroundEffectsOnStop = 1;
         objectEvent->landingJump = 1;
         sprite->pos2.y = 0;
@@ -1589,7 +1589,7 @@ static bool8 EscalatorWarpOut_WaitForPlayer(struct Task *task)
         {
             task->tState = 4; // jump to EscalatorWarpOut_Down_Ride
         }
-        PlaySE(SE_ESUKA);
+        PlaySE(SE_ESCALATOR);
     }
     return FALSE;
 }
@@ -1978,7 +1978,7 @@ static bool8 LavaridgeGymB1FWarpEffect_Launch(struct Task *task, struct ObjectEv
     gFieldEffectArguments[2] = sprite->subpriority - 1;
     gFieldEffectArguments[3] = sprite->oam.priority;
     FieldEffectStart(FLDEFF_ASH_LAUNCH);
-    PlaySE(SE_W153);
+    PlaySE(SE_M_EXPLOSION);
     task->data[0]++;
     return TRUE;
 }
@@ -2092,7 +2092,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_PopOut(struct Task *task, struct Obje
         task->data[0]++;
         objectEvent->invisible = FALSE;
         CameraObjectReset1();
-        PlaySE(SE_W091);
+        PlaySE(SE_M_DIG);
         ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST));
     }
     return FALSE;
@@ -2163,7 +2163,7 @@ static bool8 LavaridgeGym1FWarpEffect_AshPuff(struct Task *task, struct ObjectEv
         {
             task->data[1]++;
             ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastestMovementAction(objectEvent->facingDirection));
-            PlaySE(SE_FU_ZUZUZU);
+            PlaySE(SE_LAVARIDGE_FALL_WARP);
         }
     }
     return FALSE;
@@ -2381,7 +2381,7 @@ static void TeleportWarpOutFieldEffect_SpinGround(struct Task *task)
         task->data[1] = 4;
         task->data[2] = 8;
         task->data[3] = 1;
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
     }
 }
 
@@ -2472,7 +2472,7 @@ static void TeleportWarpInFieldEffect_Init(struct Task *task)
         task->data[2] = 1;
         task->data[14] = sprite->subspriteMode;
         task->data[15] = GetPlayerFacingDirection();
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
     }
 }
 
@@ -2974,7 +2974,7 @@ u8 FldEff_UseSurf(void)
     u8 taskId = CreateTask(Task_SurfFieldEffect, 0xff);
     gTasks[taskId].tMonId = gFieldEffectArguments[0];
     Overworld_ClearSavedMusic();
-    Overworld_ChangeMusicTo(MUS_NAMINORI);
+    Overworld_ChangeMusicTo(MUS_SURF);
     return FALSE;
 }
 
@@ -3111,7 +3111,7 @@ u8 FldEff_NPCFlyOut(void)
     sprite->oam.priority = 1;
     sprite->callback = SpriteCB_NPCFlyOut;
     sprite->data[1] = gFieldEffectArguments[0];
-    PlaySE(SE_W019);
+    PlaySE(SE_M_FLY);
     return spriteId;
 }
 
@@ -3228,7 +3228,7 @@ static void FlyOutFieldEffect_BirdSwoopDown(struct Task *task)
     if ((task->tTimer == 0 || (--task->tTimer) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
         task->tState++;
-        PlaySE(SE_W019);
+        PlaySE(SE_M_FLY);
         StartFlyBirdSwoopDown(task->tBirdSpriteId);
     }
 }
@@ -3692,7 +3692,7 @@ static void Task_DestroyDeoxysRock(u8 taskId)
 static void DestroyDeoxysRockEffect_CameraShake(s16* data, u8 taskId)
 {
     u8 newTaskId = CreateTask(Task_DeoxysRockCameraShake, 90);
-    PlaySE(SE_T_KAMI2);
+    PlaySE(SE_THUNDER2);
     tCameraTaskId = newTaskId;
     tState++;
 }
@@ -3706,7 +3706,7 @@ static void DestroyDeoxysRockEffect_RockFragments(s16* data, u8 taskId)
         BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE);
         BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE);
         CreateDeoxysRockFragments(sprite);
-        PlaySE(SE_T_KAMI);
+        PlaySE(SE_THUNDER);
         StartEndingDeoxysRockCameraShake(tCameraTaskId);
         tTimer = 0;
         tState++;
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 6929485c4..886e023d1 100755
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -623,7 +623,7 @@ u32 FldEff_Splash(void)
         sprite->data[1] = gFieldEffectArguments[1];
         sprite->data[2] = gFieldEffectArguments[2];
         sprite->pos2.y = (graphicsInfo->height >> 1) - 4;
-        PlaySE(SE_MIZU);
+        PlaySE(SE_PUDDLE);
     }
     return 0;
 }
@@ -733,7 +733,7 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite)
             sprite->data[4] = objectEvent->currentCoords.y;
             if (!sprite->invisible)
             {
-                PlaySE(SE_MIZU);
+                PlaySE(SE_PUDDLE);
             }
         }
     }
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 6ad92c2fb..5fab2489b 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -1021,7 +1021,7 @@ void PlayerTurnInPlace(u8 direction)
 
 void PlayerJumpLedge(u8 direction)
 {
-    PlaySE(SE_DANSA);
+    PlaySE(SE_LEDGE);
     PlayerSetAnimId(GetJump2MovementAction(direction), 8);
 }
 
@@ -1055,28 +1055,28 @@ void PlayerEndWheelie(u8 direction)
 // wheelie hopping standing
 void PlayerStandingHoppingWheelie(u8 a)
 {
-    PlaySE(SE_JITE_PYOKO);
+    PlaySE(SE_BIKE_HOP);
     PlayerSetAnimId(GetAcroWheelieHopFaceDirectionMovementAction(a), 1);
 }
 
 // wheelie hopping moving
 void PlayerMovingHoppingWheelie(u8 a)
 {
-    PlaySE(SE_JITE_PYOKO);
+    PlaySE(SE_BIKE_HOP);
     PlayerSetAnimId(GetAcroWheelieHopDirectionMovementAction(a), 2);
 }
 
 // wheelie hopping ledge
 void PlayerLedgeHoppingWheelie(u8 a)
 {
-    PlaySE(SE_JITE_PYOKO);
+    PlaySE(SE_BIKE_HOP);
     PlayerSetAnimId(GetAcroWheelieJumpDirectionMovementAction(a), 8);
 }
 
 // acro turn jump
 void PlayerAcroTurnJump(u8 direction)
 {
-    PlaySE(SE_JITE_PYOKO);
+    PlaySE(SE_BIKE_HOP);
     PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1);
 }
 
@@ -1501,7 +1501,7 @@ static bool8 PushBoulder_Move(struct Task *task, struct ObjectEvent *playerObjec
         gFieldEffectArguments[2] = strengthObject->previousElevation;
         gFieldEffectArguments[3] = gSprites[strengthObject->spriteId].oam.priority;
         FieldEffectStart(FLDEFF_DUST);
-        PlaySE(SE_W070);
+        PlaySE(SE_M_STRENGTH);
         task->data[0]++;
     }
     return FALSE;
@@ -1540,7 +1540,7 @@ static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent
     gPlayerAvatar.preventStep = TRUE;
     if (ObjectEventClearHeldMovementIfFinished(objectEvent))
     {
-        PlaySE(SE_DANSA);
+        PlaySE(SE_LEDGE);
         ObjectEventSetHeldMovement(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection));
         task->data[1]++;
         if (task->data[1] > 1)
@@ -1574,7 +1574,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct Objec
     task->data[1] = objectEvent->movementDirection;
     gPlayerAvatar.preventStep = TRUE;
     ScriptContext2_Enable();
-    PlaySE(SE_TK_WARPIN);
+    PlaySE(SE_WARP_IN);
     return TRUE;
 }
 
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 92ee8cad3..9becd2166 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -299,7 +299,7 @@ static void FieldCB_TeleportTileWarpExit(void)
 {
     Overworld_PlaySpecialMapMusic();
     WarpFadeInScreen();
-    PlaySE(SE_TK_WARPOUT);
+    PlaySE(SE_WARP_OUT);
     CreateTask(Task_TeleportTileWarpExit, 10);
     ScriptContext2_Enable();
 }
@@ -308,7 +308,7 @@ static void FieldCB_MossdeepGymWarpExit(void)
 {
     Overworld_PlaySpecialMapMusic();
     WarpFadeInScreen();
-    PlaySE(SE_TK_WARPOUT);
+    PlaySE(SE_WARP_OUT);
     CreateTask(Task_ExitNonDoor, 10);
     ScriptContext2_Enable();
     SetObjectEventLoadFlag((~SKIP_OBJECT_EVENT_LOAD) & 0xF);
@@ -487,7 +487,7 @@ void DoWarp(void)
     TryFadeOutOldMapMusic();
     WarpFadeOutScreen();
     PlayRainStoppingSoundEffect();
-    PlaySE(SE_KAIDAN);
+    PlaySE(SE_EXIT);
     gFieldCallback = FieldCB_DefaultWarpExit;
     CreateTask(Task_WarpAndLoadMap, 10);
 }
@@ -549,7 +549,7 @@ void DoTeleportTileWarp(void)
     ScriptContext2_Enable();
     TryFadeOutOldMapMusic();
     WarpFadeOutScreen();
-    PlaySE(SE_TK_WARPIN);
+    PlaySE(SE_WARP_IN);
     CreateTask(Task_WarpAndLoadMap, 10);
     gFieldCallback = FieldCB_TeleportTileWarpExit;
 }
@@ -561,7 +561,7 @@ void DoMossdeepGymWarp(void)
     SaveObjectEvents();
     TryFadeOutOldMapMusic();
     WarpFadeOutScreen();
-    PlaySE(SE_TK_WARPIN);
+    PlaySE(SE_WARP_IN);
     CreateTask(Task_WarpAndLoadMap, 10);
     gFieldCallback = FieldCB_MossdeepGymWarpExit;
 }
@@ -605,7 +605,7 @@ void DoCableClubWarp(void)
     ScriptContext2_Enable();
     TryFadeOutOldMapMusic();
     WarpFadeOutScreen();
-    PlaySE(SE_KAIDAN);
+    PlaySE(SE_EXIT);
     CreateTask(Task_DoCableClubWarp, 10);
 }
 
@@ -619,7 +619,7 @@ static void Task_ReturnToWorldFromLinkRoom(u8 taskId)
         ClearLinkCallback_2();
         FadeScreen(FADE_TO_BLACK, 0);
         TryFadeOutOldMapMusic();
-        PlaySE(SE_KAIDAN);
+        PlaySE(SE_EXIT);
         data[0]++;
         break;
     case 1:
@@ -760,7 +760,7 @@ void DoContestHallWarp(void)
     TryFadeOutOldMapMusic();
     WarpFadeOutScreen();
     PlayRainStoppingSoundEffect();
-    PlaySE(SE_KAIDAN);
+    PlaySE(SE_EXIT);
     gFieldCallback = FieldCB_WarpExitFadeFromBlack;
     CreateTask(Task_DoContestHallWarp, 10);
 }
@@ -1028,7 +1028,7 @@ static void sub_80B01BC(u8 taskId)
     case 0:
         FreezeObjectEvents();
         ScriptContext2_Enable();
-        PlaySE(SE_TK_WARPIN);
+        PlaySE(SE_WARP_IN);
         sub_808D1C8();
         task->data[0]++;
         break;
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index bb8e8b1d9..bd6c833af 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -171,7 +171,7 @@ void Task_HandleTruckSequence(u8 taskId)
             data[1] = 0; // reset the timer.
             data[2] = CreateTask(Task_Truck1, 0xA);
             data[0] = 1; // run the next case.
-            PlaySE(SE_TRACK_MOVE);
+            PlaySE(SE_TRUCK_MOVE);
         }
         break;
     case 1:
@@ -191,7 +191,7 @@ void Task_HandleTruckSequence(u8 taskId)
             DestroyTask(data[2]);
             data[3] = CreateTask(Task_Truck2, 0xA);
             data[0] = 3;
-            PlaySE(SE_TRACK_STOP);
+            PlaySE(SE_TRUCK_STOP);
         }
         break;
     case 3:
@@ -206,7 +206,7 @@ void Task_HandleTruckSequence(u8 taskId)
         data[1]++;
         if (data[1] == 90)
         {
-            PlaySE(SE_TRACK_HAIKI);
+            PlaySE(SE_TRUCK_UNLOAD);
             data[1] = 0;
             data[0] = 5;
         }
@@ -219,7 +219,7 @@ void Task_HandleTruckSequence(u8 taskId)
             MapGridSetMetatileIdAt(11, 9, METATILE_InsideOfTruck_ExitLight_Mid);
             MapGridSetMetatileIdAt(11, 10, METATILE_InsideOfTruck_ExitLight_Bottom);
             DrawWholeMapView();
-            PlaySE(SE_TRACK_DOOR);
+            PlaySE(SE_TRUCK_DOOR);
             DestroyTask(taskId);
             ScriptContext2_Disable();
         }
diff --git a/src/field_specials.c b/src/field_specials.c
index 7c6ef37d7..c1fc92dbe 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -827,7 +827,7 @@ void PetalburgGymSlideOpenRoomDoors(void)
 {
     sSlidingDoorNextFrameCounter = 0;
     sSlidingDoorFrame = 0;
-    PlaySE(SE_KI_GASYAN);
+    PlaySE(SE_UNLOCK);
     CreateTask(Task_PetalburgGymSlideOpenRoomDoors, 8);
 }
 
@@ -1509,7 +1509,7 @@ void ShakeCamera(void)
     gTasks[taskId].delay = gSpecialVar_0x8007;
     gTasks[taskId].verticalPan = gSpecialVar_0x8004;
     SetCameraPanningCallback(NULL);
-    PlaySE(SE_W070);
+    PlaySE(SE_M_STRENGTH);
 }
 
 static void Task_ShakeCamera(u8 taskId)
@@ -1880,7 +1880,7 @@ void MoveElevator(void)
 
     SetCameraPanningCallback(NULL);
     MoveElevatorWindowLights(floorDelta, data[6]);
-    PlaySE(SE_ELEBETA);
+    PlaySE(SE_ELEVATOR);
 }
 
 static void Task_MoveElevator(u8 taskId)
@@ -1897,7 +1897,7 @@ static void Task_MoveElevator(u8 taskId)
         // arrived at floor
         if (data[2] == data[5])
         {
-            PlaySE(SE_PINPON);
+            PlaySE(SE_DING_DONG);
             DestroyTask(taskId);
             EnableBothScriptContexts();
             InstallCameraPanAheadCallback();
@@ -3438,9 +3438,9 @@ static void ChangeDeoxysRockLevel(u8 rockLevel)
     TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId);
 
     if (rockLevel == 0)
-        PlaySE(SE_W109);
+        PlaySE(SE_M_CONFUSE_RAY);
     else
-        PlaySE(SE_RG_DEOMOV);
+        PlaySE(SE_RG_DEOXYS_MOVE);
 
     CreateTask(WaitForDeoxysRockMovement, 8);
     gFieldEffectArguments[0] = 1;
@@ -3904,7 +3904,7 @@ void Script_DoRayquazaScene(void)
 void LoopWingFlapSE(void)
 {
     CreateTask(Task_LoopWingFlapSE, 8);
-    PlaySE(SE_W017);
+    PlaySE(SE_M_WING_ATTACK);
 }
 
 static void Task_LoopWingFlapSE(u8 taskId)
@@ -3916,7 +3916,7 @@ static void Task_LoopWingFlapSE(u8 taskId)
     {
         playCount++;
         delay = 0;
-        PlaySE(SE_W017);
+        PlaySE(SE_M_WING_ATTACK);
     }
 
     if (playCount == gSpecialVar_0x8004 - 1)
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 49b6fbdd8..91b4558d5 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -357,7 +357,7 @@ static void PacifidlogBridgePerStepCallback(u8 taskId)
                 data[2] = x;
                 data[3] = y;
                 if (MetatileBehavior_IsPacifidlogLog(MapGridGetMetatileBehaviorAt(x, y)))
-                    PlaySE(SE_MIZU);
+                    PlaySE(SE_PUDDLE);
             }
             break;
         case 2:
@@ -443,7 +443,7 @@ static void FortreeBridgePerStepCallback(u8 taskId)
                 flag = 1;
 
             if (flag && (isFortreeBridgeCur == 1 || isFortreeBridgePrev == 1))
-                PlaySE(SE_HASHI);
+                PlaySE(SE_BRIDGE_WALK);
 
             if (isFortreeBridgePrev)
             {
@@ -583,7 +583,7 @@ static void SootopolisGymIcePerStepCallback(u8 taskId)
             {
                 x = data[4];
                 y = data[5];
-                PlaySE(SE_RU_BARI);
+                PlaySE(SE_ICE_CRACK);
                 MapGridSetMetatileIdAt(x, y, METATILE_SootopolisGym_Ice_Cracked);
                 CurrentMapDrawMetatileAt(x, y);
                 MarkIcePuzzleCoordVisited(x - 7, y - 7);
@@ -599,7 +599,7 @@ static void SootopolisGymIcePerStepCallback(u8 taskId)
             {
                 x = data[4];
                 y = data[5];
-                PlaySE(SE_RU_GASYAN);
+                PlaySE(SE_ICE_BREAK);
                 MapGridSetMetatileIdAt(x, y, METATILE_SootopolisGym_Ice_Broken);
                 CurrentMapDrawMetatileAt(x, y);
                 data[1] = 1;
diff --git a/src/field_weather.c b/src/field_weather.c
index 684a86479..25ee0582a 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -1038,13 +1038,13 @@ void SetRainStrengthFromSoundEffect(u16 soundEffect)
     {
         switch (soundEffect)
         {
-        case SE_T_KOAME:
+        case SE_RAIN:
             gWeatherPtr->rainStrength = 0;
             break;
-        case SE_T_OOAME:
+        case SE_DOWNPOUR:
             gWeatherPtr->rainStrength = 1;
             break;
-        case SE_T_AME:
+        case SE_THUNDERSTORM:
             gWeatherPtr->rainStrength = 2;
             break;
         default:
@@ -1062,14 +1062,14 @@ void PlayRainStoppingSoundEffect(void)
         switch (gWeatherPtr->rainStrength)
         {
         case 0:
-            PlaySE(SE_T_KOAME_E);
+            PlaySE(SE_RAIN_STOP);
             break;
         case 1:
-            PlaySE(SE_T_OOAME_E);
+            PlaySE(SE_DOWNPOUR_STOP);
             break;
         case 2:
         default:
-            PlaySE(SE_T_AME_E);
+            PlaySE(SE_THUNDERSTORM_STOP);
             break;
         }
     }
diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c
index 26a7adf27..320a10670 100644
--- a/src/field_weather_effect.c
+++ b/src/field_weather_effect.c
@@ -479,7 +479,7 @@ void Rain_InitVars(void)
     gWeatherPtr->targetRainSpriteCount = 10;
     gWeatherPtr->gammaTargetIndex = 3;
     gWeatherPtr->gammaStepDelay = 20;
-    SetRainStrengthFromSoundEffect(SE_T_KOAME);
+    SetRainStrengthFromSoundEffect(SE_RAIN);
 }
 
 void Rain_InitAll(void)
@@ -1023,7 +1023,7 @@ void Thunderstorm_InitVars(void)
     gWeatherPtr->gammaStepDelay = 20;
     gWeatherPtr->weatherGfxLoaded = FALSE;  // duplicate assignment
     gWeatherPtr->thunderTriggered = 0;
-    SetRainStrengthFromSoundEffect(SE_T_AME);
+    SetRainStrengthFromSoundEffect(SE_THUNDERSTORM);
 }
 
 void Thunderstorm_InitAll(void)
@@ -1051,7 +1051,7 @@ void Downpour_InitVars(void)
     gWeatherPtr->gammaTargetIndex = 3;
     gWeatherPtr->gammaStepDelay = 20;
     gWeatherPtr->weatherGfxLoaded = FALSE;  // duplicate assignment
-    SetRainStrengthFromSoundEffect(SE_T_OOAME);
+    SetRainStrengthFromSoundEffect(SE_DOWNPOUR);
 }
 
 void Downpour_InitAll(void)
@@ -1220,9 +1220,9 @@ static void UpdateThunderSound(void)
                 return;
 
             if (Random() & 1)
-                PlaySE(SE_T_KAMI);
+                PlaySE(SE_THUNDER);
             else
-                PlaySE(SE_T_KAMI2);
+                PlaySE(SE_THUNDER2);
 
             gWeatherPtr->thunderTriggered = 0;
         }
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 939c15dbf..991617713 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -311,7 +311,7 @@ bool8 FldEff_CutGrass(void)
     s16 x, y;
     u8 i = 0;
 
-    PlaySE(SE_W015);
+    PlaySE(SE_M_CUT);
     PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y);
     for (i = 0; i < CUT_HYPER_AREA; i++)
     {
@@ -634,7 +634,7 @@ void FixLongGrassMetatilesWindowBottom(s16 x, s16 y)
 
 static void StartCutTreeFieldEffect(void)
 {
-    PlaySE(SE_W015);
+    PlaySE(SE_M_CUT);
     FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE);
     EnableBothScriptContexts();
 }
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index 2d25928b8..b2ddf3180 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -104,7 +104,7 @@ static void FieldCallback_Flash(void)
 
 static void FldEff_UseFlash(void)
 {
-    PlaySE(SE_W115);
+    PlaySE(SE_M_REFLECT);
     FlagSet(FLAG_SYS_USE_FLASH);
     ScriptContext1_SetupScript(EventScript_UseFlash);
 }
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index 6db44d752..7eae8cfd1 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -618,7 +618,7 @@ bool8 FldEff_SecretPowerCave(void)
 
 static void SpriteCB_CaveEntranceInit(struct Sprite *sprite)
 {
-    PlaySE(SE_W088);
+    PlaySE(SE_M_ROCK_THROW);
 
     sprite->data[0] = 0;
     sprite->callback = SpriteCB_CaveEntranceOpen;
@@ -691,7 +691,7 @@ bool8 FldEff_SecretPowerTree(void)
 
 static void SpriteCB_TreeEntranceInit(struct Sprite *sprite)
 {
-    PlaySE(SE_W010);
+    PlaySE(SE_M_SCRATCH);
 
     sprite->animNum = gFieldEffectArguments[7];
     sprite->data[0] = 0;
@@ -754,7 +754,7 @@ bool8 FldEff_SecretPowerShrub(void)
 
 static void SpriteCB_ShrubEntranceInit(struct Sprite *sprite)
 {
-    PlaySE(SE_W077);
+    PlaySE(SE_M_POISON_POWDER);
 
     sprite->data[0] = 0;
     sprite->callback = SpriteCB_ShrubEntranceOpen;
@@ -888,16 +888,16 @@ static void DoBalloonSoundEffect(s16 metatileId)
     switch (metatileId)
     {
     case METATILE_SecretBase_RedBalloon:
-        PlaySE(SE_FUUSEN1);
+        PlaySE(SE_BALLOON_RED);
         break;
     case METATILE_SecretBase_BlueBalloon:
-        PlaySE(SE_FUUSEN2);
+        PlaySE(SE_BALLOON_BLUE);
         break;
     case METATILE_SecretBase_YellowBalloon:
-        PlaySE(SE_FUUSEN3);
+        PlaySE(SE_BALLOON_YELLOW);
         break;
     case METATILE_SecretBase_MudBall:
-        PlaySE(SE_TOY_DANGO);
+        PlaySE(SE_MUD_BALL);
         break;
     }
 }
@@ -914,7 +914,7 @@ bool8 FldEff_Nop48(void)
 
 static void DoSecretBaseBreakableDoorEffect(s16 x, s16 y)
 {
-    PlaySE(SE_TOY_KABE);
+    PlaySE(SE_BREAKABLE_DOOR);
     MapGridSetMetatileIdAt(x, y, METATILE_SecretBase_BreakableDoor_BottomOpen);
     MapGridSetMetatileIdAt(x, y - 1, METATILE_SecretBase_BreakableDoor_TopOpen);
     CurrentMapDrawMetatileAt(x, y);
@@ -959,28 +959,28 @@ static void Task_SecretBaseMusicNoteMatSound(u8 taskId)
         switch (gTasks[taskId].tMetatileID)
         {
         case METATILE_SecretBase_NoteMat_C_Low:
-            PlaySE(SE_TOY_C);
+            PlaySE(SE_NOTE_C);
             break;
         case METATILE_SecretBase_NoteMat_D:
-            PlaySE(SE_TOY_D);
+            PlaySE(SE_NOTE_D);
             break;
         case METATILE_SecretBase_NoteMat_E:
-            PlaySE(SE_TOY_E);
+            PlaySE(SE_NOTE_E);
             break;
         case METATILE_SecretBase_NoteMat_F:
-            PlaySE(SE_TOY_F);
+            PlaySE(SE_NOTE_F);
             break;
         case METATILE_SecretBase_NoteMat_G:
-            PlaySE(SE_TOY_G);
+            PlaySE(SE_NOTE_G);
             break;
         case METATILE_SecretBase_NoteMat_A:
-            PlaySE(SE_TOY_A);
+            PlaySE(SE_NOTE_A);
             break;
         case METATILE_SecretBase_NoteMat_B:
-            PlaySE(SE_TOY_B);
+            PlaySE(SE_NOTE_B);
             break;
         case METATILE_SecretBase_NoteMat_C_High:
-            PlaySE(SE_TOY_C1);
+            PlaySE(SE_NOTE_C_HIGH);
             break;
         }
 
@@ -1006,7 +1006,7 @@ static void SpriteCB_GlitterMatSparkle(struct Sprite *sprite)
     sprite->data[0]++;
 
     if (sprite->data[0] == 8)
-        PlaySE(SE_W215);
+        PlaySE(SE_M_HEAL_BELL);
 
     if (sprite->data[0] >= 32)
         DestroySprite(sprite);
@@ -1081,7 +1081,7 @@ bool8 FldEff_SandPillar(void)
 
 static void SpriteCB_SandPillar_BreakTop(struct Sprite *sprite)
 {
-    PlaySE(SE_W088);
+    PlaySE(SE_M_ROCK_THROW);
 
     if (MapGridGetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6] - 1) == METATILE_SecretBase_SandOrnament_TopWall)
         MapGridSetMetatileIdAt(gFieldEffectArguments[5], gFieldEffectArguments[6] - 1, METATILE_SecretBase_Wall_TopMid | METATILE_COLLISION_MASK);
@@ -1226,7 +1226,7 @@ static void Task_FieldPoisonEffect(u8 taskId)
 
 void FldEffPoison_Start(void)
 {
-    PlaySE(SE_DOKU);
+    PlaySE(SE_FIELD_POISON);
     CreateTask(Task_FieldPoisonEffect, 80);
 }
 
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index 0c35ec74e..6f4ce8002 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -162,7 +162,7 @@ bool8 FldEff_UseRockSmash(void)
 // The actual rock smashing is handled by EventScript_SmashRock, so this function does very little
 static void FieldMove_RockSmash(void)
 {
-    PlaySE(SE_W088);
+    PlaySE(SE_M_ROCK_THROW);
     FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH);
     EnableBothScriptContexts();
 }
diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index bfa20cdbc..3a38f67f0 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -61,13 +61,13 @@ void Task_TryUseSoftboiledOnPartyMon(u8 taskId)
     }
 
     // Take away Softboiled user's health first (-1)
-    PlaySE(SE_KAIFUKU);
+    PlaySE(SE_USE_ITEM);
     PartyMenuModifyHP(taskId, userPartyId, -1, GetMonData(&gPlayerParty[userPartyId], MON_DATA_MAX_HP)/5, Task_SoftboiledRestoreHealth);
 }
 
 static void Task_SoftboiledRestoreHealth(u8 taskId)
 {
-    PlaySE(SE_KAIFUKU);
+    PlaySE(SE_USE_ITEM);
     PartyMenuModifyHP(taskId, gPartyMenu.slotId2, 1, GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MAX_HP)/5, Task_DisplayHPRestoredMessage);
 }
 
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 1ee82674e..a9d81501f 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -51,7 +51,7 @@ static void StartSweetScentFieldEffect(void)
 {
     u8 taskId;
 
-    PlaySE(SE_W230);
+    PlaySE(SE_M_SWEET_SCENT);
     CpuFastSet(gPlttBufferUnfaded, gPaletteDecompressionBuffer, 0x100);
     CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100);
     BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB_RED);
diff --git a/src/frontier_pass.c b/src/frontier_pass.c
index adc02f90b..702f6c098 100644
--- a/src/frontier_pass.c
+++ b/src/frontier_pass.c
@@ -871,10 +871,10 @@ static void CB2_ReturnFromRecord(void)
     switch (InBattlePyramid())
     {
     case 1:
-        PlayBGM(MUS_PYRAMID);
+        PlayBGM(MUS_B_PYRAMID);
         break;
     case 2:
-        PlayBGM(MUS_PYRAMID_TOP);
+        PlayBGM(MUS_B_PYRAMID_TOP);
         break;
     default:
         Overworld_PlaySpecialMapMusic();
@@ -1707,5 +1707,5 @@ static void HandleFrontierMapCursorMove(u8 direction)
         CopyWindowToVram(i, 3);
 
     CopyBgTilemapBufferToVram(0);
-    PlaySE(SE_Z_SCROLL);
+    PlaySE(SE_DEX_SCROLL);
 }
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 19217ae85..2b548dea2 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -396,7 +396,7 @@ static bool8 InitHallOfFameScreen(void)
         if (!gPaletteFade.active)
         {
             SetMainCallback2(CB2_HallOfFame);
-            PlayBGM(MUS_DENDOU);
+            PlayBGM(MUS_HALL_OF_FAME);
             return FALSE;
         }
         break;
@@ -648,7 +648,7 @@ static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId)
     }
 
     HallOfFame_PrintWelcomeText(0, 15);
-    PlaySE(SE_DENDOU);
+    PlaySE(SE_APPLAUSE);
     gTasks[taskId].tFrameCount = 400;
     gTasks[taskId].func = Task_Hof_DoConfetti;
 }
diff --git a/src/intro.c b/src/intro.c
index 72aefd737..eca8b84b1 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1129,7 +1129,7 @@ static void Task_IntroFadeIn(u8 taskId)
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_ON);
     gTasks[taskId].func = Task_IntroWaterDrops;
     gIntroFrameCounter = 0;
-    m4aSongNumStart(MUS_DEMO1);
+    m4aSongNumStart(MUS_INTRO);
     ResetSerial();
 }
 
@@ -1563,7 +1563,7 @@ static void Task_IntroLoadPart3Graphics(u8 taskId)
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_1 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG2_ON | DISPCNT_OBJ_ON);
     gTasks[taskId].func = Task_IntroSpinAndZoomPokeball;
     gIntroFrameCounter = 0;
-    m4aSongNumStart(MUS_T_BATTLE);
+    m4aSongNumStart(MUS_INTRO_BATTLE);
 }
 
 static void Task_IntroSpinAndZoomPokeball(u8 taskId)
@@ -2355,7 +2355,7 @@ static void Task_IntroRayquazaGlowScene_1(u8 taskId)
             if (data[1] == 6)
             {
                 spriteId = CreateSprite(&gIntroRayquazaHyperbeamSprite, 120, 88, 15);
-                PlaySE(SE_OP_BASYU);
+                PlaySE(SE_INTRO_BLAST);
                 gSprites[spriteId].invisible = TRUE;
                 gSprites[spriteId].data[3] = data[4];
                 data[0]++;
diff --git a/src/item_menu.c b/src/item_menu.c
index 3ae71bc0f..f2c7b25d8 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -1190,7 +1190,7 @@ void Task_BagMenu_HandleInput(u8 taskId)
             case LIST_CANCEL:
                 if (gBagPositionStruct.location == ITEMMENULOCATION_BERRY_BLENDER_CRUSH)
                 {
-                    PlaySE(SE_HAZURE);
+                    PlaySE(SE_FAILURE);
                     break;
                 }
                 PlaySE(SE_SELECT);
@@ -2091,7 +2091,7 @@ static void BagMenu_Sell_UpdateItemListAndMoney(u8 taskId)
     u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket];
     u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket];
 
-    PlaySE(SE_REGI);
+    PlaySE(SE_SHOP);
     RemoveBagItem(gSpecialVar_ItemId, tItemCount);
     AddMoney(&gSaveBlock1Ptr->money, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount);
     DestroyListMenuTask(data[0], scrollPos, cursorPos);
diff --git a/src/item_use.c b/src/item_use.c
index 2c9ffaf32..a9132ae5e 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -328,7 +328,7 @@ static void Task_UseItemfinder(u8 taskId)
             }
             return;
         }
-        PlaySE(SE_DAUGI);
+        PlaySE(SE_ITEMFINDER);
         tItemfinderBeeps++;
     }
     tCounter = (tCounter + 1) & 0x1F;
@@ -845,7 +845,7 @@ static void Task_StartUseRepel(u8 taskId)
     if (++data[8] > 7)
     {
         data[8] = 0;
-        PlaySE(SE_TU_SAA);
+        PlaySE(SE_REPEL);
         gTasks[taskId].func = Task_UseRepel;
     }
 }
@@ -867,7 +867,7 @@ static void Task_UsedBlackWhiteFlute(u8 taskId)
 {
     if(++gTasks[taskId].data[8] > 7)
     {
-        PlaySE(SE_BIDORO);
+        PlaySE(SE_GLASS_FLUTE);
         if (!InBattlePyramid())
             DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu);
         else
@@ -969,7 +969,7 @@ static void Task_UseStatIncreaseItem(u8 taskId)
 {
     if(++gTasks[taskId].data[8] > 7)
     {
-        PlaySE(SE_KAIFUKU);
+        PlaySE(SE_USE_ITEM);
         RemoveBagItem(gSpecialVar_ItemId, 1);
         if (!InBattlePyramid())
             DisplayItemMessage(taskId, 1, UseStatIncreaseItem(gSpecialVar_ItemId), Task_CloseStatIncreaseMessage);
diff --git a/src/main_menu.c b/src/main_menu.c
index a4de99207..f4bf37ce1 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -1292,7 +1292,7 @@ static void Task_NewGameBirchSpeech_Init(u8 taskId)
     gTasks[taskId].tPlayerSpriteId = 0xFF;
     gTasks[taskId].data[3] = 0xFF;
     gTasks[taskId].tTimer = 0xD8;
-    PlayBGM(MUS_DOORO_X4);
+    PlayBGM(MUS_ROUTE122);
     ShowBg(0);
     ShowBg(1);
 }
diff --git a/src/match_call.c b/src/match_call.c
index 307b84413..2b3f6df8d 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -1119,7 +1119,7 @@ static void StartMatchCall(void)
         sub_808BCF4();
     }
 
-    PlaySE(SE_TOREEYE);
+    PlaySE(SE_POKENAV_CALL);
     CreateTask(ExecuteMatchCall, 1);
 }
 
@@ -1257,7 +1257,7 @@ static bool32 sub_8196330(u8 taskId)
     {
         FillWindowPixelBuffer(taskData[2], PIXEL_FILL(8));
         CopyWindowToVram(taskData[2], 2);
-        PlaySE(SE_TOREOFF);
+        PlaySE(SE_POKENAV_HANG_UP);
         return TRUE;
     }
 
diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c
index be1c42e29..f5ef09cac 100644
--- a/src/minigame_countdown.c
+++ b/src/minigame_countdown.c
@@ -227,7 +227,7 @@ static void sub_802E938(struct Sprite *sprite)
         sprite->invisible = FALSE;
     case 1:
     case 2:
-        PlaySE(SE_KON);
+        PlaySE(SE_BALL_BOUNCE_1);
         StartSpriteAnim(sprite, sprite->data[2]);
         break;
     case 3:
@@ -249,7 +249,7 @@ static void sub_802E938(struct Sprite *sprite)
 static void sub_802EA50(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
-    PlaySE(SE_KON);
+    PlaySE(SE_BALL_BOUNCE_1);
     gSprites[data[13]].callback = sub_802E938;
     gSprites[data[13]].invisible = FALSE;
     gTasks[taskId].data[0] = 3;
@@ -350,7 +350,7 @@ static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId)
         // fallthrough
     case 1:
         if (sprite->data[2] == 0)
-            PlaySE(SE_KON2);
+            PlaySE(SE_BALL_BOUNCE_2);
         if (++sprite->data[2] >= 20)
         {
             sprite->data[2] = 0;
@@ -443,7 +443,7 @@ static void SpriteCB_Start(struct Sprite *sprite)
         sprite->pos2.y = data[5] >> 4;
         if (sprite->pos2.y >= 0)
         {
-            PlaySE(SE_KON2);
+            PlaySE(SE_BALL_BOUNCE_2);
             sprite->pos2.y = 0;
             data[0]++;
         }
@@ -452,7 +452,7 @@ static void SpriteCB_Start(struct Sprite *sprite)
         data[1] += 12;
         if (data[1] >= 128)
         {
-            PlaySE(SE_KON2);
+            PlaySE(SE_BALL_BOUNCE_2);
             data[1] = 0;
             data[0]++;
         }
@@ -463,7 +463,7 @@ static void SpriteCB_Start(struct Sprite *sprite)
         data[1] += 16;
         if (data[1] >= 128)
         {
-            PlaySE(SE_KON2);
+            PlaySE(SE_BALL_BOUNCE_2);
             data[1] = 0;
             data[0]++;
         }
diff --git a/src/mirage_tower.c b/src/mirage_tower.c
index 02cccf2a5..fb3a0a374 100644
--- a/src/mirage_tower.c
+++ b/src/mirage_tower.c
@@ -370,7 +370,7 @@ static void StartScreenShake(u8 yShakeOffset, u8 xShakeOffset, u8 numShakes, u8
     gTasks[taskId].data[3] = shakeDelay;
     gTasks[taskId].data[4] = yShakeOffset;
     SetCameraPanningCallback(NULL);
-    PlaySE(SE_W070);
+    PlaySE(SE_M_STRENGTH);
 }
 
 static void DoScreenShake(u8 taskId)
diff --git a/src/move_relearner.c b/src/move_relearner.c
index 1c863804b..5f2123362 100644
--- a/src/move_relearner.c
+++ b/src/move_relearner.c
@@ -713,13 +713,13 @@ static void DoMoveRelearnerMain(void)
         {
             FormatAndPrintText(gText_MoveRelearnerPkmnForgotMoveAndLearnedNew);
             sMoveRelearnerStruct->state = MENU_STATE_PRINT_TEXT_THEN_FANFARE;
-            PlayFanfare(MUS_FANFA1);
+            PlayFanfare(MUS_LEVEL_UP);
         }
         break;
     case MENU_STATE_PRINT_TEXT_THEN_FANFARE:
         if (!MoveRelearnerRunTextPrinters())
         {
-            PlayFanfare(MUS_FANFA1);
+            PlayFanfare(MUS_LEVEL_UP);
             sMoveRelearnerStruct->state = MENU_STATE_WAIT_FOR_FANFARE;
         }
         break;
diff --git a/src/mystery_gift.c b/src/mystery_gift.c
index 7f1370a5e..ca5ab1baf 100644
--- a/src/mystery_gift.c
+++ b/src/mystery_gift.c
@@ -431,7 +431,7 @@ bool32 HandleMysteryGiftOrEReaderSetup(s32 mg_or_ereader)
     case 3:
         ShowBg(0);
         ShowBg(3);
-        PlayBGM(MUS_RG_OKURIMONO);
+        PlayBGM(MUS_RG_MYSTERY_GIFT);
         SetVBlankCallback(vblankcb_mystery_gift_e_reader_run);
         EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL);
         return TRUE;
@@ -1023,7 +1023,7 @@ static bool32 PrintMGSuccessMessage(u8 * state, const u8 * arg1, u16 * arg2)
         {
             AddTextPrinterToWindow1(arg1);
         }
-        PlayFanfare(MUS_FANFA4);
+        PlayFanfare(MUS_OBTAIN_ITEM);
         *arg2 = 0;
         (*state)++;
         break;
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 4ed9d78d0..be921078e 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1823,7 +1823,7 @@ static void DeleteTextCharacter(void)
     // It incorrectly leaves the Back key 1 shade lighter than its default
     if (keyRole == KEY_ROLE_CHAR || keyRole == KEY_ROLE_BACKSPACE)
         TryStartButtonFlash(BUTTON_BACK, FALSE, TRUE);
-    PlaySE(SE_BOWA);
+    PlaySE(SE_BALL);
 }
 
 // Returns TRUE if the text entry is now full
diff --git a/src/overworld.c b/src/overworld.c
index 2d838fc4d..d18e3d3bc 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -1076,11 +1076,11 @@ u16 GetLocationMusic(struct WarpData *warp)
     if (NoMusicInSotopolisWithLegendaries(warp) == TRUE)
         return 0xFFFF;
     else if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE)
-        return MUS_OOAME;
+        return MUS_ABNORMAL_WEATHER;
     else if (IsInflitratedSpaceCenter(warp) == TRUE)
-        return MUS_MGM0;
+        return MUS_ENCOUNTER_MAGMA;
     else if (IsInfiltratedWeatherInstitute(warp) == TRUE)
-        return MUS_TOZAN;
+        return MUS_MT_CHIMNEY;
     else
         return Overworld_GetMapHeaderByGroupAndId(warp->mapGroup, warp->mapNum)->music;
 }
@@ -1093,26 +1093,26 @@ u16 GetCurrLocationDefaultMusic(void)
     if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE111)
      && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE111)
      && GetSav1Weather() == WEATHER_SANDSTORM)
-        return MUS_ASHROAD;
+        return MUS_ROUTE111;
 
     music = GetLocationMusic(&gSaveBlock1Ptr->location);
-    if (music != MUS_ROUTE_118)
+    if (music != MUS_ROUTE118)
     {
         return music;
     }
     else
     {
         if (gSaveBlock1Ptr->pos.x < 24)
-            return MUS_DOORO_X1;
+            return MUS_ROUTE110;
         else
-            return MUS_GRANROAD;
+            return MUS_ROUTE119;
     }
 }
 
 u16 GetWarpDestinationMusic(void)
 {
     u16 music = GetLocationMusic(&sWarpDestination);
-    if (music != MUS_ROUTE_118)
+    if (music != MUS_ROUTE118)
     {
         return music;
     }
@@ -1120,9 +1120,9 @@ u16 GetWarpDestinationMusic(void)
     {
         if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(MAUVILLE_CITY)
          && gSaveBlock1Ptr->location.mapNum == MAP_NUM(MAUVILLE_CITY))
-            return MUS_DOORO_X1;
+            return MUS_ROUTE110;
         else
-            return MUS_GRANROAD;
+            return MUS_ROUTE119;
     }
 }
 
@@ -1135,14 +1135,14 @@ void Overworld_PlaySpecialMapMusic(void)
 {
     u16 music = GetCurrLocationDefaultMusic();
 
-    if (music != MUS_OOAME && music != 0xFFFF)
+    if (music != MUS_ABNORMAL_WEATHER && music != 0xFFFF)
     {
         if (gSaveBlock1Ptr->savedMusic)
             music = gSaveBlock1Ptr->savedMusic;
         else if (GetCurrentMapType() == MAP_TYPE_UNDERWATER)
-            music = MUS_DEEPDEEP;
+            music = MUS_UNDERWATER;
         else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
-            music = MUS_NAMINORI;
+            music = MUS_SURF;
     }
 
     if (music != GetCurrentMapMusic())
@@ -1165,12 +1165,12 @@ static void TransitionMapMusic(void)
     {
         u16 newMusic = GetWarpDestinationMusic();
         u16 currentMusic = GetCurrentMapMusic();
-        if (newMusic != MUS_OOAME && newMusic != 0xFFFF)
+        if (newMusic != MUS_ABNORMAL_WEATHER && newMusic != 0xFFFF)
         {
-            if (currentMusic == MUS_DEEPDEEP || currentMusic == MUS_NAMINORI)
+            if (currentMusic == MUS_UNDERWATER || currentMusic == MUS_SURF)
                 return;
             if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
-                newMusic = MUS_NAMINORI;
+                newMusic = MUS_SURF;
         }
         if (newMusic != currentMusic)
         {
@@ -1192,7 +1192,7 @@ void Overworld_ChangeMusicToDefault(void)
 void Overworld_ChangeMusicTo(u16 newMusic)
 {
     u16 currentMusic = GetCurrentMapMusic();
-    if (currentMusic != newMusic && currentMusic != MUS_OOAME)
+    if (currentMusic != newMusic && currentMusic != MUS_ABNORMAL_WEATHER)
         FadeOutAndPlayNewMapMusic(newMusic, 8);
 }
 
@@ -1211,7 +1211,7 @@ void TryFadeOutOldMapMusic(void)
     u16 warpMusic = GetWarpDestinationMusic();
     if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE && warpMusic != GetCurrentMapMusic())
     {
-        if (currentMusic == MUS_NAMINORI
+        if (currentMusic == MUS_SURF
             && VarGet(VAR_SKY_PILLAR_STATE) == 2
             && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SOOTOPOLIS_CITY)
             && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SOOTOPOLIS_CITY)
diff --git a/src/party_menu.c b/src/party_menu.c
index f61cbc5e6..7514cf545 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -1294,7 +1294,7 @@ static bool8 IsSelectedMonNotEgg(u8 *slotPtr)
 {
     if (GetMonData(&gPlayerParty[*slotPtr], MON_DATA_IS_EGG) == TRUE)
     {
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         return FALSE;
     }
     return TRUE;
@@ -1305,7 +1305,7 @@ static void HandleChooseMonCancel(u8 taskId, s8 *slotPtr)
     switch (gPartyMenu.action)
     {
     case PARTY_ACTION_SEND_OUT:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         break;
     case PARTY_ACTION_SWITCH:
     case PARTY_ACTION_SOFTBOILED:
@@ -1915,7 +1915,7 @@ static void TryEnterMonForMinigame(u8 taskId, u8 slot)
     }
     else
     {
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         DisplayPartyMenuMessage(gText_PkmnCantParticipate, FALSE);
         ScheduleBgCopyTilemapToVram(2);
         gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
@@ -3471,7 +3471,7 @@ static void CursorCb_Enter(u8 taskId)
     }
     ConvertIntToDecimalStringN(gStringVar1, maxBattlers, STR_CONV_MODE_LEFT_ALIGN, 1);
     StringExpandPlaceholders(gStringVar4, gText_NoMoreThanVar1Pkmn);
-    PlaySE(SE_HAZURE);
+    PlaySE(SE_FAILURE);
     DisplayPartyMenuMessage(gStringVar4, TRUE);
     gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
 }
@@ -3538,7 +3538,7 @@ static void CursorCb_Register(u8 taskId)
         Task_ClosePartyMenu(taskId);
         return;
     }
-    PlaySE(SE_HAZURE);
+    PlaySE(SE_FAILURE);
     PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
     PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
     StringAppend(gStringVar4, gText_PauseUntilPress);
@@ -3556,7 +3556,7 @@ static void CursorCb_Trade1(u8 taskId)
     if (stringId != UR_TRADE_MSG_NONE)
     {
         StringExpandPlaceholders(gStringVar4, sUnionRoomTradeMessages[stringId - 1]);
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]);
         PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
         StringAppend(gStringVar4, gText_PauseUntilPress);
@@ -3595,7 +3595,7 @@ static void CursorCb_Trade2(u8 taskId)
         gTasks[taskId].func = Task_SpinTradeYesNo;
         return;
     }
-    PlaySE(SE_HAZURE);
+    PlaySE(SE_FAILURE);
     StringAppend(gStringVar4, gText_PauseUntilPress);
     DisplayPartyMenuMessage(gStringVar4, TRUE);
     gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
@@ -4355,13 +4355,13 @@ void ItemUseCB_Medicine(u8 taskId, TaskFunc task)
     gPartyMenuUseExitCallback = TRUE;
     if (!IsItemFlute(item))
     {
-        PlaySE(SE_KAIFUKU);
+        PlaySE(SE_USE_ITEM);
         if (gPartyMenu.action != PARTY_ACTION_REUSABLE_ITEM)
             RemoveBagItem(item, 1);
     }
     else
     {
-        PlaySE(SE_BIDORO);
+        PlaySE(SE_GLASS_FLUTE);
     }
     SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[gPartyMenu.slotId]);
     if (gSprites[sPartyMenuBoxes[gPartyMenu.slotId].statusSpriteId].invisible)
@@ -4426,7 +4426,7 @@ void ItemUseCB_ReduceEV(u8 taskId, TaskFunc task)
     else
     {
         gPartyMenuUseExitCallback = TRUE;
-        PlaySE(SE_KAIFUKU);
+        PlaySE(SE_USE_ITEM);
         RemoveBagItem(item, 1);
         GetMonNickname(mon, gStringVar1);
         ItemEffectToStatString(effectType, gStringVar2);
@@ -4591,7 +4591,7 @@ static void TryUsePPItem(u8 taskId)
     {
         gPartyMenuUseExitCallback = TRUE;
         mon = &gPlayerParty[ptr->slotId];
-        PlaySE(SE_KAIFUKU);
+        PlaySE(SE_USE_ITEM);
         RemoveBagItem(item, 1);
         move = GetMonData(mon, MON_DATA_MOVE1 + *moveSlot);
         StringCopy(gStringVar1, gMoveNames[move]);
@@ -4715,7 +4715,7 @@ static void Task_DoLearnedMoveFanfareAfterText(u8 taskId)
 {
     if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        PlayFanfare(MUS_FANFA1);
+        PlayFanfare(MUS_LEVEL_UP);
         gTasks[taskId].func = Task_LearnNextMoveOrClosePartyMenu;
     }
 }
@@ -5095,7 +5095,7 @@ static void UseSacredAsh(u8 taskId)
         return;
     }
 
-    PlaySE(SE_KAIFUKU);
+    PlaySE(SE_USE_ITEM);
     SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[gPartyMenu.slotId]);
     if (gSprites[sPartyMenuBoxes[gPartyMenu.slotId].statusSpriteId].invisible)
         DisplayPartyPokemonLevelCheck(mon, &sPartyMenuBoxes[gPartyMenu.slotId], 1);
@@ -5596,7 +5596,7 @@ static void Task_ValidateChosenHalfParty(u8 taskId)
 
     if (msgId != 0xFF)
     {
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         DisplayPartyMenuStdMessage(msgId);
         gTasks[taskId].func = Task_ContinueChoosingHalfParty;
     }
@@ -6077,7 +6077,7 @@ static void Task_MultiPartnerPartySlideIn(u8 taskId)
                 if (gMultiPartnerParty[i - MULTI_PARTY_SIZE].species != SPECIES_NONE)
                     AnimateSelectedPartyIcon(sPartyMenuBoxes[i].monSpriteId, 0);
             }
-            PlaySE(SE_W231); // The Harden SE plays once the partners party mons have slid on screen
+            PlaySE(SE_M_HARDEN); // The Harden SE plays once the partners party mons have slid on screen
             gTasks[taskId].func = Task_WaitAfterMultiPartnerPartySlideIn;
         }
     }
diff --git a/src/pokeball.c b/src/pokeball.c
index 1a0561c33..829d22863 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -406,7 +406,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
     gSprites[ballSpriteId].oam.affineParam = taskId;
     gTasks[taskId].tOpponentBattler = gBattlerTarget;
     gTasks[taskId].func = TaskDummy;
-    PlaySE(SE_NAGERU);
+    PlaySE(SE_BALL_THROW);
 }
 
 static void SpriteCB_TestBallThrow(struct Sprite *sprite)
@@ -462,7 +462,7 @@ static void sub_807574C(struct Sprite *sprite)
 {
     sprite->data[5]++;
     if (sprite->data[5] == 11)
-        PlaySE(SE_SUIKOMU);
+        PlaySE(SE_BALL_TRADE);
     if (gSprites[gBattlerSpriteIds[sprite->sBattler]].affineAnimEnded)
     {
         StartSpriteAnim(sprite, 2);
@@ -512,16 +512,16 @@ static void sub_8075838(struct Sprite *sprite)
             switch (sprite->data[3] >> 8)
             {
             case 1:
-                PlaySE(SE_KON);
+                PlaySE(SE_BALL_BOUNCE_1);
                 break;
             case 2:
-                PlaySE(SE_KON2);
+                PlaySE(SE_BALL_BOUNCE_2);
                 break;
             case 3:
-                PlaySE(SE_KON3);
+                PlaySE(SE_BALL_BOUNCE_3);
                 break;
             default:
-                PlaySE(SE_KON4);
+                PlaySE(SE_BALL_BOUNCE_4);
                 break;
             }
         }
@@ -563,7 +563,7 @@ static void sub_8075930(struct Sprite *sprite)
         sprite->affineAnimPaused = TRUE;
         StartSpriteAffineAnim(sprite, 1);
         sprite->callback = sub_8075970;
-        PlaySE(SE_BOWA);
+        PlaySE(SE_BALL);
     }
 }
 
@@ -632,7 +632,7 @@ static void sub_8075970(struct Sprite *sprite)
                 StartSpriteAffineAnim(sprite, 2);
             else
                 StartSpriteAffineAnim(sprite, 1);
-            PlaySE(SE_BOWA);
+            PlaySE(SE_BALL);
         }
         break;
     }
@@ -879,7 +879,7 @@ static void sub_80760F8(struct Sprite *sprite)
     {
         gDoingBattleAnim = FALSE;
         m4aMPlayAllStop();
-        PlaySE(MUS_FANFA5);
+        PlaySE(MUS_EVOLVED);
     }
     else if (sprite->data[4] == 315)
     {
@@ -1148,7 +1148,7 @@ static void sub_807687C(struct Sprite *sprite)
 
     sprite->data[5]++;
     if (sprite->data[5] == 11)
-        PlaySE(SE_SUIKOMU);
+        PlaySE(SE_BALL_TRADE);
     r1 = sprite->data[0];
     if (gSprites[r1].affineAnimEnded)
     {
diff --git a/src/pokedex.c b/src/pokedex.c
index 2a6a33633..a86c22153 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1959,7 +1959,7 @@ static void Task_HandleSearchResultsStartMenuInput(u8 taskId)
             case 3: //BACK TO POKEDEX
                 BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
                 gTasks[taskId].func = Task_ReturnToPokedexFromSearchResults;
-                PlaySE(SE_TRACK_DOOR);
+                PlaySE(SE_TRUCK_DOOR);
                 break;
             case 4: //CLOSE POKEDEX
                 BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK);
@@ -2596,7 +2596,7 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored)
         selectedMon = GetNextPosition(1, selectedMon, 0, sPokedexView->pokemonListCount - 1);
         CreateScrollingPokemonSprite(1, selectedMon);
         CreateMonListEntry(1, selectedMon, ignored);
-        PlaySE(SE_Z_SCROLL);
+        PlaySE(SE_DEX_SCROLL);
     }
     else if ((gMain.heldKeys & DPAD_DOWN) && (selectedMon < sPokedexView->pokemonListCount - 1))
     {
@@ -2604,7 +2604,7 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored)
         selectedMon = GetNextPosition(0, selectedMon, 0, sPokedexView->pokemonListCount - 1);
         CreateScrollingPokemonSprite(2, selectedMon);
         CreateMonListEntry(2, selectedMon, ignored);
-        PlaySE(SE_Z_SCROLL);
+        PlaySE(SE_DEX_SCROLL);
     }
     else if ((gMain.newKeys & DPAD_LEFT) && (selectedMon > 0))
     {
@@ -2615,7 +2615,7 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored)
         sPokedexView->pokeBallRotation += 16 * (selectedMon - startingPos);
         ClearMonSprites();
         CreateMonSpritesAtPos(selectedMon, 0xE);
-        PlaySE(SE_Z_PAGE);
+        PlaySE(SE_DEX_PAGE);
     }
     else if ((gMain.newKeys & DPAD_RIGHT) && (selectedMon < sPokedexView->pokemonListCount - 1))
     {
@@ -2625,7 +2625,7 @@ static u16 TryDoPokedexScroll(u16 selectedMon, u16 ignored)
         sPokedexView->pokeBallRotation += 16 * (selectedMon - startingPos);
         ClearMonSprites();
         CreateMonSpritesAtPos(selectedMon, 0xE);
-        PlaySE(SE_Z_PAGE);
+        PlaySE(SE_DEX_PAGE);
     }
 
     if (scrollDir == 0)
@@ -3353,7 +3353,7 @@ static void Task_HandleInfoScreenInput(u8 taskId)
         // Scroll up/down
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
         gTasks[taskId].func = Task_LoadInfoScreenWaitForFade;
-        PlaySE(SE_Z_SCROLL);
+        PlaySE(SE_DEX_SCROLL);
         return;
     }
     if (gMain.newKeys & B_BUTTON)
@@ -3382,7 +3382,7 @@ static void Task_HandleInfoScreenInput(u8 taskId)
         case SIZE_SCREEN:
             if (!sPokedexListItem->owned)
             {
-                PlaySE(SE_HAZURE);
+                PlaySE(SE_FAILURE);
             }
             else
             {
@@ -3406,7 +3406,7 @@ static void Task_HandleInfoScreenInput(u8 taskId)
     {
         sPokedexView->selectedScreen--;
         HighlightScreenSelectBarItem(sPokedexView->selectedScreen, 0xD);
-        PlaySE(SE_Z_PAGE);
+        PlaySE(SE_DEX_PAGE);
         return;
     }
     if (((gMain.newKeys & DPAD_RIGHT)
@@ -3415,7 +3415,7 @@ static void Task_HandleInfoScreenInput(u8 taskId)
     {
         sPokedexView->selectedScreen++;
         HighlightScreenSelectBarItem(sPokedexView->selectedScreen, 0xD);
-        PlaySE(SE_Z_PAGE);
+        PlaySE(SE_DEX_PAGE);
         return;
     }
 }
@@ -3654,7 +3654,7 @@ static void Task_HandleCryScreenInput(u8 taskId)
             m4aMPlayContinue(&gMPlayInfo_BGM);
             sPokedexView->screenSwitchState = 2;
             gTasks[taskId].func = Task_SwitchScreensFromCryScreen;
-            PlaySE(SE_Z_PAGE);
+            PlaySE(SE_DEX_PAGE);
             return;
         }
         if ((gMain.newKeys & DPAD_RIGHT)
@@ -3662,7 +3662,7 @@ static void Task_HandleCryScreenInput(u8 taskId)
         {
             if (!sPokedexListItem->owned)
             {
-                PlaySE(SE_HAZURE);
+                PlaySE(SE_FAILURE);
             }
             else
             {
@@ -3670,7 +3670,7 @@ static void Task_HandleCryScreenInput(u8 taskId)
                 m4aMPlayContinue(&gMPlayInfo_BGM);
                 sPokedexView->screenSwitchState = 3;
                 gTasks[taskId].func = Task_SwitchScreensFromCryScreen;
-                PlaySE(SE_Z_PAGE);
+                PlaySE(SE_DEX_PAGE);
             }
             return;
         }
@@ -3823,7 +3823,7 @@ static void Task_HandleSizeScreenInput(u8 taskId)
         BeginNormalPaletteFade(0xFFFFFFEB, 0, 0, 0x10, RGB_BLACK);
         sPokedexView->screenSwitchState = 2;
         gTasks[taskId].func = Task_SwitchScreensFromSizeScreen;
-        PlaySE(SE_Z_PAGE);
+        PlaySE(SE_DEX_PAGE);
     }
 }
 
@@ -4936,7 +4936,7 @@ static void Task_HandleSearchTopBarInput(u8 taskId)
     }
     if ((gMain.newKeys & DPAD_LEFT) && gTasks[taskId].tTopBarItem > SEARCH_TOPBAR_SEARCH)
     {
-        PlaySE(SE_Z_PAGE);
+        PlaySE(SE_DEX_PAGE);
         gTasks[taskId].tTopBarItem--;
         HighlightSelectedSearchTopBarItem(gTasks[taskId].tTopBarItem);
         CopyWindowToVram(0, 2);
@@ -4944,7 +4944,7 @@ static void Task_HandleSearchTopBarInput(u8 taskId)
     }
     if ((gMain.newKeys & DPAD_RIGHT) && gTasks[taskId].tTopBarItem < SEARCH_TOPBAR_CANCEL)
     {
-        PlaySE(SE_Z_PAGE);
+        PlaySE(SE_DEX_PAGE);
         gTasks[taskId].tTopBarItem++;
         HighlightSelectedSearchTopBarItem(gTasks[taskId].tTopBarItem);
         CopyWindowToVram(0, 2);
@@ -4983,7 +4983,7 @@ static void Task_HandleSearchMenuInput(u8 taskId)
 
     if (gMain.newKeys & B_BUTTON)
     {
-        PlaySE(SE_BOWA);
+        PlaySE(SE_BALL);
         SetDefaultSearchModeAndOrder(taskId);
         gTasks[taskId].func = Task_SwitchToSearchMenuTopBar;
         return;
@@ -5011,7 +5011,7 @@ static void Task_HandleSearchMenuInput(u8 taskId)
             {
                 EraseAndPrintSearchTextBox(gText_SearchingPleaseWait);
                 gTasks[taskId].func = Task_StartPokedexSearch;
-                PlaySE(SE_Z_SEARCH);
+                PlaySE(SE_DEX_SEARCH);
                 CopyWindowToVram(0, 2);
             }
         }
@@ -5076,12 +5076,12 @@ static void Task_WaitAndCompleteSearch(u8 taskId)
     {
         if (sPokedexView->pokemonListCount != 0)
         {
-            PlaySE(SE_SEIKAI);
+            PlaySE(SE_SUCCESS);
             EraseAndPrintSearchTextBox(gText_SearchCompleted);
         }
         else
         {
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             EraseAndPrintSearchTextBox(gText_NoMatchingPkmnWereFound);
         }
         gTasks[taskId].func = Task_SearchCompleteWaitForInput;
@@ -5105,7 +5105,7 @@ static void Task_SearchCompleteWaitForInput(u8 taskId)
         else
         {
             gTasks[taskId].func = Task_SwitchToSearchMenu;
-            PlaySE(SE_BOWA);
+            PlaySE(SE_BALL);
         }
     }
 }
@@ -5156,7 +5156,7 @@ static void Task_HandleSearchParameterInput(u8 taskId)
     }
     if (gMain.newKeys & B_BUTTON)
     {
-        PlaySE(SE_BOWA);
+        PlaySE(SE_BALL);
         ClearSearchParameterBoxText();
         DrawOrEraseSearchParameterBox(TRUE);
         *cursorPos = gTasks[taskId].tCursorPos;
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c
index 0232d4fc4..8450f8530 100755
--- a/src/pokedex_area_screen.c
+++ b/src/pokedex_area_screen.c
@@ -732,7 +732,7 @@ static void Task_HandlePokedexAreaScreenInput(u8 taskId)
         else if (gMain.newKeys & DPAD_RIGHT || (gMain.newKeys & R_BUTTON && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
         {
             gTasks[taskId].data[1] = 2;
-            PlaySE(SE_Z_PAGE);
+            PlaySE(SE_DEX_PAGE);
         }
         else
             return;
diff --git a/src/pokemon.c b/src/pokemon.c
index b93c5f2ff..7cde8e0a6 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -6253,11 +6253,11 @@ void ClearBattleMonForms(void)
 u16 GetBattleBGM(void)
 {
     if (gBattleTypeFlags & BATTLE_TYPE_KYOGRE_GROUDON)
-        return MUS_BATTLE34;
+        return MUS_VS_KYOGRE_GROUDON;
     else if (gBattleTypeFlags & BATTLE_TYPE_REGI)
-        return MUS_BATTLE36;
+        return MUS_VS_REGI;
     else if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))
-        return MUS_BATTLE20;
+        return MUS_VS_TRAINER;
     else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
     {
         u8 trainerClass;
@@ -6273,24 +6273,24 @@ u16 GetBattleBGM(void)
         {
         case TRAINER_CLASS_AQUA_LEADER:
         case TRAINER_CLASS_MAGMA_LEADER:
-            return MUS_BATTLE30;
+            return MUS_VS_AQUA_MAGMA_LEADER;
         case TRAINER_CLASS_TEAM_AQUA:
         case TRAINER_CLASS_TEAM_MAGMA:
         case TRAINER_CLASS_AQUA_ADMIN:
         case TRAINER_CLASS_MAGMA_ADMIN:
-            return MUS_BATTLE31;
+            return MUS_VS_AQUA_MAGMA;
         case TRAINER_CLASS_LEADER:
-            return MUS_BATTLE32;
+            return MUS_VS_GYM_LEADER;
         case TRAINER_CLASS_CHAMPION:
-            return MUS_BATTLE33;
+            return MUS_VS_CHAMPION;
         case TRAINER_CLASS_PKMN_TRAINER_3:
             if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
-                return MUS_BATTLE35;
+                return MUS_VS_RIVAL;
             if (!StringCompare(gTrainers[gTrainerBattleOpponent_A].trainerName, gText_BattleWallyName))
-                return MUS_BATTLE20;
-            return MUS_BATTLE35;
+                return MUS_VS_TRAINER;
+            return MUS_VS_RIVAL;
         case TRAINER_CLASS_ELITE_FOUR:
-            return MUS_BATTLE38;
+            return MUS_VS_ELITE_FOUR;
         case TRAINER_CLASS_SALON_MAIDEN:
         case TRAINER_CLASS_DOME_ACE:
         case TRAINER_CLASS_PALACE_MAVEN:
@@ -6298,13 +6298,13 @@ u16 GetBattleBGM(void)
         case TRAINER_CLASS_FACTORY_HEAD:
         case TRAINER_CLASS_PIKE_QUEEN:
         case TRAINER_CLASS_PYRAMID_KING:
-            return MUS_VS_FRONT;
+            return MUS_VS_FRONTIER_BRAIN;
         default:
-            return MUS_BATTLE20;
+            return MUS_VS_TRAINER;
         }
     }
     else
-        return MUS_BATTLE27;
+        return MUS_VS_WILD;
 }
 
 void PlayBattleBGM(void)
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
index c5f4ef1a4..96774c0bb 100755
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -576,7 +576,7 @@ static void sub_802ACA0(u8 taskId)
     case 2:
         if (!sub_802D0F0() && IsNotWaitingForBGMStop() == TRUE)
         {
-            FadeOutAndPlayNewMapMusic(MUS_RG_JUMP, 8);
+            FadeOutAndPlayNewMapMusic(MUS_RG_POKE_JUMP, 8);
             gUnknown_02022CFC->unk8++;
         }
         break;
@@ -1721,7 +1721,7 @@ static void sub_802C1BC(void)
     gUnknown_02022CFC->unk83AC->unk10 = 0;
 }
 
-static const u16 gUnknown_082FB654[] = {SE_REGI, SE_REAPOKE, SE_W234, SE_RG_EXCELLENT};
+static const u16 gUnknown_082FB654[] = {SE_SHOP, SE_SHINY, SE_M_MORNING_SUN, SE_RG_POKE_JUMP_SUCCESS};
 
 static void sub_802C1DC(void)
 {
@@ -1798,9 +1798,9 @@ static void sub_802C280(void)
     }
 
     if (whichSound & 0x2)
-        PlaySE(SE_RG_NAWAMISS);
+        PlaySE(SE_RG_POKE_JUMP_FAILURE);
     else if (whichSound & 0x1)
-        PlaySE(SE_DANSA);
+        PlaySE(SE_LEDGE);
 }
 
 static const s8 gUnknown_082FB65C[][48] =
@@ -2702,7 +2702,7 @@ static void sub_802CDD4(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        PlaySE(SE_JITE_PYOKO);
+        PlaySE(SE_BIKE_HOP);
         sprite->data[1] = 0;
         sprite->data[0]++;
         // fall through
@@ -3275,7 +3275,7 @@ static void sub_802D7E8(u16 itemId, u16 quantity)
     gUnknown_02022D00->unk12 = sub_802DA9C(4, 8, 22, 4);
     AddTextPrinterParameterized(gUnknown_02022D00->unk12, 1, gUnknown_02022D00->strBuff, 0, 1, TEXT_SPEED_FF, NULL);
     CopyWindowToVram(gUnknown_02022D00->unk12, 2);
-    gUnknown_02022D00->unk14 = MUS_FANFA1;
+    gUnknown_02022D00->unk14 = MUS_LEVEL_UP;
     gUnknown_02022D00->unkD = 0;
 }
 
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 5f2f5516b..546f50dce 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -2576,7 +2576,7 @@ static void Cb_MainPSS(u8 taskId)
             sPSSData->state = 7;
             break;
         case 24:
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             break;
         }
         break;
@@ -2622,12 +2622,12 @@ static void Cb_MainPSS(u8 taskId)
         }
         break;
     case 4:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PrintStorageActionText(PC_TEXT_LAST_POKE);
         sPSSData->state = 6;
         break;
     case 5:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL);
         sPSSData->state = 6;
         break;
@@ -2843,17 +2843,17 @@ static void Cb_OnSelectedMon(u8 taskId)
         }
         break;
     case 3:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PrintStorageActionText(PC_TEXT_LAST_POKE);
         sPSSData->state = 6;
         break;
     case 5:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PrintStorageActionText(PC_TEXT_CANT_RELEASE_EGG);
         sPSSData->state = 6;
         break;
     case 4:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL);
         sPSSData->state = 6;
         break;
@@ -3277,7 +3277,7 @@ static void Cb_ItemToBag(u8 taskId)
     case 0:
         if (!AddBagItem(sPSSData->cursorMonItem, 1))
         {
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             PrintStorageActionText(PC_TEXT_BAG_FULL);
             sPSSData->state = 3;
         }
@@ -3742,7 +3742,7 @@ static void Cb_OnCloseBoxPressed(u8 taskId)
     case 0:
         if (IsMonBeingMoved())
         {
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             PrintStorageActionText(PC_TEXT_HOLDING_POKE);
             sPSSData->state = 1;
         }
@@ -3803,7 +3803,7 @@ static void Cb_OnBPressed(u8 taskId)
     case 0:
         if (IsMonBeingMoved())
         {
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             PrintStorageActionText(PC_TEXT_HOLDING_POKE);
             sPSSData->state = 1;
         }
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 2e7995222..d016c455c 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -1903,7 +1903,7 @@ static void Task_HandleInput_MoveSelect(u8 taskId)
             }
             else
             {
-                PlaySE(SE_HAZURE);
+                PlaySE(SE_FAILURE);
             }
         }
         else if (gMain.newKeys & B_BUTTON)
@@ -2191,7 +2191,7 @@ static void Task_HandleReplaceMoveInput(u8 taskId)
                 }
                 else
                 {
-                    PlaySE(SE_HAZURE);
+                    PlaySE(SE_FAILURE);
                     ShowCantForgetHMsWindow(taskId);
                 }
             }
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c
index d9aae7e4e..155e30939 100644
--- a/src/pokenav_main_menu.c
+++ b/src/pokenav_main_menu.c
@@ -312,7 +312,7 @@ u32 PokenavMainMenuLoopedTaskIsActive(void)
 
 void ShutdownPokenav(void)
 {
-    PlaySE(SE_PN_OFF);
+    PlaySE(SE_POKENAV_OFF);
     sub_81CAADC();
     BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK);
 }
diff --git a/src/pokenav_match_call_1.c b/src/pokenav_match_call_1.c
index 1e4239bbc..265259394 100755
--- a/src/pokenav_match_call_1.c
+++ b/src/pokenav_match_call_1.c
@@ -118,7 +118,7 @@ static u32 CB2_HandleMatchCallInput(struct Pokenav3Struct *state)
         else
         {
             // Cant exit Match Call menu before calling Mr Stone during tutorial
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
         }
     }
 
diff --git a/src/pokenav_match_call_2.c b/src/pokenav_match_call_2.c
index d03bad88b..60091577e 100755
--- a/src/pokenav_match_call_2.c
+++ b/src/pokenav_match_call_2.c
@@ -601,7 +601,7 @@ u32 DoMatchCallMessage(s32 taskState)
             return LT_PAUSE;
 
         PrintCallingDots(state);
-        PlaySE(SE_TOREEYE);
+        PlaySE(SE_POKENAV_CALL);
         state->unkE = 0;
         return LT_INC_AND_PAUSE;
     case 2:
@@ -654,7 +654,7 @@ u32 sub_81CB888(s32 taskState)
     {
     case 0:
         if (!state->unkE)
-            PlaySE(SE_TOREOFF);
+            PlaySE(SE_POKENAV_HANG_UP);
 
         PlaySE(SE_SELECT);
         break;
diff --git a/src/pokenav_menu_handler_1.c b/src/pokenav_menu_handler_1.c
index bd33a21af..d8d8e1509 100644
--- a/src/pokenav_menu_handler_1.c
+++ b/src/pokenav_menu_handler_1.c
@@ -273,14 +273,14 @@ static u32 HandleMainMenuInputTutorial(struct Pokenav1Struct *state)
         }
         else
         {
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             return POKENAV_MENU_FUNC_NONE;
         }
     }
     
     if (gMain.newKeys & B_BUTTON)
     {
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         return POKENAV_MENU_FUNC_NONE;
     }
     
@@ -298,7 +298,7 @@ static u32 HandleMainMenuInputEndTutorial(struct Pokenav1Struct *state)
         u32 menuItem = sMenuItems[state->menuType][state->cursorPos];
         if (menuItem != POKENAV_MENUITEM_MATCH_CALL && menuItem != POKENAV_MENUITEM_SWITCH_OFF)
         {
-            PlaySE(SE_HAZURE);
+            PlaySE(SE_FAILURE);
             return POKENAV_MENU_FUNC_NONE;
         }
         else if (menuItem == POKENAV_MENUITEM_MATCH_CALL)
diff --git a/src/pokenav_menu_handler_2.c b/src/pokenav_menu_handler_2.c
index 86ad8c744..2be92013f 100644
--- a/src/pokenav_menu_handler_2.c
+++ b/src/pokenav_menu_handler_2.c
@@ -465,7 +465,7 @@ static u32 LoopedTask_OpenMenu(s32 state)
             PokenavFadeScreen(1);
         else
         {
-            PlaySE(SE_PN_ON);
+            PlaySE(SE_POKENAV_ON);
             PokenavFadeScreen(3);
         }
         switch (GetPokenavMenuType())
@@ -675,7 +675,7 @@ static u32 LoopedTask_SelectRibbonsNoWinners(s32 state)
     switch (state)
     {
     case 0:
-        PlaySE(SE_HAZURE);
+        PlaySE(SE_FAILURE);
         PrintNoRibbonWinners();
         return LT_INC_AND_PAUSE;
     case 1:
diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index 986a2d3a2..f47ab5e89 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -1565,7 +1565,7 @@ static void Task_DuoFightAnim(u8 taskId)
     BlendPalettes(-1, 0x10, 0);
     BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
     SetVBlankCallback(VBlankCB_DuoFight);
-    PlaySE(SE_T_OOAME);
+    PlaySE(SE_DOWNPOUR);
 }
 
 static void sub_81D7228(u8 taskId)
@@ -1670,14 +1670,14 @@ static void Task_HandleDuoFight(u8 taskId)
 
 static void sub_81D7438(void)
 {
-    PlaySE(SE_T_KAMI);
+    PlaySE(SE_THUNDER);
     sub_80A2C44(0x7FFF, 0, 0x10, 0, -1, 0, 0);
     sub_80A2C44(0xFFFF0000, 0, 0x10, 0, 0, 0, 1);
 }
 
 static void sub_81D7480(void)
 {
-    PlaySE(SE_T_KAMI);
+    PlaySE(SE_THUNDER);
     sub_80A2C44(0x7FFF, 0, 0x10, 0x10, -1, 0, 0);
     sub_80A2C44(0xFFFF0000, 0, 0x10, 0x10, 0, 0, 1);
 }
@@ -1714,7 +1714,7 @@ static void sub_81D752C(u8 taskId)
 
 static void DuoFightEnd(u8 taskId, s8 palDelay)
 {
-    PlaySE(SE_T_OOAME_E);
+    PlaySE(SE_DOWNPOUR_STOP);
     BeginNormalPaletteFade(0xFFFFFFFF, palDelay, 0, 0x10, RGB_BLACK);
     gTasks[taskId].func = Task_DuoFightEnd;
 }
@@ -1950,7 +1950,7 @@ static void sub_81D7E9C(void)
 static void Task_RayTakesFlightAnim(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
-    PlayNewMapMusic(MUS_REKKUU_KOURIN);
+    PlayNewMapMusic(MUS_RAYQUAZA_APPEARS);
     sub_81D7E10();
     sub_81D7E9C();
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_OBJ | BLDCNT_TGT2_BG1 | BLDCNT_EFFECT_BLEND);
@@ -2358,7 +2358,7 @@ static void Task_HandleRayCharges(u8 taskId)
     s16 *data = gTasks[taskId].data;
     sub_81D8BB4();
     if ((data[3] & 7) == 0 && data[0] <= 1 && data[1] <= 89)
-        PlaySE(SE_OP_BASYU);
+        PlaySE(SE_INTRO_BLAST);
 
     data[3]++;
     switch (data[0])
@@ -2777,7 +2777,7 @@ static void sub_81D9528(struct Sprite *sprite)
     }
 
     if (sprite->data[4] % 64 == 0)
-        PlaySE(SE_W250);
+        PlaySE(SE_M_WHIRLPOOL);
 
     sprite->data[4]++;
 }
@@ -2802,7 +2802,7 @@ static void sub_81D961C(struct Sprite *sprite)
     {
         sub_81D97E0(sprite);
         if (sprite->data[4] == 0)
-            PlaySE(SE_BT_START);
+            PlaySE(SE_MUGSHOT);
         if (sprite->data[4] == -3)
             sub_81D9868(sprite, 2, 48, 16);
     }
@@ -2900,7 +2900,7 @@ static void sub_81D98B4(u8 taskId)
         break;
     case 1:
         if (data[5] == 8)
-            PlaySE(SE_JIDO_DOA);
+            PlaySE(SE_SLIDING_DOOR);
         if (data[2] == 2)
         {
             data[0]++;
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 128e40163..6c0a02d8c 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -302,7 +302,7 @@ static void Task_RecordMixing_SoundEffect(u8 taskId)
 {
     if (++gTasks[taskId].tCounter == 50)
     {
-        PlaySE(SE_W213);
+        PlaySE(SE_M_ATTRACT);
         gTasks[taskId].tCounter = 0;
     }
 }
@@ -343,7 +343,7 @@ static void Task_RecordMixing_Main(u8 taskId)
     case 2:
         data[10] = CreateTask(Task_DoRecordMixing, 10);
         tState = 3;
-        PlaySE(SE_W226);
+        PlaySE(SE_M_BATON_PASS);
         break;
     case 3: // wait for Task_DoRecordMixing
         if (!gTasks[data[10]].isActive)
diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
index c948cde4c..204eb6733 100644
--- a/src/reset_rtc_screen.c
+++ b/src/reset_rtc_screen.c
@@ -611,7 +611,7 @@ static void Task_ResetRtcScreen(u8 taskId)
         if (TrySavingData(SAVE_NORMAL) == SAVE_STATUS_OK)
         {
             ShowMessage(gText_SaveCompleted);
-            PlaySE(SE_PINPON);
+            PlaySE(SE_DING_DONG);
         }
         else
         {
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
index 340fc58dd..162eb3e6d 100644
--- a/src/rotating_gate.c
+++ b/src/rotating_gate.c
@@ -776,7 +776,7 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite)
         if (GetPlayerSpeed() != 1)
             affineAnimation += 8;
 
-        PlaySE(SE_HI_TURUN);
+        PlaySE(SE_ROTATING_GATE);
         StartSpriteAffineAnim(sprite, affineAnimation);
     }
     else if (rotationDirection == ROTATE_CLOCKWISE)
@@ -786,7 +786,7 @@ static void SpriteCallback_RotatingGate(struct Sprite *sprite)
         if (GetPlayerSpeed() != 1)
             affineAnimation += 8;
 
-        PlaySE(SE_HI_TURUN);
+        PlaySE(SE_ROTATING_GATE);
         StartSpriteAffineAnim(sprite, affineAnimation);
     }
 
diff --git a/src/roulette.c b/src/roulette.c
index 4ca892912..a0d1a7dc0 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -1522,7 +1522,7 @@ static void Task_HandleBetGridInput(u8 taskId)
         }
         else
         {
-            m4aSongNumStart(SE_REGI);
+            m4aSongNumStart(SE_SHOP);
             gTasks[taskId].func = Task_PlaceBet;
         }
     }
@@ -1679,7 +1679,7 @@ static void Task_RollBall(u8 taskId)
     gTasks[taskId].tBallNum++;
     gTasks[taskId].tTotalBallNum++;
     SetBallCounterNumLeft(BALLS_PER_ROUND - gTasks[taskId].tBallNum);
-    m4aSongNumStart(SE_TAMAKORO);
+    m4aSongNumStart(SE_ROULETTE_BALL);
     gTasks[taskId].func = Task_RecordBallHit;
 }
 
@@ -1804,14 +1804,14 @@ static void Task_PrintSpinResult(u8 taskId)
     case 2: // never happens
         if (gTasks[taskId].tMultiplier == MAX_MULTIPLIER)
         {
-            PlayFanfare(MUS_ME_B_BIG);
+            PlayFanfare(MUS_SLOTS_JACKPOT);
             DrawStdWindowFrame(sTextWindowId, FALSE);
             AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_Jackpot, 0, 1, TEXT_SPEED_FF, NULL);
             CopyWindowToVram(sTextWindowId, 3);
         }
         else
         {
-            PlayFanfare(MUS_ME_B_SMALL);
+            PlayFanfare(MUS_SLOTS_WIN);
             DrawStdWindowFrame(sTextWindowId, FALSE);
             AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_ItsAHit, 0, 1, TEXT_SPEED_FF, NULL);
             CopyWindowToVram(sTextWindowId, 3);
@@ -1819,7 +1819,7 @@ static void Task_PrintSpinResult(u8 taskId)
         break;
     case FALSE:
     default:
-        m4aSongNumStart(SE_HAZURE);
+        m4aSongNumStart(SE_FAILURE);
         DrawStdWindowFrame(sTextWindowId, FALSE);
         AddTextPrinterParameterized(sTextWindowId, 1, Roulette_Text_NothingDoing, 0, 1, TEXT_SPEED_FF, NULL);
         CopyWindowToVram(sTextWindowId, 3);
@@ -3924,7 +3924,7 @@ static void HideWheelBalls(void)
     UpdateBallRelativeWheelAngle(sprite);                                                           \
     sprite->sBallWheelAngle = (sprite->sBallWheelAngle / DEGREES_PER_SLOT) * DEGREES_PER_SLOT + 15; \
     sprite->callback = SpriteCB_BallLandInSlot;                                                     \
-    m4aSongNumStartOrChange(SE_HASHI);                                                              \
+    m4aSongNumStartOrChange(SE_BRIDGE_WALK);                                                              \
 }
 
 // "wheelAngle" and "sBallAngle" are relative to the screen (e.g. 180 degrees for either is always screen bottom)
@@ -4136,7 +4136,7 @@ static void SpriteCB_UnstickBall_TaillowPickUp(struct Sprite *sprite)
             sprite->animEnded = FALSE;
             sprite->data[2] = 0;
             sprite->callback = SpriteCB_UnstickBall_TaillowDrop;
-            m4aSongNumStart(SE_NAGERU);
+            m4aSongNumStart(SE_BALL_THROW);
         }
     }
 }
@@ -4203,7 +4203,7 @@ static void SpriteCB_RollBall_TryLandAdjacent(struct Sprite *sprite)
         {
             // Ball is stuck, need Shroomish/Taillow to clear ball
             sprite->animPaused = TRUE;
-            m4aSongNumStart(SE_KON);
+            m4aSongNumStart(SE_BALL_BOUNCE_1);
             SetBallStuck(sprite);
         }
     }
@@ -4224,7 +4224,7 @@ static void SpriteCB_RollBall_TryLand(struct Sprite *sprite)
         // Space has already been landed on, try to fall into adjacent space
         u8 slotId;
         u32 fallRight;
-        m4aSongNumStart(SE_KON);
+        m4aSongNumStart(SE_BALL_BOUNCE_1);
         fallRight = Random() & 1;
         if (fallRight)
         {
@@ -4319,7 +4319,7 @@ static void SpriteCB_RollBall_Fast(struct Sprite *sprite)
     if (sRoulette->ballDistToCenter > 60.0f)
         return;
 
-    m4aSongNumStartOrChange(SE_TAMAKORO_E);
+    m4aSongNumStartOrChange(SE_ROULETTE_BALL2);
     sRoulette->ballFallSpeed = -(20.0f / (float)(sRoulette->ballTravelDistMed));
     sRoulette->ballAngleAccel = ((1.0f - sRoulette->ballAngleSpeed) / (float)(sRoulette->ballTravelDistMed));
     sprite->animNum = 1;
@@ -4573,7 +4573,7 @@ static void SpriteCB_ShroomishFall(struct Sprite *sprite)
         gSprites[sprite->sMonShadowSpriteId].data[1] = -2;
         gSprites[sprite->sBallShadowSpriteId].invisible = FALSE;
         gSprites[sprite->sBallShadowSpriteId].callback  = SpriteCB_ShroomishShakeScreen;
-        m4aSongNumStart(SE_W070);
+        m4aSongNumStart(SE_M_STRENGTH);
     }
 }
 
@@ -4596,7 +4596,7 @@ static void SpriteCB_Shroomish(struct Sprite *sprite)
 
         sprite->invisible = FALSE;
         sprite->data[7]++;
-        m4aSongNumStart(SE_RU_HYUU);
+        m4aSongNumStart(SE_FALL);
         sRoulette->shroomishShadowTimer = 1;
         sRoulette->shroomishShadowAlpha = sShroomishShadowAlphas[0];
     }
@@ -4643,7 +4643,7 @@ static void SpriteCB_Taillow_FlyAway(struct Sprite *sprite)
         sprite->callback = SpriteCallbackDummy;
         sprite->invisible = TRUE;
         sprite->animPaused = TRUE;
-        m4aSongNumStop(SE_BASABASA);
+        m4aSongNumStop(SE_TAILLOW_WING_FLAP);
         DestroySprite(sprite);
         FreeOamMatrix(gSprites[sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1]].oam.matrixNum);
         DestroySprite(&gSprites[sRoulette->spriteIds[SPR_CLEAR_MON_SHADOW_1]]);
@@ -4674,7 +4674,7 @@ static void SpriteCB_Taillow_PickUpBall(struct Sprite *sprite)
         }
         else
         {
-            m4aSongNumStart(SE_RU_HYUU);
+            m4aSongNumStart(SE_FALL);
             StartSpriteAnim(sprite, sRoulette->ball->sStuckOnWheelLeft + 4);
             sprite->callback = SpriteCB_Taillow_FlyAway;
             gSprites[sprite->sMonShadowSpriteId].affineAnimPaused = FALSE;
@@ -4715,7 +4715,7 @@ static void SpriteCB_Taillow_FlyIn(struct Sprite *sprite)
         }
         else
         {
-            m4aSongNumStartOrChange(SE_BASABASA);
+            m4aSongNumStartOrChange(SE_TAILLOW_WING_FLAP);
             if (sRoulette->ball->sStuckOnWheelLeft == 0)
                 PlayCry1(SPECIES_TAILLOW, 63);
             else
@@ -4770,5 +4770,5 @@ static void SpriteCB_Taillow(struct Sprite *sprite)
     }
     gSprites[sprite->sMonShadowSpriteId].callback = SpriteCB_TaillowShadow_FlyIn;
     gSprites[sprite->sMonSpriteId].callback = SpriteCB_Taillow_FlyIn;
-    m4aSongNumStart(SE_RU_HYUU);
+    m4aSongNumStart(SE_FALL);
 }
diff --git a/src/shop.c b/src/shop.c
index 4fc44beee..5cba2767d 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -1089,7 +1089,7 @@ static void BuyMenuSubtractMoney(u8 taskId)
 {
     IncrementGameStat(GAME_STAT_SHOPPED);
     RemoveMoney(&gSaveBlock1Ptr->money, gShopDataPtr->totalCost);
-    PlaySE(SE_REGI);
+    PlaySE(SE_SHOP);
     PrintMoneyAmountInMoneyBox(0, GetMoney(&gSaveBlock1Ptr->money), 0);
 
     if (gMartInfo.martType == MART_TYPE_NORMAL)
diff --git a/src/slot_machine.c b/src/slot_machine.c
index 8669b543b..9d19fc9a7 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -1220,7 +1220,7 @@ static bool8 SlotAction_HandleBetInput(struct Task *task)
             sSlotMachine->coins -= (MAX_BET - sSlotMachine->bet);
             sSlotMachine->bet = MAX_BET;
             sSlotMachine->state = SLOT_ACTION_START_SPIN;
-            PlaySE(SE_REGI);
+            PlaySE(SE_SHOP);
         }
         else  // you didn't have enough coins to bet the max
         {
@@ -1232,7 +1232,7 @@ static bool8 SlotAction_HandleBetInput(struct Task *task)
         // Increase bet
         if (JOY_NEW(DPAD_DOWN) && sSlotMachine->coins != 0)
         {
-            PlaySE(SE_REGI);
+            PlaySE(SE_SHOP);
             LightenBetTiles(sSlotMachine->bet);
             sSlotMachine->coins--;
             sSlotMachine->bet++;
@@ -1335,7 +1335,7 @@ static bool8 SlotAction_AwaitReelStop(struct Task *task)
 {
     if (JOY_NEW(A_BUTTON))
     {
-        PlaySE(SE_JYUNI);
+        PlaySE(SE_CONTEST_PLACE);
         StopSlotReel(sSlotMachine->currReel);
         PressStopReelButton(sSlotMachine->currReel);
         sSlotMachine->state = SLOT_ACTION_AWAIT_ALL_REELS_STOP;
@@ -1381,17 +1381,17 @@ static bool8 SlotAction_CheckMatches(struct Task *task)
         }
         if (sSlotMachine->matchedSymbols & ((1 << MATCHED_777_BLUE) | (1 << MATCHED_777_RED)))
         {
-            PlayFanfare(MUS_ME_B_BIG);
+            PlayFanfare(MUS_SLOTS_JACKPOT);
             CreateDigitalDisplayScene(DIG_DISPLAY_BONUS_BIG);
         }
         else if (sSlotMachine->matchedSymbols & (1 << MATCHED_777_MIXED))
         {
-            PlayFanfare(MUS_ME_B_BIG);
+            PlayFanfare(MUS_SLOTS_JACKPOT);
             CreateDigitalDisplayScene(DIG_DISPLAY_BONUS_REG);
         }
         else
         {
-            PlayFanfare(MUS_ME_B_SMALL);
+            PlayFanfare(MUS_SLOTS_WIN);
             CreateDigitalDisplayScene(DIG_DISPLAY_WIN);
         }
         // if you matched 777...
@@ -3098,7 +3098,7 @@ static void ReelTime_Init(struct Task *task)
     CreateReelTimeNumberGapSprite();
     GetReeltimeDraw();
     StopMapMusic();
-    PlayNewMapMusic(MUS_BD_TIME);
+    PlayNewMapMusic(MUS_ROULETTE);
 }
 
 static void ReelTime_WindowEnter(struct Task *task)
@@ -3240,7 +3240,7 @@ static void ReelTime_PikachuReact(struct Task *task)
         {
             task->data[4] = 0xa0;
             StartSpriteAnimIfDifferent(&gSprites[sSlotMachine->reelTimePikachuSpriteId], 5);
-            PlayFanfare(MUS_ME_ZANNEN);
+            PlayFanfare(MUS_TOO_BAD);
         }
         else
         {
@@ -3252,7 +3252,7 @@ static void ReelTime_PikachuReact(struct Task *task)
                 ResetPikaPowerBolts();
                 sSlotMachine->pikaPower = 0;
             }
-            PlayFanfare(MUS_ME_B_SMALL);
+            PlayFanfare(MUS_SLOTS_WIN);
         }
     }
 }
@@ -3328,8 +3328,8 @@ static void ReelTime_ExplodeMachine(struct Task *task)
     task->data[4] = 4;
     task->data[5] = 0;
     StopMapMusic();
-    PlayFanfare(MUS_ME_ZANNEN);
-    PlaySE(SE_W153);
+    PlayFanfare(MUS_TOO_BAD);
+    PlaySE(SE_M_EXPLOSION);
 }
 
 static void ReelTime_WaitExplode(struct Task *task)
diff --git a/src/sound.c b/src/sound.c
index dba4354df..361624b44 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -41,24 +41,24 @@ static void Task_DuckBGMForPokemonCry(u8 taskId);
 static void RestoreBGMVolumeAfterPokemonCry(void);
 
 static const struct Fanfare sFanfares[] = {
-    { MUS_FANFA1,        80 },
-    { MUS_FANFA4,       160 },
-    { MUS_FANFA5,       220 },
-    { MUS_ME_WAZA,      220 },
-    { MUS_ME_ASA,       160 },
-    { MUS_ME_BACHI,     340 },
-    { MUS_ME_WASURE,    180 },
-    { MUS_ME_KINOMI,    120 },
-    { MUS_ME_TAMA,      710 },
-    { MUS_ME_B_BIG,     250 },
-    { MUS_ME_B_SMALL,   150 },
-    { MUS_ME_ZANNEN,    160 },
-    { MUS_RG_POKEFUE,   450 },
-    { MUS_RG_FAN5,      170 },
-    { MUS_RG_FAN2,      196 },
-    { MUS_ME_POINTGET,  313 },
-    { MUS_ME_SYMBOLGET, 318 },
-    { MUS_ME_TORE_EYE,  135 },
+    { MUS_LEVEL_UP,        80 },
+    { MUS_OBTAIN_ITEM,       160 },
+    { MUS_EVOLVED,       220 },
+    { MUS_OBTAIN_TMHM,      220 },
+    { MUS_HEAL,       160 },
+    { MUS_OBTAIN_BADGE,     340 },
+    { MUS_MOVE_DELETED,    180 },
+    { MUS_OBTAIN_BERRY,    120 },
+    { MUS_AWAKEN_LEGEND,      710 },
+    { MUS_SLOTS_JACKPOT,     250 },
+    { MUS_SLOTS_WIN,   150 },
+    { MUS_TOO_BAD,    160 },
+    { MUS_RG_POKE_FLUTE,   450 },
+    { MUS_RG_OBTAIN_KEY_ITEM,      170 },
+    { MUS_RG_DEX_RATING,      196 },
+    { MUS_OBTAIN_B_POINTS,  313 },
+    { MUS_OBTAIN_SYMBOL, 318 },
+    { MUS_REGISTER_MATCH_CALL,  135 },
 };
 
 #define CRY_VOLUME  120 // was 125 in R/S
diff --git a/src/strings.c b/src/strings.c
index 07361ba60..fe5051d71 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -402,7 +402,7 @@ const u8 gText_PkmnNeedsToReplaceMove[] = _("{STR_VAR_1} wants to learn the\nmov
 const u8 gText_StopLearningMove2[] = _("Stop trying to teach\n{STR_VAR_2}?");
 const u8 gText_MoveNotLearned[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}");
 const u8 gText_WhichMoveToForget[] = _("Which move should be forgotten?{PAUSE_UNTIL_PRESS}");
-const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_KON}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd…{PAUSE_UNTIL_PRESS}");
+const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd…{PAUSE_UNTIL_PRESS}");
 const u8 gText_PkmnAlreadyKnows[] = _("{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}");
 const u8 gText_PkmnHPRestoredByVar2[] = _("{STR_VAR_1}'s HP was restored\nby {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}");
 const u8 gText_PkmnCuredOfPoison[] = _("{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}");
@@ -1294,7 +1294,7 @@ const u8 gText_HatchedFromEgg[] = _("{STR_VAR_1} hatched from the EGG!");
 const u8 gText_NicknameHatchPrompt[] = _("Would you like to nickname the newly\nhatched {STR_VAR_1}?");
 ALIGNED(4) const u8 gText_ReadyToBerryCrush[] = _("Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p");
 ALIGNED(4) const u8 gText_WaitForAllChooseBerry[] = _("Please wait while each member\nchooses a BERRY.");
-ALIGNED(4) const u8 gText_EndedWithXUnitsPowder[] = _("{PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p");
+ALIGNED(4) const u8 gText_EndedWithXUnitsPowder[] = _("{PAUSE_MUSIC}{PLAY_BGM MUS_LEVEL_UP}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p");
 ALIGNED(4) const u8 gText_RecordingGameResults[] = _("Recording your game results in the\nsave file.\lPlease wait.");
 ALIGNED(4) const u8 gText_PlayBerryCrushAgain[] = _("Want to play BERRY CRUSH again?");
 ALIGNED(4) const u8 gText_YouHaveNoBerries[] = _("You have no BERRIES.\nThe game will be canceled.");
@@ -1745,7 +1745,7 @@ const u8 gText_MoveRelearnerTeachMoveConfirm[] = _("Teach {STR_VAR_2}?");
 const u8 gText_MoveRelearnerPkmnLearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}!");
 const u8 gText_MoveRelearnerPkmnTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?");
 const u8 gText_MoveRelearnerStopTryingToTeachMove[] = _("Stop trying to teach\n{STR_VAR_2}?");
-const u8 gText_MoveRelearnerAndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_KON}Poof!\p");
+const u8 gText_MoveRelearnerAndPoof[] = _("{PAUSE 32}1, {PAUSE 15}2, and {PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p");
 const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd…\p{STR_VAR_1} learned {STR_VAR_2}.");
 const u8 gText_MoveRelearnedPkmnDidNotLearnMove[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}."); // Unused
 const u8 gText_MoveRelearnerGiveUp[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?");
diff --git a/src/title_screen.c b/src/title_screen.c
index aa91351df..108601685 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -609,7 +609,7 @@ void CB2_InitTitleScreen(void)
                                     | DISPCNT_OBJ_ON
                                     | DISPCNT_WIN0_ON
                                     | DISPCNT_OBJWIN_ON);
-        m4aSongNumStart(MUS_TITLE3);
+        m4aSongNumStart(MUS_TITLE);
         gMain.state = 5;
         break;
     case 5:
diff --git a/src/trade.c b/src/trade.c
index 17967733a..6480f3594 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -570,7 +570,7 @@ static void CB2_CreateTradeMenu(void)
         sTradeMenuData->bg3hofs = 0;
         SetTradePartyMonsVisible();
         gMain.state++;
-        PlayBGM(MUS_P_SCHOOL);
+        PlayBGM(MUS_SCHOOL);
         break;
     case 15:
         SetTradePartyLiveStatuses(TRADE_PARTNER);
@@ -2573,7 +2573,7 @@ static void sub_807AA28(struct Sprite *sprite)
 {
     if (++sprite->data[0] == 10)
     {
-        PlaySE(SE_BOWA);
+        PlaySE(SE_BALL);
         sprite->data[0] = 0;
     }
 }
@@ -2582,7 +2582,7 @@ static void sub_807AA4C(struct Sprite *sprite)
 {
     if (!sprite->invisible && ++sprite->data[0] == 10)
     {
-        PlaySE(SE_W207B);
+        PlaySE(SE_M_SWAGGER2);
         sprite->data[0] = 0;
     }
 }
@@ -2620,7 +2620,7 @@ static void sub_807AB04(struct Sprite *sprite)
 {
     if (++sprite->data[0] == 15)
     {
-        PlaySE(SE_W107);
+        PlaySE(SE_M_MINIMIZE);
         sprite->data[0] = 0;
     }
 }
@@ -3289,7 +3289,7 @@ static bool8 AnimateTradeSequenceCable(void)
         gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y = gMonFrontPicCoords[sTradeData->monSpecies[TRADE_PLAYER]].y_offset;
         sTradeData->state++;
         sTradeData->cachedMapMusic = GetCurrentMapMusic();
-        PlayNewMapMusic(MUS_SHINKA);
+        PlayNewMapMusic(MUS_EVOLUTION);
         break;
     case 1:
         if (sTradeData->bg2hofs > 0)
@@ -3449,7 +3449,7 @@ static bool8 AnimateTradeSequenceCable(void)
     case 32:
         if (!gPaletteFade.active)
         {
-            PlaySE(SE_TK_WARPOUT);
+            PlaySE(SE_WARP_OUT);
             sTradeData->state++;
         }
         gSprites[sTradeData->unk_90].pos2.y -= 3;
@@ -3503,7 +3503,7 @@ static bool8 AnimateTradeSequenceCable(void)
         gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PARTNER]].pos2.y += 3;
         if (gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y < -160 && gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y >= -163)
         {
-            PlaySE(SE_TK_WARPIN);
+            PlaySE(SE_WARP_IN);
         }
         if (gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y < -222)
         {
@@ -3600,7 +3600,7 @@ static bool8 AnimateTradeSequenceCable(void)
             DestroySprite(&gSprites[sTradeData->unk_91]);
             SetTradeSequenceBgGpuRegs(6);
             sTradeData->state++;
-            PlaySE(SE_W028);
+            PlaySE(SE_M_SAND_ATTACK);
         }
         break;
     case 51:
@@ -3704,7 +3704,7 @@ static bool8 AnimateTradeSequenceCable(void)
     case 68:
         if (++sTradeData->timer == 10)
         {
-            PlayFanfare(MUS_FANFA5);
+            PlayFanfare(MUS_EVOLVED);
         }
         if (sTradeData->timer == 250)
         {
@@ -3781,7 +3781,7 @@ static bool8 AnimateTradeSequenceWireless(void)
         gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y = gMonFrontPicCoords[sTradeData->monSpecies[TRADE_PLAYER]].y_offset;
         sTradeData->state++;
         sTradeData->cachedMapMusic = GetCurrentMapMusic();
-        PlayNewMapMusic(MUS_SHINKA);
+        PlayNewMapMusic(MUS_EVOLUTION);
         break;
     case 1:
         if (sTradeData->bg2hofs > 0)
@@ -3946,7 +3946,7 @@ static bool8 AnimateTradeSequenceWireless(void)
     case 32:
         if (!gPaletteFade.active)
         {
-            PlaySE(SE_TK_WARPOUT);
+            PlaySE(SE_WARP_OUT);
             sTradeData->state++;
         }
         gSprites[sTradeData->unk_90].pos2.y -= 3;
@@ -4001,7 +4001,7 @@ static bool8 AnimateTradeSequenceWireless(void)
         gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PARTNER]].pos2.y += 3;
         if (gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y < -160 && gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y >= -163)
         {
-            PlaySE(SE_TK_WARPIN);
+            PlaySE(SE_WARP_IN);
         }
         if (gSprites[sTradeData->pokePicSpriteIdxs[TRADE_PLAYER]].pos2.y < -222)
         {
@@ -4116,7 +4116,7 @@ static bool8 AnimateTradeSequenceWireless(void)
             DestroySprite(&gSprites[sTradeData->unk_91]);
             SetTradeSequenceBgGpuRegs(6);
             sTradeData->state++;
-            PlaySE(SE_W028);
+            PlaySE(SE_M_SAND_ATTACK);
         }
         break;
     case 51:
@@ -4219,7 +4219,7 @@ static bool8 AnimateTradeSequenceWireless(void)
     case 68:
         if (++sTradeData->timer == 10)
         {
-            PlayFanfare(MUS_FANFA5);
+            PlayFanfare(MUS_EVOLVED);
         }
         if (sTradeData->timer == 250)
         {
@@ -4361,10 +4361,10 @@ static void sub_807E5D8(struct Sprite *sprite)
 {
     sprite->pos2.y += sTradeBallVerticalVelocityTable[sprite->data[0]];
     if (sprite->data[0] == 22)
-        PlaySE(SE_KON);
+        PlaySE(SE_BALL_BOUNCE_1);
     if (++ sprite->data[0] == 44)
     {
-        PlaySE(SE_W025);
+        PlaySE(SE_M_MEGA_KICK);
         sprite->callback = sub_807E64C;
         sprite->data[0] = 0;
         BeginNormalPaletteFade(1 << (16 + sprite->oam.paletteNum), -1, 0, 16, RGB_WHITEALPHA);
@@ -4394,17 +4394,17 @@ static void sub_807E6AC(struct Sprite *sprite)
         {
             sprite->data[2] ++;
             sprite->data[0] = 0x16;
-            PlaySE(SE_KON);
+            PlaySE(SE_BALL_BOUNCE_1);
         }
     }
     else
     {
         if (sprite->data[0] == 0x42)
-            PlaySE(SE_KON2);
+            PlaySE(SE_BALL_BOUNCE_2);
         if (sprite->data[0] == 0x5c)
-            PlaySE(SE_KON3);
+            PlaySE(SE_BALL_BOUNCE_3);
         if (sprite->data[0] == 0x6b)
-            PlaySE(SE_KON4);
+            PlaySE(SE_BALL_BOUNCE_4);
         sprite->pos2.y += sTradeBallVerticalVelocityTable[sprite->data[0]];
         if (++sprite->data[0] == 0x6c)
             sprite->callback = SpriteCallbackDummy;
@@ -4809,7 +4809,7 @@ static void Task_AnimateWirelessSignal(u8 taskId)
     }
 
     if (sWirelessSignalTiming[idx][0] == 0 && counter == 0)
-        PlaySE(SE_W215);
+        PlaySE(SE_M_HEAL_BELL);
 
     if (counter == sWirelessSignalTiming[idx][1])
     {
diff --git a/src/trainer_card.c b/src/trainer_card.c
index c374fad07..9d6838176 100755
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -422,7 +422,7 @@ static void Task_TrainerCard(u8 taskId)
     case 8:
         if (!UpdatePaletteFade() && !IsDma3ManagerBusyWithBgCopy())
         {
-            PlaySE(SE_RG_CARD3);
+            PlaySE(SE_RG_CARD_OPEN);
             sData->mainState = STATE_HANDLE_INPUT_FRONT;
         }
         break;
@@ -441,7 +441,7 @@ static void Task_TrainerCard(u8 taskId)
         if (gMain.newKeys & A_BUTTON)
         {
             FlipTrainerCard();
-            PlaySE(SE_RG_CARD1);
+            PlaySE(SE_RG_CARD_FLIP);
             sData->mainState = STATE_WAIT_FLIP_TO_BACK;
         }
         else if (gMain.newKeys & B_BUTTON)
@@ -460,7 +460,7 @@ static void Task_TrainerCard(u8 taskId)
     case STATE_WAIT_FLIP_TO_BACK:
         if (IsCardFlipTaskActive() && sub_8087598() != TRUE)
         {
-            PlaySE(SE_RG_CARD3);
+            PlaySE(SE_RG_CARD_OPEN);
             sData->mainState = STATE_HANDLE_INPUT_BACK;
         }
         break;
@@ -480,7 +480,7 @@ static void Task_TrainerCard(u8 taskId)
             {
                 FlipTrainerCard();
                 sData->mainState = STATE_WAIT_FLIP_TO_FRONT;
-                PlaySE(SE_RG_CARD1);
+                PlaySE(SE_RG_CARD_FLIP);
             }
         }
         else if (gMain.newKeys & A_BUTTON)
@@ -518,7 +518,7 @@ static void Task_TrainerCard(u8 taskId)
         if (IsCardFlipTaskActive() && sub_8087598() != TRUE)
         {
             sData->mainState = STATE_HANDLE_INPUT_FRONT;
-            PlaySE(SE_RG_CARD3);
+            PlaySE(SE_RG_CARD_OPEN);
         }
         break;
    }
@@ -1730,7 +1730,7 @@ static bool8 Task_SetCardFlipped(struct Task* task)
     sData->onBack ^= 1;
     task->tFlipState++;
     sData->allowDMACopy = TRUE;
-    PlaySE(SE_RG_CARD2);
+    PlaySE(SE_RG_CARD_FLIPPING);
     return FALSE;
 }
 
diff --git a/src/union_room.c b/src/union_room.c
index 639420d71..f79dd9cc4 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -1018,13 +1018,13 @@ static void Task_TryJoinLinkGroup(u8 taskId)
                         // Trading is allowed, or not trading at all
                         AskToJoinRfuGroup(data, id);
                         data->state = LG_STATE_ASK_JOIN_GROUP;
-                        PlaySE(SE_PN_ON);
+                        PlaySE(SE_POKENAV_ON);
                     }
                     else
                     {
                         StringCopy(gStringVar4, sCantTransmitToTrainerTexts[readyStatus - 1]);
                         data->state = LG_STATE_TRADE_NOT_READY;
-                        PlaySE(SE_PN_ON);
+                        PlaySE(SE_POKENAV_ON);
                     }
                 }
                 else
@@ -2118,7 +2118,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
                     RedrawListMenu(data->listTaskId);
                     IntlConvPartnerUname7(gStringVar1, &data->field_0->arr[data->leaderId]);
                     CreateTask_RfuReconnectWithParent(data->field_0->arr[data->leaderId].gname_uname.playerName, ReadAsU16(data->field_0->arr[data->leaderId].gname_uname.gname.unk_00.playerTrainerId));
-                    PlaySE(SE_PN_ON);
+                    PlaySE(SE_POKENAV_ON);
                     data->state = 4;
                 }
                 else
@@ -2279,7 +2279,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId)
                         LoadWirelessStatusIndicatorSpriteGfx();
                         CreateWirelessStatusIndicatorSprite(0, 0);
                         CreateTask_RfuReconnectWithParent(data->field_0->arr[0].gname_uname.playerName, ReadAsU16(data->field_0->arr[0].gname_uname.gname.unk_00.playerTrainerId));
-                        PlaySE(SE_PN_ON);
+                        PlaySE(SE_POKENAV_ON);
                         data->state = 4;
                     }
                     else
@@ -2846,7 +2846,7 @@ static void Task_RunUnionRoom(u8 taskId)
             uroom->state = UR_STATE_START_ACTIVITY_FREE_UROOM;
         break;
     case UR_STATE_PLAYER_CONTACTED_YOU:
-        PlaySE(SE_PINPON);
+        PlaySE(SE_DING_DONG);
         sub_800EF7C();
         uroom->state = UR_STATE_RECV_CONTACT_DATA;
         uroom->recvActivityRequest[0] = 0;