1 files changed, 234 insertions, 234 deletions

diff --git a/charmap.txt b/charmap.txt
index 705a2108e..04859174b 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -407,242 +407,242 @@ WHITE2 = 0F @ duplicate of white?
 
 @ sound and music
 
-MUS_DUMMY        = 00 00
-SE_USE_ITEM     = 01 00
-SE_PC_LOGIN    = 02 00
-SE_PC_OFF      = 03 00
-SE_PC_ON       = 04 00
-SE_SELECT      = 05 00
-SE_WIN_OPEN    = 06 00
-SE_WALL_HIT    = 07 00
-SE_DOOR        = 08 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_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_SUCCESS      = 1F 00
-SE_FAILURE      = 20 00
-SE_EXP         = 21 00
-SE_BIKE_HOP  = 22 00
-SE_SWITCH    = 23 00
-SE_CLICK    = 24 00
-SE_FU_ZAKU     = 25 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_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
-MUS_STOP       = 5D 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_DUMMY                 = 00 00
+SE_USE_ITEM               = 01 00
+SE_PC_LOGIN               = 02 00
+SE_PC_OFF                 = 03 00
+SE_PC_ON                  = 04 00
+SE_SELECT                 = 05 00
+SE_WIN_OPEN               = 06 00
+SE_WALL_HIT               = 07 00
+SE_DOOR                   = 08 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_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_SUCCESS                = 1F 00
+SE_FAILURE                = 20 00
+SE_EXP                    = 21 00
+SE_BIKE_HOP               = 22 00
+SE_SWITCH                 = 23 00
+SE_CLICK                  = 24 00
+SE_FU_ZAKU                = 25 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_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
+MUS_STOP                  = 5D 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    = 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_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_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               = 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_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_WEATHER_KYOGRE      = 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_VS_WILD   = C9 01
-MUS_VS_AQUA_MAGMA   = CA 01
-MUS_VS_TRAINER   = CB 01
-MUS_VS_GYM_LEADER   = CC 01
-MUS_VS_CHAMPION   = CD 01
-MUS_VS_REGI   = CE 01
-MUS_VS_KYOGRE_GROUDON   = CF 01
-MUS_VS_RIVAL   = D0 01
-MUS_VS_ELITE_FOUR   = D1 01
-MUS_VS_AQUA_MAGMA_LEADER   = D2 01
+MUS_INTRO_BATTLE          = BA 01
+MUS_WEATHER_KYOGRE        = 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_VS_WILD               = C9 01
+MUS_VS_AQUA_MAGMA         = CA 01
+MUS_VS_TRAINER            = CB 01
+MUS_VS_GYM_LEADER         = CC 01
+MUS_VS_CHAMPION           = CD 01
+MUS_VS_REGI               = CE 01
+MUS_VS_KYOGRE_GROUDON     = CF 01
+MUS_VS_RIVAL              = D0 01
+MUS_VS_ELITE_FOUR         = D1 01
+MUS_VS_AQUA_MAGMA_LEADER  = D2 01
 
 '\l' = FA @ scroll up window text
 '\p' = FB @ new paragraph