Merge pull request #1146 from GriffinRichards/rename-songs

Give songs meaningful english names

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

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

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

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

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
 

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

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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

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

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",

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",

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

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

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

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

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",

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",

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

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",

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",

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

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",

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",

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
 

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",

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

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

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",

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

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",

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",

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",

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

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",

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

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",

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",

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",

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

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",

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",

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",

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

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",

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",

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",

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",

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",

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",

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",

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

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",

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",

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",

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",

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

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",

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

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",

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

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",

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",

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",

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",

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",

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

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",

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",

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",

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",

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",

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",

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",

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",

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",