diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-31 13:42:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 13:42:41 -0400 |
| commit | 4cf09577950db22d7f0acf6ede45b8dca1c97156 (patch) | |
| tree | cb094078122b217fc67e2285614b79c6e83eaf88 | |
| parent | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff) | |
| parent | bb56d4a3f4cab33f899646e0630282fc6176a9c9 (diff) | |
Merge pull request #356 from GriffinRichards/rename-songs
Give songs meaningful english names
964 files changed, 8731 insertions, 8814 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 35314ac3f..86c2e2b1e 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -1603,12 +1603,12 @@ callstd STD_PUT_ITEM_AWAY .endm - .macro giveitem_msg msg:req, item:req, amount=1, fanfare=MUS_FANFA1 + .macro giveitem_msg msg:req, item:req, amount=1, fanfare=MUS_LEVEL_UP additem \item, \amount msgreceiveditem \msg, \item, \amount, \fanfare .endm - .macro msgreceiveditem msg:req, item:req, amount=1, fanfare=MUS_FANFA1 + .macro msgreceiveditem msg:req, item:req, amount=1, fanfare=MUS_LEVEL_UP loadword 0, \msg setorcopyvar VAR_0x8000, \item setorcopyvar VAR_0x8001, \amount diff --git a/charmap.txt b/charmap.txt index 442643919..a3e698e91 100644 --- a/charmap.txt +++ b/charmap.txt @@ -466,356 +466,355 @@ SKY_BLUE = 0D LIGHT_BLUE = 0E WHITE2 = 0F @ duplicate of white? -@ sound and music +@ sound -MUS_DUMMY = 00 00 -SE_STOP = 00 00 -SE_KAIFUKU = 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_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_PIN = 15 00 -SE_BOO = 16 00 -SE_BOWA = 17 00 -SE_JYUNI = 18 00 -SE_SEIKAI = 19 00 -SE_HAZURE = 1A 00 -SE_EXP = 1B 00 -SE_JITE_PYOKO = 1C 00 -SE_MU_PACHI = 1D 00 -SE_TK_KASYA = 1E 00 -SE_FU_ZAKU = 1F 00 -SE_FU_ZAKU2 = 20 00 -SE_FU_ZUZUZU = 21 00 -SE_RU_GASHIN = 22 00 -SE_RU_GASYAN = 23 00 -SE_RU_BARI = 24 00 -SE_RU_HYUU = 25 00 -SE_KI_GASYAN = 26 00 -SE_TK_WARPIN = 27 00 -SE_TK_WARPOUT = 28 00 -SE_TU_SAA = 29 00 -SE_HI_TURUN = 2A 00 -SE_TRACK_MOVE = 2B 00 -SE_TRACK_STOP = 2C 00 -SE_TRACK_HAIKI = 2D 00 -SE_TRACK_DOOR = 2E 00 -SE_MOTER = 2F 00 -SE_SAVE = 30 00 -SE_KON = 31 00 -SE_KON2 = 32 00 -SE_KON3 = 33 00 -SE_KON4 = 34 00 -SE_SUIKOMU = 35 00 -SE_NAGERU = 36 00 -SE_TOY_C = 37 00 -SE_TOY_D = 38 00 -SE_TOY_E = 39 00 -SE_TOY_F = 3A 00 -SE_TOY_G = 3B 00 -SE_TOY_A = 3C 00 -SE_TOY_B = 3D 00 -SE_TOY_C1 = 3E 00 -SE_MIZU = 3F 00 -SE_HASHI = 40 00 -SE_DAUGI = 41 00 -SE_PINPON = 42 00 -SE_FUUSEN1 = 43 00 -SE_FUUSEN2 = 44 00 -SE_FUUSEN3 = 45 00 -SE_TOY_KABE = 46 00 -SE_TOY_DANGO = 47 00 -SE_DOKU = 48 00 -SE_ESUKA = 49 00 -SE_T_AME = 4A 00 -SE_T_AME_E = 4B 00 -SE_T_OOAME = 4C 00 -SE_T_OOAME_E = 4D 00 -SE_T_KOAME = 4E 00 -SE_T_KOAME_E = 4F 00 -SE_T_KAMI = 50 00 -SE_T_KAMI2 = 51 00 -SE_ELEBETA = 52 00 -SE_HINSI = 53 00 -SE_EXPMAX = 54 00 -SE_TAMAKORO = 55 00 -SE_TAMAKORO_E = 56 00 -SE_BASABASA = 57 00 -SE_REGI = 58 00 -SE_C_GAJI = 59 00 -SE_C_MAKU_U = 5A 00 -SE_C_MAKU_D = 5B 00 -SE_C_PASI = 5C 00 -SE_C_SYU = 5D 00 -SE_C_PIKON = 5E 00 -SE_REAPOKE = 5F 00 -SE_OP_BASYU = 60 00 -SE_BT_START = 61 00 -SE_DENDOU = 62 00 -SE_JIHANKI = 63 00 -SE_TAMA = 64 00 -SE_Z_SCROLL = 65 00 -SE_Z_PAGE = 66 00 -SE_PN_ON = 67 00 -SE_PN_OFF = 68 00 -SE_Z_SEARCH = 69 00 -SE_TAMAGO = 6A 00 -SE_TB_START = 6B 00 -SE_TB_KON = 6C 00 -SE_TB_KARA = 6D 00 -SE_BIDORO = 6E 00 -SE_W085 = 6F 00 -SE_W085B = 70 00 -SE_W231 = 71 00 -SE_W171 = 72 00 -SE_W233 = 73 00 -SE_W233B = 74 00 -SE_W145 = 75 00 -SE_W145B = 76 00 -SE_W145C = 77 00 -SE_W240 = 78 00 -SE_W015 = 79 00 -SE_W081 = 7A 00 -SE_W081B = 7B 00 -SE_W088 = 7C 00 -SE_W016 = 7D 00 -SE_W016B = 7E 00 -SE_W003 = 7F 00 -SE_W104 = 80 00 -SE_W013 = 81 00 -SE_W196 = 82 00 -SE_W086 = 83 00 -SE_W004 = 84 00 -SE_W025 = 85 00 -SE_W025B = 86 00 -SE_W152 = 87 00 -SE_W026 = 88 00 -SE_W172 = 89 00 -SE_W172B = 8A 00 -SE_W053 = 8B 00 -SE_W007 = 8C 00 -SE_W092 = 8D 00 -SE_W221 = 8E 00 -SE_W221B = 8F 00 -SE_W052 = 90 00 -SE_W036 = 91 00 -SE_W059 = 92 00 -SE_W059B = 93 00 -SE_W010 = 94 00 -SE_W011 = 95 00 -SE_W017 = 96 00 -SE_W019 = 97 00 -SE_W028 = 98 00 -SE_W013B = 99 00 -SE_W044 = 9A 00 -SE_W029 = 9B 00 -SE_W057 = 9C 00 -SE_W056 = 9D 00 -SE_W250 = 9E 00 -SE_W030 = 9F 00 -SE_W039 = A0 00 -SE_W054 = A1 00 -SE_W077 = A2 00 -SE_W020 = A3 00 -SE_W082 = A4 00 -SE_W047 = A5 00 -SE_W195 = A6 00 -SE_W006 = A7 00 -SE_W091 = A8 00 -SE_W146 = A9 00 -SE_W120 = AA 00 -SE_W153 = AB 00 -SE_W071B = AC 00 -SE_W071 = AD 00 -SE_W103 = AE 00 -SE_W062 = AF 00 -SE_W062B = B0 00 -SE_W048 = B1 00 -SE_W187 = B2 00 -SE_W118 = B3 00 -SE_W155 = B4 00 -SE_W122 = B5 00 -SE_W060 = B6 00 -SE_W185 = B7 00 -SE_W014 = B8 00 -SE_W043 = B9 00 -SE_W207 = BA 00 -SE_W207B = BB 00 -SE_W215 = BC 00 -SE_W109 = BD 00 -SE_W173 = BE 00 -SE_W280 = BF 00 -SE_W202 = C0 00 -SE_W060B = C1 00 -SE_W076 = C2 00 -SE_W080 = C3 00 -SE_W100 = C4 00 -SE_W107 = C5 00 -SE_W166 = C6 00 -SE_W129 = C7 00 -SE_W115 = C8 00 -SE_W112 = C9 00 -SE_W197 = CA 00 -SE_W199 = CB 00 -SE_W236 = CC 00 -SE_W204 = CD 00 -SE_W268 = CE 00 -SE_W070 = CF 00 -SE_W063 = D0 00 -SE_W127 = D1 00 -SE_W179 = D2 00 -SE_W151 = D3 00 -SE_W201 = D4 00 -SE_W161 = D5 00 -SE_W161B = D6 00 -SE_W227 = D7 00 -SE_W227B = D8 00 -SE_W226 = D9 00 -SE_W208 = DA 00 -SE_W213 = DB 00 -SE_W213B = DC 00 -SE_W234 = DD 00 -SE_W260 = DE 00 -SE_W328 = DF 00 -SE_W320 = E0 00 -SE_W255 = E1 00 -SE_W291 = E2 00 -SE_W089 = E3 00 -SE_W239 = E4 00 -SE_W230 = E5 00 -SE_W281 = E6 00 -SE_W327 = E7 00 -SE_W287 = E8 00 -SE_W257 = E9 00 -SE_W253 = EA 00 -SE_W258 = EB 00 -SE_W322 = EC 00 -SE_W298 = ED 00 -SE_W287B = EE 00 -SE_W114 = EF 00 -SE_W063B = F0 00 -MUS_W_DOOR = F1 00 -SE_CARD1 = F2 00 -SE_CARD2 = F3 00 -SE_CARD3 = F4 00 -SE_BAG1 = F5 00 -SE_BAG2 = F6 00 -SE_GETTING = F7 00 -SE_SHOP = F8 00 -SE_KITEKI = F9 00 -SE_HELP_OP = FA 00 -SE_HELP_CL = FB 00 -SE_HELP_NG = FC 00 -SE_DEOMOV = FD 00 -SE_EXCELLENT = FE 00 -SE_NAWAMISS = FF 00 -MUS_ME_ASA = 00 01 -MUS_FANFA1 = 01 01 -MUS_FANFA4 = 02 01 -MUS_FANFA5 = 03 01 -MUS_ME_BACHI = 04 01 -MUS_ME_WAZA = 05 01 -MUS_ME_KINOMI = 06 01 -MUS_ME_SHINKA = 07 01 -MUS_SHINKA = 08 01 -MUS_BATTLE32 = 09 01 -MUS_BATTLE20 = 0A 01 -MUS_P_SCHOOL = 0B 01 -MUS_ME_B_BIG = 0C 01 -MUS_ME_B_SMALL = 0D 01 -MUS_ME_WASURE = 0E 01 -MUS_ME_ZANNEN = 0F 01 -MUS_ANNAI = 10 01 -MUS_SLOT = 11 01 -MUS_AJITO = 12 01 -MUS_GYM = 13 01 -MUS_PURIN = 14 01 -MUS_DEMO = 15 01 -MUS_TITLE = 16 01 -MUS_GUREN = 17 01 -MUS_SHION = 18 01 -MUS_KAIHUKU = 19 01 -MUS_CYCLING = 1A 01 -MUS_ROCKET = 1B 01 -MUS_SHOUJO = 1C 01 -MUS_SHOUNEN = 1D 01 -MUS_DENDOU = 1E 01 -MUS_T_MORI = 1F 01 -MUS_OTSUKIMI = 20 01 -MUS_POKEYASHI = 21 01 -MUS_ENDING = 22 01 -MUS_LOAD01 = 23 01 -MUS_OPENING = 24 01 -MUS_LOAD02 = 25 01 -MUS_LOAD03 = 26 01 -MUS_CHAMP_R = 27 01 -MUS_VS_GYM = 28 01 -MUS_VS_TORE = 29 01 -MUS_VS_YASEI = 2A 01 -MUS_VS_LAST = 2B 01 -MUS_MASARA = 2C 01 -MUS_KENKYU = 2D 01 -MUS_OHKIDO = 2E 01 -MUS_POKECEN = 2F 01 -MUS_SANTOAN = 30 01 -MUS_NAMINORI = 31 01 -MUS_P_TOWER = 32 01 -MUS_SHIRUHU = 33 01 -MUS_HANADA = 34 01 -MUS_TAMAMUSI = 35 01 -MUS_WIN_TRE = 36 01 -MUS_WIN_YASEI = 37 01 -MUS_WIN_GYM = 38 01 -MUS_KUCHIBA = 39 01 -MUS_NIBI = 3A 01 -MUS_RIVAL1 = 3B 01 -MUS_RIVAL2 = 3C 01 -MUS_FAN2 = 3D 01 -MUS_FAN5 = 3E 01 -MUS_FAN6 = 3F 01 -MUS_ME_PHOTO = 40 01 -MUS_TITLEROG = 41 01 -MUS_GET_YASEI = 42 01 -MUS_SOUSA = 43 01 -MUS_SEKAIKAN = 44 01 -MUS_SEIBETU = 45 01 -MUS_JUMP = 46 01 -MUS_UNION = 47 01 -MUS_NETWORK = 48 01 -MUS_OKURIMONO = 49 01 -MUS_KINOMIKUI = 4A 01 -MUS_NANADUNGEON = 4B 01 -MUS_OSHIE_TV = 4C 01 -MUS_NANASHIMA = 4D 01 -MUS_NANAISEKI = 4E 01 -MUS_NANA123 = 4F 01 -MUS_NANA45 = 50 01 -MUS_NANA67 = 51 01 -MUS_POKEFUE = 52 01 -MUS_VS_DEO = 53 01 -MUS_VS_MYU2 = 54 01 -MUS_VS_DEN = 55 01 -MUS_EXEYE = 56 01 -MUS_DEOEYE = 57 01 -MUS_T_TOWER = 58 01 -MUS_SLOWMASARA = 59 01 -MUS_TVNOIZE = 5A 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_RS_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_SUCCESS = 19 00 +SE_FAILURE = 1A 00 +SE_EXP = 1B 00 +SE_BIKE_HOP = 1C 00 +SE_SWITCH = 1D 00 +SE_CLICK = 1E 00 +SE_FU_ZAKU = 1F 00 +SE_CONTEST_CONDITION_LOSE = 20 00 +SE_LAVARIDGE_FALL_WARP = 21 00 +SE_ICE_STAIRS = 22 00 +SE_ICE_BREAK = 23 00 +SE_ICE_CRACK = 24 00 +SE_FALL = 25 00 +SE_UNLOCK = 26 00 +SE_WARP_IN = 27 00 +SE_WARP_OUT = 28 00 +SE_REPEL = 29 00 +SE_ROTATING_GATE = 2A 00 +SE_TRUCK_MOVE = 2B 00 +SE_TRUCK_STOP = 2C 00 +SE_TRUCK_UNLOAD = 2D 00 +SE_TRUCK_DOOR = 2E 00 +SE_BERRY_BLENDER = 2F 00 +SE_SAVE = 30 00 +SE_BALL_BOUNCE_1 = 31 00 +SE_BALL_BOUNCE_2 = 32 00 +SE_BALL_BOUNCE_3 = 33 00 +SE_BALL_BOUNCE_4 = 34 00 +SE_BALL_TRADE = 35 00 +SE_BALL_THROW = 36 00 +SE_NOTE_C = 37 00 +SE_NOTE_D = 38 00 +SE_NOTE_E = 39 00 +SE_NOTE_F = 3A 00 +SE_NOTE_G = 3B 00 +SE_NOTE_A = 3C 00 +SE_NOTE_B = 3D 00 +SE_NOTE_C_HIGH = 3E 00 +SE_PUDDLE = 3F 00 +SE_BRIDGE_WALK = 40 00 +SE_ITEMFINDER = 41 00 +SE_DING_DONG = 42 00 +SE_BALLOON_RED = 43 00 +SE_BALLOON_BLUE = 44 00 +SE_BALLOON_YELLOW = 45 00 +SE_BREAKABLE_DOOR = 46 00 +SE_MUD_BALL = 47 00 +SE_FIELD_POISON = 48 00 +SE_ESCALATOR = 49 00 +SE_THUNDERSTORM = 4A 00 +SE_THUNDERSTORM_STOP = 4B 00 +SE_DOWNPOUR = 4C 00 +SE_DOWNPOUR_STOP = 4D 00 +SE_RAIN = 4E 00 +SE_RAIN_STOP = 4F 00 +SE_THUNDER = 50 00 +SE_THUNDER2 = 51 00 +SE_ELEVATOR = 52 00 +SE_LOW_HEALTH = 53 00 +SE_EXP_MAX = 54 00 +SE_ROULETTE_BALL = 55 00 +SE_ROULETTE_BALL2 = 56 00 +SE_TAILLOW_WING_FLAP = 57 00 +SE_RS_SHOP = 58 00 +SE_CONTEST_HEART = 59 00 +SE_CONTEST_CURTAIN_RISE = 5A 00 +SE_CONTEST_CURTAIN_FALL = 5B 00 +SE_CONTEST_ICON_CHANGE = 5C 00 +SE_CONTEST_ICON_CLEAR = 5D 00 +SE_CONTEST_MONS_TURN = 5E 00 +SE_SHINY = 5F 00 +SE_INTRO_BLAST = 60 00 +SE_MUGSHOT = 61 00 +SE_APPLAUSE = 62 00 +SE_VEND = 63 00 +SE_ORB = 64 00 +SE_DEX_SCROLL = 65 00 +SE_DEX_PAGE = 66 00 +SE_POKENAV_ON = 67 00 +SE_POKENAV_OFF = 68 00 +SE_DEX_SEARCH = 69 00 +SE_EGG_HATCH = 6A 00 +SE_BALL_TRAY_ENTER = 6B 00 +SE_BALL_TRAY_BALL = 6C 00 +SE_BALL_TRAY_EXIT = 6D 00 +SE_GLASS_FLUTE = 6E 00 +SE_M_THUNDERBOLT = 6F 00 +SE_M_THUNDERBOLT2 = 70 00 +SE_M_HARDEN = 71 00 +SE_M_NIGHTMARE = 72 00 +SE_M_VITAL_THROW = 73 00 +SE_M_VITAL_THROW2 = 74 00 +SE_M_BUBBLE = 75 00 +SE_M_BUBBLE2 = 76 00 +SE_M_BUBBLE3 = 77 00 +SE_M_RAIN_DANCE = 78 00 +SE_M_CUT = 79 00 +SE_M_STRING_SHOT = 7A 00 +SE_M_STRING_SHOT2 = 7B 00 +SE_M_ROCK_THROW = 7C 00 +SE_M_GUST = 7D 00 +SE_M_GUST2 = 7E 00 +SE_M_DOUBLE_SLAP = 7F 00 +SE_M_DOUBLE_TEAM = 80 00 +SE_M_RAZOR_WIND = 81 00 +SE_M_ICY_WIND = 82 00 +SE_M_THUNDER_WAVE = 83 00 +SE_M_COMET_PUNCH = 84 00 +SE_M_MEGA_KICK = 85 00 +SE_M_MEGA_KICK2 = 86 00 +SE_M_CRABHAMMER = 87 00 +SE_M_JUMP_KICK = 88 00 +SE_M_FLAME_WHEEL = 89 00 +SE_M_FLAME_WHEEL2 = 8A 00 +SE_M_FLAMETHROWER = 8B 00 +SE_M_FIRE_PUNCH = 8C 00 +SE_M_TOXIC = 8D 00 +SE_M_SACRED_FIRE = 8E 00 +SE_M_SACRED_FIRE2 = 8F 00 +SE_M_EMBER = 90 00 +SE_M_TAKE_DOWN = 91 00 +SE_M_BLIZZARD = 92 00 +SE_M_BLIZZARD2 = 93 00 +SE_M_SCRATCH = 94 00 +SE_M_VICEGRIP = 95 00 +SE_M_WING_ATTACK = 96 00 +SE_M_FLY = 97 00 +SE_M_SAND_ATTACK = 98 00 +SE_M_RAZOR_WIND2 = 99 00 +SE_M_BITE = 9A 00 +SE_M_HEADBUTT = 9B 00 +SE_M_SURF = 9C 00 +SE_M_HYDRO_PUMP = 9D 00 +SE_M_WHIRLPOOL = 9E 00 +SE_M_HORN_ATTACK = 9F 00 +SE_M_TAIL_WHIP = A0 00 +SE_M_MIST = A1 00 +SE_M_POISON_POWDER = A2 00 +SE_M_BIND = A3 00 +SE_M_DRAGON_RAGE = A4 00 +SE_M_SING = A5 00 +SE_M_PERISH_SONG = A6 00 +SE_M_PAY_DAY = A7 00 +SE_M_DIG = A8 00 +SE_M_DIZZY_PUNCH = A9 00 +SE_M_SELF_DESTRUCT = AA 00 +SE_M_EXPLOSION = AB 00 +SE_M_ABSORB_2 = AC 00 +SE_M_ABSORB = AD 00 +SE_M_SCREECH = AE 00 +SE_M_BUBBLE_BEAM = AF 00 +SE_M_BUBBLE_BEAM2 = B0 00 +SE_M_SUPERSONIC = B1 00 +SE_M_BELLY_DRUM = B2 00 +SE_M_METRONOME = B3 00 +SE_M_BONEMERANG = B4 00 +SE_M_LICK = B5 00 +SE_M_PSYBEAM = B6 00 +SE_M_FAINT_ATTACK = B7 00 +SE_M_SWORDS_DANCE = B8 00 +SE_M_LEER = B9 00 +SE_M_SWAGGER = BA 00 +SE_M_SWAGGER2 = BB 00 +SE_M_HEAL_BELL = BC 00 +SE_M_CONFUSE_RAY = BD 00 +SE_M_SNORE = BE 00 +SE_M_BRICK_BREAK = BF 00 +SE_M_GIGA_DRAIN = C0 00 +SE_M_PSYBEAM2 = C1 00 +SE_M_SOLAR_BEAM = C2 00 +SE_M_PETAL_DANCE = C3 00 +SE_M_TELEPORT = C4 00 +SE_M_MINIMIZE = C5 00 +SE_M_SKETCH = C6 00 +SE_M_SWIFT = C7 00 +SE_M_REFLECT = C8 00 +SE_M_BARRIER = C9 00 +SE_M_DETECT = CA 00 +SE_M_LOCK_ON = CB 00 +SE_M_MOONLIGHT = CC 00 +SE_M_CHARM = CD 00 +SE_M_CHARGE = CE 00 +SE_M_STRENGTH = CF 00 +SE_M_HYPER_BEAM = D0 00 +SE_M_WATERFALL = D1 00 +SE_M_REVERSAL = D2 00 +SE_M_ACID_ARMOR = D3 00 +SE_M_SANDSTORM = D4 00 +SE_M_TRI_ATTACK = D5 00 +SE_M_TRI_ATTACK2 = D6 00 +SE_M_ENCORE = D7 00 +SE_M_ENCORE2 = D8 00 +SE_M_BATON_PASS = D9 00 +SE_M_MILK_DRINK = DA 00 +SE_M_ATTRACT = DB 00 +SE_M_ATTRACT2 = DC 00 +SE_M_MORNING_SUN = DD 00 +SE_M_FLATTER = DE 00 +SE_M_SAND_TOMB = DF 00 +SE_M_GRASSWHISTLE = E0 00 +SE_M_SPIT_UP = E1 00 +SE_M_DIVE = E2 00 +SE_M_EARTHQUAKE = E3 00 +SE_M_TWISTER = E4 00 +SE_M_SWEET_SCENT = E5 00 +SE_M_YAWN = E6 00 +SE_M_SKY_UPPERCUT = E7 00 +SE_M_STAT_INCREASE = E8 00 +SE_M_HEAT_WAVE = E9 00 +SE_M_UPROAR = EA 00 +SE_M_HAIL = EB 00 +SE_M_COSMIC_POWER = EC 00 +SE_M_TEETER_DANCE = ED 00 +SE_M_STAT_DECREASE = EE 00 +SE_M_HAZE = EF 00 +SE_M_HYPER_BEAM2 = F0 00 +SE_DOOR = F1 00 +SE_CARD_FLIP = F2 00 +SE_CARD_FLIPPING = F3 00 +SE_CARD_OPEN = F4 00 +SE_BAG_CURSOR = F5 00 +SE_BAG_POCKET = F6 00 +SE_BALL_CLICK = F7 00 +SE_SHOP = F8 00 +SE_SS_ANNE_HORN = F9 00 +SE_HELP_OPEN = FA 00 +SE_HELP_CLOSE = FB 00 +SE_HELP_ERROR = FC 00 +SE_DEOXYS_MOVE = FD 00 +SE_POKE_JUMP_SUCCESS = FE 00 +SE_POKE_JUMP_FAILURE = FF 00 +MUS_HEAL = 00 01 +MUS_LEVEL_UP = 01 01 +MUS_OBTAIN_ITEM = 02 01 +MUS_EVOLVED = 03 01 +MUS_OBTAIN_BADGE = 04 01 +MUS_OBTAIN_TMHM = 05 01 +MUS_OBTAIN_BERRY = 06 01 +MUS_EVOLUTION_INTRO = 07 01 +MUS_EVOLUTION = 08 01 +MUS_RS_VS_GYM_LEADER = 09 01 +MUS_RS_VS_TRAINER = 0A 01 +MUS_SCHOOL = 0B 01 +MUS_SLOTS_JACKPOT = 0C 01 +MUS_SLOTS_WIN = 0D 01 +MUS_MOVE_DELETED = 0E 01 +MUS_TOO_BAD = 0F 01 +MUS_FOLLOW_ME = 10 01 +MUS_GAME_CORNER = 11 01 +MUS_ROCKET_HIDEOUT = 12 01 +MUS_GYM = 13 01 +MUS_JIGGLYPUFF = 14 01 +MUS_INTRO_FIGHT = 15 01 +MUS_TITLE = 16 01 +MUS_CINNABAR = 17 01 +MUS_LAVENDER = 18 01 +MUS_HEAL_UNUSED = 19 01 +MUS_CYCLING = 1A 01 +MUS_ENCOUNTER_ROCKET = 1B 01 +MUS_ENCOUNTER_GIRL = 1C 01 +MUS_ENCOUNTER_BOY = 1D 01 +MUS_HALL_OF_FAME = 1E 01 +MUS_VIRIDIAN_FOREST = 1F 01 +MUS_MT_MOON = 20 01 +MUS_POKE_MANSION = 21 01 +MUS_CREDITS = 22 01 +MUS_ROUTE1 = 23 01 +MUS_ROUTE24 = 24 01 +MUS_ROUTE3 = 25 01 +MUS_ROUTE11 = 26 01 +MUS_VICTORY_ROAD = 27 01 +MUS_VS_GYM_LEADER = 28 01 +MUS_VS_TRAINER = 29 01 +MUS_VS_WILD = 2A 01 +MUS_VS_CHAMPION = 2B 01 +MUS_PALLET = 2C 01 +MUS_OAK_LAB = 2D 01 +MUS_OAK = 2E 01 +MUS_POKE_CENTER = 2F 01 +MUS_SS_ANNE = 30 01 +MUS_SURF = 31 01 +MUS_POKE_TOWER = 32 01 +MUS_SILPH = 33 01 +MUS_FUCHSIA = 34 01 +MUS_CELADON = 35 01 +MUS_VICTORY_TRAINER = 36 01 +MUS_VICTORY_WILD = 37 01 +MUS_VICTORY_GYM_LEADER = 38 01 +MUS_VERMILLION = 39 01 +MUS_PEWTER = 3A 01 +MUS_ENCOUNTER_RIVAL = 3B 01 +MUS_RIVAL_EXIT = 3C 01 +MUS_DEX_RATING = 3D 01 +MUS_OBTAIN_KEY_ITEM = 3E 01 +MUS_CAUGHT_INTRO = 3F 01 +MUS_PHOTO = 40 01 +MUS_GAME_FREAK = 41 01 +MUS_CAUGHT = 42 01 +MUS_NEW_GAME_INSTRUCT = 43 01 +MUS_NEW_GAME_INTRO = 44 01 +MUS_NEW_GAME_EXIT = 45 01 +MUS_POKE_JUMP = 46 01 +MUS_UNION_ROOM = 47 01 +MUS_NET_CENTER = 48 01 +MUS_MYSTERY_GIFT = 49 01 +MUS_BERRY_PICK = 4A 01 +MUS_SEVII_CAVE = 4B 01 +MUS_TEACHY_TV_SHOW = 4C 01 +MUS_SEVII_ROUTE = 4D 01 +MUS_SEVII_DUNGEON = 4E 01 +MUS_SEVII_123 = 4F 01 +MUS_SEVII_45 = 50 01 +MUS_SEVII_67 = 51 01 +MUS_POKE_FLUTE = 52 01 +MUS_VS_DEOXYS = 53 01 +MUS_VS_MEWTWO = 54 01 +MUS_VS_LEGEND = 55 01 +MUS_ENCOUNTER_GYM_LEADER = 56 01 +MUS_ENCOUNTER_DEOXYS = 57 01 +MUS_TRAINER_TOWER = 58 01 +MUS_SLOW_PALLET = 59 01 +MUS_TEACHY_TV_MENU = 5A 01 A_BUTTON = F8 00 B_BUTTON = F8 01 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index c8b37d1cc..8884e9853 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -459,7 +459,7 @@ Move_MIRROR_MOVE:: @ 81C6F34 loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -474,7 +474,7 @@ Move_DOUBLE_SLAP:: @ 81C6F65 choosetwoturnanim DoubleSlapLeft, DoubleSlapRight DoubleSlapContinue:: @ 81C6F76 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -491,7 +491,7 @@ DoubleSlapRight:: @ 81C6FA4 Move_POISON_POWDER:: @ 81C6FB8 loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W077, 63, 10, 6 + loopsewithpan SE_M_POISON_POWDER, 63, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -515,7 +515,7 @@ Move_POISON_POWDER:: @ 81C6FB8 Move_STUN_SPORE:: @ 81C70E9 loadspritegfx ANIM_TAG_STUN_SPORE - loopsewithpan SE_W077, 63, 10, 6 + loopsewithpan SE_M_POISON_POWDER, 63, 10, 6 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -539,7 +539,7 @@ Move_STUN_SPORE:: @ 81C70E9 Move_SLEEP_POWDER:: @ 81C7217 loadspritegfx ANIM_TAG_SLEEP_POWDER - loopsewithpan SE_W077, 63, 10, 6 + loopsewithpan SE_M_POISON_POWDER, 63, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -25, -22, 117, 112, 5, 3 @@ -566,21 +566,21 @@ Move_SWIFT:: @ 81C7345 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 delay 5 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 5, 22, -18, 1 delay 5 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, -10, 22, 15, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 18, 1 createvisualtask AnimTask_ShakeMon2, 2, 3, 2, 0, 18, 1 delay 5 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 5 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gSwiftStarSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 12, 1 delay 5 waitforvisualfinish @@ -592,20 +592,20 @@ Move_STRENGTH:: @ 81C73FE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_ShakeAndSinkMon, 5, 0, 2, 0, 96, 30 waitforvisualfinish delay 10 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 4 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 1, 18, 6, 2, 4 delay 4 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 16, 12, 1, 1 delay 4 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, -12, 1, 1 delay 4 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 3, 4, 1, 1 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 @@ -622,7 +622,7 @@ Move_TACKLE:: @ 81C7492 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -632,14 +632,14 @@ Move_BODY_SLAM:: @ 81C74D0 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, 0 waitforvisualfinish delay 11 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, 1, 0 - loopsewithpan SE_W025B, 63, 10, 2 + loopsewithpan SE_M_MEGA_KICK2, 63, 10, 2 delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3 waitforvisualfinish @@ -672,7 +672,7 @@ Move_SUPERSONIC:: @ 81C755D end SupersonicRing:: @ 81C759B - playsewithpan SE_W048, 192 + playsewithpan SE_M_SUPERSONIC, 192 createsprite gSupersonicWaveSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -688,7 +688,7 @@ Move_SCREECH:: @ 81C75B5 end ScreechRing:: @ 81C75E8 - playsewithpan SE_W103, 192 + playsewithpan SE_M_SCREECH, 192 createsprite gScreechWaveSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -698,31 +698,31 @@ Move_FLAME_WHEEL:: @ 81C7602 monbg ANIM_DEF_PARTNER monbgprio_2A 1 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 delay 2 createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24 - playsewithpan SE_W172, 192 + playsewithpan SE_M_FLAME_WHEEL, 192 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 6 delay 4 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 8, 1 createvisualtask AnimTask_BlendMonInAndOut, 3, 1, 31, 12, 1, 1 - playsewithpan SE_W172B, 63 + playsewithpan SE_M_FLAME_WHEEL2, 63 call FireSpreadEffect delay 7 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9 @@ -739,22 +739,22 @@ Move_PIN_MISSILE:: @ 81C76FC monbg 1 monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 2, 1 delay 9 createsprite gPinMissileSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 2, 1 waitforvisualfinish @@ -768,22 +768,22 @@ Move_ICICLE_SPEAR:: @ 81C77C1 monbg 1 monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W196, 192 + playsewithpan SE_M_ICY_WIND, 192 createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -8, -8, 20, -32 delay 15 createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 8, 8, 20, -40 delay 4 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -8, -8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 2, 1 delay 9 createsprite gIcicleSpearSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, 0, 0, 20, -32 delay 4 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 2, 1 delay 14 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 2, 1 waitforvisualfinish @@ -795,12 +795,12 @@ Move_TAKE_DOWN:: @ 81C7886 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_WindUpLunge, 5, 0, -24, 8, 23, 10, 40, 10 delay 35 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, 1, 0 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 0, 0, 4 waitforvisualfinish @@ -817,19 +817,19 @@ Move_TAKE_DOWN:: @ 81C7886 Move_DOUBLE_EDGE:: @ 81C791A loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish delay 10 - playsewithpan SE_W207, 192 - waitplaysewithpan SE_W207, 192, 8 + playsewithpan SE_M_SWAGGER, 192 + waitplaysewithpan SE_M_SWAGGER, 192, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 2, 4 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 16, 16, RGB_WHITE createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 3 waitforvisualfinish - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, 1, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3 waitforvisualfinish @@ -855,12 +855,12 @@ Move_POISON_STING:: @ 81C7A2D monbg 1 monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 0, -8, 0, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 5, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 waitforvisualfinish call PoisonBubblesEffect waitforvisualfinish @@ -874,13 +874,13 @@ Move_TWINEEDLE:: @ 81C7A82 monbg 1 monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W013B, 192, 6, 2 + loopsewithpan SE_M_RAZOR_WIND2, 192, 6, 2 createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 10, -4, 0, -4, 20 createsprite gLinearStingerSpriteTemplate, ANIM_TARGET, 2, 20, 12, 10, 12, 20 delay 20 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 5, 1 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 1, 3 - loopsewithpan SE_W030, 63, 5, 2 + loopsewithpan SE_M_HORN_ATTACK, 63, 5, 2 delay 1 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 10, 12, 1, 3 waitforvisualfinish @@ -940,29 +940,29 @@ FireBlastCross:: @ 81C7BCD Move_LEECH_SEED:: @ 81C7C23 loadspritegfx ANIM_TAG_SEED - playsewithpan SE_W077, 192 + playsewithpan SE_M_POISON_POWDER, 192 createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32 delay 8 - playsewithpan SE_W077, 192 + playsewithpan SE_M_POISON_POWDER, 192 createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, -16, 24, 35, -40 delay 8 - playsewithpan SE_W077, 192 + playsewithpan SE_M_POISON_POWDER, 192 createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 16, 24, 35, -37 delay 12 - loopsewithpan SE_W039, 63, 10, 8 + loopsewithpan SE_M_TAIL_WHIP, 63, 10, 8 waitforvisualfinish end Move_EMBER:: @ 81C7C79 loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W052, 192, 5, 2 + loopsewithpan SE_M_EMBER, 192, 5, 2 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1 delay 4 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 20, 1 delay 4 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, 16, 24, 20, 1 delay 16 - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 call EmberFireHit call EmberFireHit call EmberFireHit @@ -980,7 +980,7 @@ Move_MEGA_PUNCH:: @ 81C7CED delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, 0 setalpha 12, 8 - playsewithpan SE_W025, 63 + playsewithpan SE_M_MEGA_KICK, 63 createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 50 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 7, RGB_WHITE delay 50 @@ -989,7 +989,7 @@ Move_MEGA_PUNCH:: @ 81C7CED createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 22, 1 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 0, RGB_WHITE createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -1027,11 +1027,11 @@ Move_MEGA_KICK:: @ 81C7DC7 delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, 0 setalpha 12, 8 - playsewithpan SE_W025, 63 + playsewithpan SE_M_MEGA_KICK, 63 createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 50 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 7, RGB_WHITE delay 50 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 call SetImpactBackground createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 22, 1 @@ -1054,7 +1054,7 @@ Move_COMET_PUNCH:: @ 81C7E63 CometPunchContinue:: @ 81C7E77 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -1087,7 +1087,7 @@ Move_SONIC_BOOM:: @ 81C7EDB end SonicBoomProjectile:: @ 81C7F12 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gSonicBoomSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 15 delay 4 return @@ -1104,7 +1104,7 @@ Move_THUNDER_SHOCK:: @ 81C7F3C waitforvisualfinish delay 10 createvisualtask AnimTask_ElectricBolt, 5, 0, -44, 0 - playsewithpan SE_W085, 63 + playsewithpan SE_M_THUNDERBOLT, 63 delay 9 createvisualtask AnimTask_BlendSelected, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish @@ -1126,13 +1126,13 @@ Move_THUNDERBOLT:: @ 81C7FAA waitforvisualfinish delay 10 createvisualtask AnimTask_ElectricBolt, 5, 24, -52, 0 - playsewithpan SE_W085, 63 + playsewithpan SE_M_THUNDERBOLT, 63 delay 7 createvisualtask AnimTask_ElectricBolt, 5, -24, -52, 0 - playsewithpan SE_W085, 63 + playsewithpan SE_M_THUNDERBOLT, 63 delay 7 createvisualtask AnimTask_ElectricBolt, 5, 0, -60, 1 - playsewithpan SE_W085, 63 + playsewithpan SE_M_THUNDERBOLT, 63 delay 9 createvisualtask AnimTask_BlendSelected, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish @@ -1148,7 +1148,7 @@ Move_THUNDERBOLT:: @ 81C7FAA createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 - playsewithpan SE_W063, 63 + playsewithpan SE_M_HYPER_BEAM, 63 delay 0 createvisualtask AnimTask_BlendSelected, 10, 1, 0, 2, 2, RGB_BLACK delay 6 @@ -1159,7 +1159,7 @@ Move_THUNDERBOLT:: @ 81C7FAA createvisualtask AnimTask_BlendSelected, 10, 1, 0, 6, 6, RGB_BLACK waitforvisualfinish delay 20 - waitplaysewithpan SE_W085B, 63, 19 + waitplaysewithpan SE_M_THUNDERBOLT2, 63, 19 call ElectricityEffect waitforvisualfinish delay 20 @@ -1175,9 +1175,9 @@ Move_THUNDER_WAVE:: @ 81C8160 waitforvisualfinish delay 10 createvisualtask AnimTask_ElectricBolt, 5, 0, -48, 0 - playsewithpan SE_W086, 63 + playsewithpan SE_M_THUNDER_WAVE, 63 delay 20 - loopsewithpan SE_W085B, 63, 10, 4 + loopsewithpan SE_M_THUNDERBOLT2, 63, 10, 4 createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, -16 delay 4 createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 0 @@ -1204,24 +1204,24 @@ BeatUpLeft:: @ 81C81E8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -20, -20, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -20, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 8, 0, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 8, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 goto BeatUpContinue BeatUpRight:: @ 81C8259 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -20, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 12, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 0, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -12, 8, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 goto BeatUpContinue Move_STOMP:: @ 81C82CA @@ -1229,19 +1229,19 @@ Move_STOMP:: @ 81C82CA loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W104, 63 + playsewithpan SE_M_DOUBLE_TEAM, 63 createsprite gStompFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -32, 15 delay 19 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -8, 1, 1 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 4, 9, 1 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish clearmonbg 1 blendoff end Move_TAIL_WHIP:: @ 81C8311 - loopsewithpan SE_W039, 192, 24, 3 + loopsewithpan SE_M_TAIL_WHIP, 192, 24, 3 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 12, 4, 2, 3 waitforvisualfinish end @@ -1250,7 +1250,7 @@ Move_CUT:: @ 81C832A loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 - playsewithpan SE_W015, 63 + playsewithpan SE_M_CUT, 63 createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 delay 5 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 10, 1 @@ -1262,14 +1262,14 @@ Move_CUT:: @ 81C832A Move_HIDDEN_POWER:: @ 81C835C loadspritegfx ANIM_TAG_RED_ORB - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, 0, 0 waitforvisualfinish delay 30 createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 20479, 12, 5, 1 delay 4 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, 0, 0 - playsewithpan SE_W179, 192 + playsewithpan SE_M_REVERSAL, 192 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42 createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84 @@ -1278,7 +1278,7 @@ Move_HIDDEN_POWER:: @ 81C835C createsprite gHiddenPowerOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210 delay 52 setarg 7, 65535 - playsewithpan SE_W115, 192 + playsewithpan SE_M_REFLECT, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, 0, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 0 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 32 @@ -1294,13 +1294,13 @@ Move_REVERSAL:: @ 81C8445 loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W197, 192 + playsewithpan SE_M_DETECT, 192 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish delay 30 createvisualtask AnimTask_CurseBlendEffect, 2, 31, 3, 2, 0, 10, RGB_WHITE delay 10 - playsewithpan SE_W179, 192 + playsewithpan SE_M_REVERSAL, 192 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84 @@ -1311,7 +1311,7 @@ Move_REVERSAL:: @ 81C8445 delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 8 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 10, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 @@ -1336,13 +1336,13 @@ PursuitContinue:: @ 81C8536 end PursuitNormal:: @ 81C853F - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, 0, 1, 6, 1, 0 goto PursuitContinue PursuitOnSwitchout:: @ 81C8568 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, 0, 1, 6, 1, 0 goto PursuitContinue @@ -1355,7 +1355,7 @@ Move_SPIKE_CANNON:: @ 81C8591 setalpha 12, 8 createvisualtask AnimTask_WindUpLunge, 5, 0, -4, 0, 4, 6, 8, 4 waitforvisualfinish - loopsewithpan SE_W013B, 192, 5, 3 + loopsewithpan SE_M_RAZOR_WIND2, 192, 5, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 10, -8, -8, -8, 20 createsprite gLinearStingerSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 0, 0, 20 @@ -1365,7 +1365,7 @@ Move_SPIKE_CANNON:: @ 81C8591 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createsprite gHandleInvertHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 8, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 7, 1 - loopsewithpan SE_W030, 63, 5, 3 + loopsewithpan SE_M_HORN_ATTACK, 63, 5, 3 waitforvisualfinish clearmonbg 1 blendoff @@ -1375,7 +1375,7 @@ Move_SWORDS_DANCE:: @ 81C8644 loadspritegfx ANIM_TAG_SWORD monbg ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_W014, 192 + playsewithpan SE_M_SWORDS_DANCE, 192 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 16, 6, 1, 4 createsprite gSwordsDanceBladeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 22 @@ -1391,12 +1391,12 @@ Move_PSYCH_UP:: @ 81C868A monbg ANIM_ATK_PARTNER createvisualtask AnimTask_BlendColorCycleExclude, 2, 1, 2, 6, 1, 11, 0 setalpha 12, 8 - loopsewithpan SE_W060B, 192, 5, 10 + loopsewithpan SE_M_PSYBEAM2, 192, 5, 10 createsprite gPsychUpSpiralSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0 createvisualtask AnimTask_SwayMon, 5, 0, 5, 2560, 8, 0 delay 127 delay 4 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, 0, 1 createvisualtask AnimTask_BlendSelected, 9, 2, 2, 10, 0, RGB(31, 31, 0) delay 30 @@ -1414,7 +1414,7 @@ Move_DIZZY_PUNCH:: @ 81C86FC call DizzyPunchLunge createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, 16, 8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 16, 0, 1, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, 160, -32 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, -256, -40 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 16, 8, 128, -16 @@ -1425,7 +1425,7 @@ Move_DIZZY_PUNCH:: @ 81C86FC call DizzyPunchLunge createsprite gFistFootSpriteTemplate, ANIM_TARGET, 5, -16, -8, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -16, -16, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, 160, -32 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, -256, -40 createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, -16, -8, 128, -16 @@ -1445,7 +1445,7 @@ DizzyPunchLunge:: @ 81C8817 Move_FIRE_SPIN:: @ 81C8836 loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, 63 + playsewithpan SE_M_SACRED_FIRE2, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 47, 1 call FireSpinEffect call FireSpinEffect @@ -1472,7 +1472,7 @@ Move_FURY_CUTTER:: @ 81C88EA loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createvisualtask AnimTask_IsFuryCutterHitRight, 2, jumpargeq 7, 0, FuryCutterLeft goto FuryCutterRight @@ -1528,19 +1528,19 @@ Move_SELF_DESTRUCT:: @ 81C89B9 end SelfDestructExplode:: @ 81C8A3F - playsewithpan SE_W120, 192 + playsewithpan SE_M_SELF_DESTRUCT, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W120, 192 + playsewithpan SE_M_SELF_DESTRUCT, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W120, 192 + playsewithpan SE_M_SELF_DESTRUCT, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W120, 192 + playsewithpan SE_M_SELF_DESTRUCT, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W120, 192 + playsewithpan SE_M_SELF_DESTRUCT, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return @@ -1550,12 +1550,12 @@ Move_SLAM:: @ 81C8AA9 loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W004, 192 + playsewithpan SE_M_COMET_PUNCH, 192 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 3, 0, 4 delay 1 createsprite gSlamHitSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 delay 3 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 @@ -1571,10 +1571,10 @@ Move_SLAM:: @ 81C8AA9 Move_VINE_WHIP:: @ 81C8B31 loadspritegfx ANIM_TAG_WHIP_HIT - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 6 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 createsprite gVineWhipSpriteTemplate, ANIM_TARGET, 2, 0, 0 delay 6 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 6, 1 @@ -1584,12 +1584,12 @@ Move_DRILL_PECK:: @ 81C8B68 loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 2 - loopsewithpan SE_W030, 63, 4, 8 + loopsewithpan SE_M_HORN_ATTACK, 63, 4, 8 createvisualtask AnimTask_DrillPeckHitSplats, 5 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 18, 1 waitforvisualfinish @@ -1607,28 +1607,28 @@ Move_WATERFALL:: @ 81C8BC1 setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 23, 1 delay 5 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 20, 10, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -10, 15, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 25, 20, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -20, 20, 25, 0 delay 4 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 12, 0, 25, 0 waitforvisualfinish delay 10 @@ -1641,7 +1641,7 @@ Move_WATERFALL:: @ 81C8BC1 end RisingWaterHitEffect:: @ 81C8CA2 - playsewithpan SE_W127, 63 + playsewithpan SE_M_WATERFALL, 63 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 17, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, 1, 1 createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0, 20 @@ -1697,26 +1697,26 @@ Move_EXPLOSION:: @ 81C8E15 end Explosion1:: @ 81C8EB2 - playsewithpan SE_W153, 192 + playsewithpan SE_M_EXPLOSION, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 - playsewithpan SE_W153, 192 + playsewithpan SE_M_EXPLOSION, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 0, 1 delay 6 - playsewithpan SE_W153, 192 + playsewithpan SE_M_EXPLOSION, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 0, 1 delay 6 - playsewithpan SE_W153, 192 + playsewithpan SE_M_EXPLOSION, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 0, 1 delay 6 - playsewithpan SE_W153, 192 + playsewithpan SE_M_EXPLOSION, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 0, 1 delay 6 return Move_DEFENSE_CURL:: @ 81C8F1C loadspritegfx ANIM_TAG_ECLIPSING_ORB - loopsewithpan SE_W161, 192, 18, 3 + loopsewithpan SE_M_TRI_ATTACK, 192, 18, 3 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 0 createvisualtask AnimTask_DefenseCurlDeformMon, 5, waitforvisualfinish @@ -1730,7 +1730,7 @@ Move_PROTECT:: @ 81C8F55 loadspritegfx ANIM_TAG_PROTECT monbg ANIM_ATK_PARTNER monbgprio_28 0 - waitplaysewithpan SE_W115, 192, 16 + waitplaysewithpan SE_M_REFLECT, 192, 16 createsprite gProtectWallSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -1742,7 +1742,7 @@ Move_DETECT:: @ 81C8F72 waitforvisualfinish createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 9, RGB_WHITE delay 18 - playsewithpan SE_W197, 192 + playsewithpan SE_M_DETECT, 192 createsprite gSpriteTemplate_83BF480, ANIM_ATTACKER, 13, 20, -20 waitforvisualfinish delay 10 @@ -1768,15 +1768,15 @@ Frustration_Continue:: @ 81C8FFF end Frustration_Strongest:: @ 81C9004 - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask AnimTask_BlendSelected, 10, 2, 3, 0, 9, RGB(31, 0, 0) waitforvisualfinish delay 20 - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 10 @@ -1784,47 +1784,47 @@ Frustration_Strongest:: @ 81C9004 delay 5 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 30, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 24, 8, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -24, -16, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 8, 4, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -16, 19, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, -18, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 waitforvisualfinish createvisualtask AnimTask_BlendSelected, 10, 2, 3, 9, 0, RGB(31, 0, 0) goto Frustration_Continue Frustration_Strong:: @ 81C910A - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask AnimTask_BlendSelected, 10, 2, 3, 0, 9, RGB(31, 0, 0) waitforvisualfinish delay 20 - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5, delay 7 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 delay 14 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 waitforvisualfinish @@ -1832,19 +1832,19 @@ Frustration_Strong:: @ 81C910A goto Frustration_Continue Frustration_Medium:: @ 81C91D7 - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 4, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 6, 1 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 6 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 6, 1 goto Frustration_Continue @@ -1855,7 +1855,7 @@ Frustration_Weak:: @ 81C9253 delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2 delay 12 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 6, 1 goto Frustration_Continue @@ -1864,14 +1864,14 @@ Move_SAFEGUARD:: @ 81C9297 loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_ATK_PARTNER setalpha 8, 8 - playsewithpan SE_W208, 192 + playsewithpan SE_M_MILK_DRINK, 192 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, delay 4 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, delay 4 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_SHINY, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -1883,21 +1883,21 @@ Move_PAIN_SPLIT:: @ 81C92D9 createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, 1 delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask AnimTask_PainSplitMovement, 2, 0, 0 createvisualtask AnimTask_PainSplitMovement, 2, 1, 0 waitforvisualfinish createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -24, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -24, -42, 1 delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask AnimTask_PainSplitMovement, 2, 0, 1 createvisualtask AnimTask_PainSplitMovement, 2, 1, 1 waitforvisualfinish createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, 8, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, 8, -42, 1 delay 10 - playsewithpan SE_W207B, 0 + playsewithpan SE_M_SWAGGER2, 0 createvisualtask AnimTask_PainSplitMovement, 2, 0, 2 createvisualtask AnimTask_PainSplitMovement, 2, 1, 2 end @@ -1907,7 +1907,7 @@ Move_VICE_GRIP:: @ 81C9381 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W011, 63 + playsewithpan SE_M_VICEGRIP, 63 createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gViceGripSpriteTemplate, ANIM_ATTACKER, 2, 1 delay 9 @@ -1925,7 +1925,7 @@ Move_GUILLOTINE:: @ 81C93C9 setalpha 12, 8 fadetobgfromset 12, 13, 14 waitbgfadein - playsewithpan SE_W011, 63 + playsewithpan SE_M_VICEGRIP, 63 createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 1 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 16, RGB_BLACK @@ -1935,7 +1935,7 @@ Move_GUILLOTINE:: @ 81C93C9 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 8, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -1949,10 +1949,10 @@ Move_PAY_DAY:: @ 81C9455 monbg 1 monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gCoinThrowSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 1152 waitforvisualfinish - playsewithpan SE_W006, 63 + playsewithpan SE_M_PAY_DAY, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 2 createsprite gFallingCoinSpriteTemplate, ANIM_ATTACKER, 2, createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 6, 1 @@ -1963,7 +1963,7 @@ Move_PAY_DAY:: @ 81C9455 Move_OUTRAGE:: @ 81C94A8 loadspritegfx ANIM_TAG_SMALL_EMBER - loopsewithpan SE_W082, 192, 8, 3 + loopsewithpan SE_M_DRAGON_RAGE, 192, 8, 3 createvisualtask AnimTask_CurseBlendEffect, 2, 7, 2, 5, 3, 8, 430 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 12, 6, 5, 4 delay 0 @@ -2012,7 +2012,7 @@ Move_SPARK:: @ 81C9643 loadspritegfx ANIM_TAG_SPARK_2 delay 0 createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 5, 5, 23551 - playsewithpan SE_W085B, 192 + playsewithpan SE_M_THUNDERBOLT2, 192 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 24, 190, 12, 0, 1, 0 delay 0 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 24, 22, 12, 0, 1, 0 @@ -2021,7 +2021,7 @@ Move_SPARK:: @ 81C9643 createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 0, 0, 23551 delay 10 createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 5, 5, 23551 - playsewithpan SE_W085B, 192 + playsewithpan SE_M_THUNDERBOLT2, 192 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 24, 60, 10, 0, 1, 0 createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 24, 42, 11, 0, 1, 1 delay 0 @@ -2030,7 +2030,7 @@ Move_SPARK:: @ 81C9643 createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 0, 0, 23551 delay 20 createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 7, 7, 23551 - playsewithpan SE_W085B, 192 + playsewithpan SE_M_THUNDERBOLT2, 192 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0 @@ -2044,7 +2044,7 @@ Move_SPARK:: @ 81C9643 createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 0, 0, 23551 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 - playsewithpan SE_W063, 63 + playsewithpan SE_M_HYPER_BEAM, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -2055,12 +2055,12 @@ Move_SPARK:: @ 81C9643 Move_ATTRACT:: @ 81C985A loadspritegfx ANIM_TAG_RED_HEART - loopsewithpan SE_W204, 192, 12, 3 + loopsewithpan SE_M_CHARM, 192, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, 0 delay 15 createsprite gRedHeartProjectileSpriteTemplate, ANIM_TARGET, 3, 20, -8 waitforvisualfinish - playsewithpan SE_W213, 63 + playsewithpan SE_M_ATTRACT, 63 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -32 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -40 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -16 @@ -2068,7 +2068,7 @@ Move_ATTRACT:: @ 81C985A createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -128, -22 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31 waitforvisualfinish - waitplaysewithpan SE_W213B, 0, 15 + waitplaysewithpan SE_M_ATTRACT2, 0, 15 createvisualtask AnimTask_HeartsBackground, 5, createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 16, 256, 0 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 224, 240, 15 @@ -2091,7 +2091,7 @@ Move_GROWTH:: @ 81C9953 GrowthEffect:: @ 81C9960 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, 0, 0 return @@ -2104,12 +2104,12 @@ Move_WHIRLWIND:: @ 81C9989 createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 1, 60, 4 createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 1, 60, 0 delay 5 - loopsewithpan SE_W104, 63, 10, 4 + loopsewithpan SE_M_DOUBLE_TEAM, 63, 10, 4 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 15, 1 delay 29 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 1, 12, 6, 1, 5 delay 7 - playsewithpan SE_W081, 63 + playsewithpan SE_M_STRING_SHOT, 63 createvisualtask AnimTask_SlideOffScreen, 5, 1, 8 waitforvisualfinish end @@ -2124,7 +2124,7 @@ Move_CONFUSE_RAY:: @ 81C9A31 createsprite gConfuseRayBallBounceSpriteTemplate, ANIM_TARGET, 2, 28, 0, 288 waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W081B, 63 + playsewithpan SE_M_STRING_SHOT2, 63 createsprite gConfuseRayBallSpiralSpriteTemplate, ANIM_TARGET, 2, 0, -16 waitforvisualfinish delay 0 @@ -2149,10 +2149,10 @@ Move_LOCK_ON:: @ 81C9A84 Move_MEAN_LOOK:: @ 81C9ABA loadspritegfx ANIM_TAG_EYE monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, 0 - loopsewithpan SE_W109, 63, 15, 4 - waitplaysewithpan SE_W043, 63, 85 + loopsewithpan SE_M_CONFUSE_RAY, 63, 15, 4 + waitplaysewithpan SE_M_LEER, 63, 85 createsprite gMeanLookEyeSpriteTemplate, ANIM_ATTACKER, 2, delay 120 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, 0 @@ -2165,20 +2165,20 @@ Move_ROCK_THROW:: @ 81C9AFF loadspritegfx ANIM_TAG_ROCKS createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_TARGET, 2, 6, 1, 15, 1 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 0, 1, 0, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 19, 1, 10, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -23, 2, -10, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 5, 20, 1 delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -15, 1, -10, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 6 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 23, 2, 10, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 waitforvisualfinish end @@ -2187,16 +2187,16 @@ Move_ROCK_SLIDE:: @ 81C9B8B monbg ANIM_DEF_PARTNER createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 7, 1, 11, 1 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -5, 1, -5, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 5, 0, 6, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 19, 1, 10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -23, 2, -10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 5, 50, 1 createvisualtask AnimTask_ShakeMon, 2, 3, 0, 5, 50, 1 delay 2 @@ -2208,28 +2208,28 @@ Move_ROCK_SLIDE:: @ 81C9B8B RockSlideRocks:: @ 81C9C23 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 28, 1, 10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -10, 1, -5, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 10, 0, 6, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 24, 1, 10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -32, 2, -10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 30, 2, 10, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 2 return @@ -2242,7 +2242,7 @@ Move_THIEF:: @ 81C9CCC setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 6 - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 8, 1 waitforvisualfinish @@ -2273,22 +2273,22 @@ Move_BUBBLE_BEAM:: @ 81C9D13 BulbblebeamCreateBubbles:: @ 81C9D4D createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 35, 70, 0, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 20, 40, -10, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 10, -60, 0, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 30, 10, -10, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 delay 3 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 256, 50 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 delay 3 return @@ -2299,14 +2299,14 @@ Move_ICY_WIND:: @ 81C9DF0 createvisualtask AnimTask_BlendSelected, 10, 11, 4, 0, 4, RGB_BLACK fadetobg 15 waitbgfadeout - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 waitbgfadein waitforvisualfinish - panse_1B SE_W016, 192, 63, 2, 0 + panse_1B SE_M_GUST, 192, 63, 2, 0 call IcyWindSwirlingSnowballs delay 5 call IcyWindSwirlingSnowballs - playsewithpan SE_W016B, 63 + playsewithpan SE_M_GUST2, 63 delay 55 call IceSpikesEffectLong waitforvisualfinish @@ -2332,12 +2332,12 @@ IcyWindSwirlingSnowballs:: @ 81C9E48 Move_SMOKESCREEN:: @ 81C9EB0 loadspritegfx ANIM_TAG_BLACK_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 createsprite gBlackBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish createvisualtask AnimTask_SmokescreenImpact, 2, delay 2 - playsewithpan SE_W028, 63 + playsewithpan SE_M_SAND_ATTACK, 63 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 104, 0, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 72, 1, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -6, 56, 1, 75 @@ -2359,7 +2359,7 @@ Move_CONVERSION:: @ 81C9FA9 monbgprio_28 0 setalpha 16, 0 delay 0 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -24 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -24 @@ -2368,7 +2368,7 @@ Move_CONVERSION:: @ 81C9FA9 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -24 delay 3 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, -8 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, -8 @@ -2377,7 +2377,7 @@ Move_CONVERSION:: @ 81C9FA9 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, -8 delay 3 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 8 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 8 @@ -2386,7 +2386,7 @@ Move_CONVERSION:: @ 81C9FA9 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 8 delay 3 - playsewithpan SE_W129, 192 + playsewithpan SE_M_SWIFT, 192 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -24, 24 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, -8, 24 @@ -2395,7 +2395,7 @@ Move_CONVERSION:: @ 81C9FA9 delay 3 createsprite gConversionSpriteTemplate, ANIM_ATTACKER, 2, 24, 24 delay 20 - playsewithpan SE_W112, 192 + playsewithpan SE_M_BARRIER, 192 createvisualtask AnimTask_FlashAnimTagWithColor, 2, 10018, 1, 1, 14335, 12, 0, 0 delay 6 createvisualtask AnimTask_ConversionAlphaBlend, 5, @@ -2411,7 +2411,7 @@ Move_CONVERSION_2:: @ 81CA0BE monbgprio_2A 1 setalpha 0, 16 delay 0 - playsewithpan SE_W112, 63 + playsewithpan SE_M_BARRIER, 63 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -24, -24, 60 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, -24, 65 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, -24, 70 @@ -2430,21 +2430,21 @@ Move_CONVERSION_2:: @ 81CA0BE createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135 createvisualtask AnimTask_Conversion2AlphaBlend, 5, delay 60 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 delay 10 - playsewithpan SE_W129, 63 + playsewithpan SE_M_SWIFT, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -2456,14 +2456,14 @@ Move_ROLLING_KICK:: @ 81CA1DA monbg 1 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 1, 4 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 6 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 createsprite gSlidingKickSpriteTemplate, ANIM_ATTACKER, 2, -24, 0, 48, 10, 160, 0 delay 5 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 waitforvisualfinish @@ -2475,7 +2475,7 @@ Move_ROLLING_KICK:: @ 81CA1DA Move_HEADBUTT:: @ 81CA25D loadspritegfx ANIM_TAG_IMPACT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 @@ -2484,7 +2484,7 @@ Move_HEADBUTT:: @ 81CA25D createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish end @@ -2492,7 +2492,7 @@ Move_HORN_ATTACK:: @ 81CA2BA loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 @@ -2502,7 +2502,7 @@ Move_HORN_ATTACK:: @ 81CA2BA createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 waitforvisualfinish end @@ -2520,14 +2520,14 @@ FuryAttackRight:: @ 81CA358 createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 8, 8, 10 waitforvisualfinish createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 goto FuryAttackContinue FuryAttackLeft:: @ 81CA37E createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, -8, -8, 10 waitforvisualfinish createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 goto FuryAttackContinue Move_HORN_DRILL:: @ 81CA3A4 @@ -2541,47 +2541,47 @@ HornDrillContinue:: @ 81CA3C1 waitbgfadein setalpha 12, 8 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 waitforvisualfinish delay 2 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1 createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 0, 0, 12 waitforvisualfinish - playse SE_BAN + playse SE_BANG createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 10, 0, 40, 1 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 2, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -4, 3, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -8, -5, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 4, -12, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 16, 0, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 5, 18, 1, 3 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -17, 12, 1, 2 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -21, -15, 1, 2 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -27, 1, 2 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 0, 1, 2 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 delay 4 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2 waitforvisualfinish @@ -2604,15 +2604,15 @@ Move_THRASH:: @ 81CA521 createvisualtask AnimTask_ThrashMoveMonVertical, 2, createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 4, 0, 7, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 28 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 4, 0, 7, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 28 createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 3 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 8, 0, 16, 1 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 end Move_SING:: @ 81CA5A0 @@ -2620,7 +2620,7 @@ Move_SING:: @ 81CA5A0 monbg ANIM_DEF_PARTNER createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish - panse_1B SE_W047, 192, 63, 2, 0 + panse_1B SE_M_SING, 192, 63, 2, 0 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 0, 12 delay 5 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 12 @@ -2659,7 +2659,7 @@ Move_LOW_KICK:: @ 81CA674 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 8, 1, 2 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, 1, 2 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 end @@ -2667,7 +2667,7 @@ Move_LOW_KICK:: @ 81CA674 Move_EARTHQUAKE:: @ 81CA6D1 createvisualtask AnimTask_HorizontalShake, 5, 5, 10, 50 createvisualtask AnimTask_HorizontalShake, 5, 4, 10, 50 - playsewithpan SE_W089, 0 + playsewithpan SE_M_EARTHQUAKE, 0 delay 10 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 delay 16 @@ -2678,7 +2678,7 @@ Move_FISSURE:: @ 81CA71E loadspritegfx ANIM_TAG_MUD_SAND createvisualtask AnimTask_HorizontalShake, 3, 5, 10, 50 createvisualtask AnimTask_HorizontalShake, 3, 1, 10, 50 - playsewithpan SE_W089, 63 + playsewithpan SE_M_EARTHQUAKE, 63 delay 8 call FissureDirtPlumeFar delay 15 @@ -2706,7 +2706,7 @@ FissureDirtPlumeFar:: @ 81CA79F createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 16, -16, -10, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 14, -52, -18, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 12, -32, -16, 24 - playsewithpan SE_W091, 63 + playsewithpan SE_M_DIG, 63 return FissureDirtPlumeClose:: @ 81CA7F0 @@ -2714,7 +2714,7 @@ FissureDirtPlumeClose:: @ 81CA7F0 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 16, -38, -10, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 14, -20, -18, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 12, -36, -16, 24 - playsewithpan SE_W091, 63 + playsewithpan SE_M_DIG, 63 return Move_DIG:: @ 81CA841 @@ -2755,7 +2755,7 @@ DigUnleash:: @ 81CA8A6 delay 16 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 - playsewithpan SE_W025B, 192 + playsewithpan SE_M_MEGA_KICK2, 192 clearmonbg ANIM_ATTACKER goto DigEnd @@ -2764,16 +2764,16 @@ DigThrowDirt:: @ 81CA90A createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 16, 4, -10, 18 createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 14, 4, -18, 18 createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 12, 4, -16, 18 - playsewithpan SE_W091, 192 + playsewithpan SE_M_DIG, 192 delay 32 return Move_MEDITATE:: @ 81CA95D call SetPsychicBackground createvisualtask AnimTask_MeditateStretchAttacker, 2 - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 delay 16 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 waitforvisualfinish call UnsetPsychicBg end @@ -2783,15 +2783,15 @@ Move_AGILITY:: @ 81CA97A setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 4, 4 createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 7, 10 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 12 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 12 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 12 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 12 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 12 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -2805,11 +2805,11 @@ Move_QUICK_ATTACK:: @ 81CA9C4 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 1, 5 createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 7, 3 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 delay 4 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -2823,16 +2823,16 @@ Move_RAGE:: @ 81CAA1C setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, 0, 31, 10, 0, 2 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, -28 - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 delay 20 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 1, 1, 10, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish clearmonbg 1 end @@ -2840,7 +2840,7 @@ Move_RAGE:: @ 81CAA1C Move_TELEPORT:: @ 81CAA92 call SetPsychicBackground createvisualtask AnimTask_Teleport, 2 - playsewithpan SE_W100, 192 + playsewithpan SE_M_TELEPORT, 192 delay 15 call UnsetPsychicBg waitforvisualfinish @@ -2850,23 +2850,23 @@ Move_DOUBLE_TEAM:: @ 81CAAAB monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_DoubleTeam, 2, - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 32 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 24 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 16 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 delay 8 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -2876,7 +2876,7 @@ Move_DOUBLE_TEAM:: @ 81CAAAB Move_MINIMIZE:: @ 81CAAF2 setalpha 10, 8 createvisualtask AnimTask_Minimize, 2, - loopsewithpan SE_W107, 192, 34, 3 + loopsewithpan SE_M_MINIMIZE, 192, 34, 3 waitforvisualfinish blendoff end @@ -2885,11 +2885,11 @@ Move_METRONOME:: @ 81CAB05 loadspritegfx ANIM_TAG_FINGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100 - playsewithpan SE_W118, 192 + playsewithpan SE_M_METRONOME, 192 delay 6 createsprite gMetronomeFingerSpriteTemplate, ANIM_ATTACKER, 12, 0 delay 24 - loopsewithpan SE_W039, 192, 22, 3 + loopsewithpan SE_M_TAIL_WHIP, 192, 22, 3 waitforvisualfinish end @@ -2906,7 +2906,7 @@ SkullBashSetUp:: @ 81CAB39 SkullBashSetUpHeadDown:: @ 81CAB49 createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 0, 0, 10, 0 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 waitforvisualfinish createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, 0, 2 waitforvisualfinish @@ -2917,14 +2917,14 @@ SkullBashSetUpHeadDown:: @ 81CAB49 SkullBashAttack:: @ 81CAB86 loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SkullBashPosition, 2, 0 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 waitforvisualfinish - playse SE_BAN + playse SE_BANG createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 10, 0, 40, 1 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, 1, 0 - loopsewithpan SE_W025B, 63, 8, 3 + loopsewithpan SE_M_MEGA_KICK2, 63, 8, 3 waitforvisualfinish createvisualtask AnimTask_SkullBashPosition, 2, 1 goto SkullBashEnd @@ -2934,9 +2934,9 @@ Move_AMNESIA:: @ 81CABF5 call SetPsychicBackground delay 8 createsprite gQuestionMarkSpriteTemplate, ANIM_ATTACKER, 20 - playsewithpan SE_W118, 192 + playsewithpan SE_M_METRONOME, 192 delay 54 - loopsewithpan SE_W118, 192, 16, 3 + loopsewithpan SE_M_METRONOME, 192, 16, 3 waitforvisualfinish call UnsetPsychicBg end @@ -2944,18 +2944,18 @@ Move_AMNESIA:: @ 81CABF5 Move_KINESIS:: @ 81CAC19 loadspritegfx ANIM_TAG_ALERT loadspritegfx ANIM_TAG_BENT_SPOON - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground createsprite gBentSpoonSpriteTemplate, ANIM_ATTACKER, 20 createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, -8, 0 createsprite gKinesisZapEnergySpriteTemplate, ANIM_ATTACKER, 19, 32, 16, 1 - loopsewithpan SE_W109, 192, 21, 2 + loopsewithpan SE_M_CONFUSE_RAY, 192, 21, 2 delay 60 - playsewithpan SE_W146, 192 + playsewithpan SE_M_DIZZY_PUNCH, 192 delay 30 - loopsewithpan SE_W146, 192, 20, 2 + loopsewithpan SE_M_DIZZY_PUNCH, 192, 20, 2 delay 70 - playsewithpan SE_W207B, 192 + playsewithpan SE_M_SWAGGER2, 192 waitforvisualfinish call UnsetPsychicBg end @@ -2964,14 +2964,14 @@ Move_GLARE:: @ 81CAC6A loadspritegfx ANIM_TAG_SMALL_RED_EYE loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask AnimTask_GlareEyeDots, 5, 0 - playsewithpan SE_W060B, 192 + playsewithpan SE_M_PSYBEAM2, 192 waitforvisualfinish createvisualtask AnimTask_BlendSelected, 5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 createvisualtask AnimTask_ScaryFace, 5, - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 delay 2 createvisualtask AnimTask_ShakeTargetInPattern, 3, 20, 1, 0 waitforvisualfinish @@ -2981,12 +2981,12 @@ Move_GLARE:: @ 81CAC6A Move_BARRAGE:: @ 81CACD3 loadspritegfx ANIM_TAG_RED_BALL createvisualtask AnimTask_BarrageBall, 3, - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 delay 24 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, 40, 1 createvisualtask AnimTask_ShakeMon, 3, 1, 0, 4, 20, 1 createvisualtask AnimTask_ShakeMon, 3, 3, 0, 4, 20, 1 - loopsewithpan SE_W070, 63, 8, 2 + loopsewithpan SE_M_STRENGTH, 63, 8, 2 end Move_SKY_ATTACK:: @ 81CAD1B @@ -3007,7 +3007,7 @@ SkyAttackSetUpAgainstOpponent:: @ 81CAD40 delay 12 createvisualtask AnimTask_BlendSelected, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask AnimTask_HorizontalShake, 5, 0, 2, 16 - loopsewithpan SE_W287, 192, 4, 8 + loopsewithpan SE_M_STAT_INCREASE, 192, 4, 8 createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 15, RGB_WHITE delay 20 createvisualtask AnimTask_BlendSelected, 10, 2, 1, 15, 0, RGB_WHITE @@ -3024,7 +3024,7 @@ SkyAttackSetUpAgainstPartner:: @ 81CADB7 delay 12 createvisualtask AnimTask_BlendSelected, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask AnimTask_HorizontalShake, 5, 0, 2, 16 - playsewithpan SE_W287, 192 + playsewithpan SE_M_STAT_INCREASE, 192 delay 8 createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 15, RGB_WHITE delay 20 @@ -3060,7 +3060,7 @@ SkyAttackUnleash:: @ 81CAE2E goto SkyAttackEnd Move_FLASH:: @ 81CAEB3 - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 createvisualtask AnimTask_Flash, 2 waitforvisualfinish end @@ -3068,7 +3068,7 @@ Move_FLASH:: @ 81CAEB3 Move_SPLASH:: @ 81CAEC0 createvisualtask AnimTask_Splash, 2, 0, 3 delay 8 - loopsewithpan SE_W039, 192, 38, 3 + loopsewithpan SE_M_TAIL_WHIP, 192, 38, 3 waitforvisualfinish end @@ -3076,7 +3076,7 @@ Move_ACID_ARMOR:: @ 81CAED5 monbg ANIM_ATTACKER setalpha 15, 0 createvisualtask AnimTask_AcidArmor, 2, 0 - playsewithpan SE_W151, 192 + playsewithpan SE_M_ACID_ARMOR, 192 waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER @@ -3092,7 +3092,7 @@ Move_SHARPEN:: @ 81CAEEE Move_SUPER_FANG:: @ 81CAEFA loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 1, 0, 20, 1 - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 3, 0, 48, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, 0, 1247, 12, 4, 1 @@ -3101,7 +3101,7 @@ Move_SUPER_FANG:: @ 81CAEFA createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 createsprite gSuperFangSpriteTemplate, ANIM_TARGET, 2, - playsewithpan SE_W044, 63 + playsewithpan SE_M_BITE, 63 delay 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 2143, 14, RGB_WHITE, 14 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 7, 12, 1 @@ -3112,11 +3112,11 @@ Move_SUPER_FANG:: @ 81CAEFA Move_SLASH:: @ 81CAF7B loadspritegfx ANIM_TAG_SLASH createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 delay 4 createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, 8, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 18, 1 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish end @@ -3128,11 +3128,11 @@ Move_STRUGGLE:: @ 81CAFB5 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 3, 0, 12, 4 createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 2 - loopsewithpan SE_W029, 192, 12, 4 + loopsewithpan SE_M_HEADBUTT, 192, 12, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -3146,7 +3146,7 @@ Move_SKETCH:: @ 81CB01B waitforvisualfinish clearmonbg 1 createvisualtask AnimTask_Splash, 2, 0, 2 - loopsewithpan SE_W039, 192, 38, 2 + loopsewithpan SE_M_TAIL_WHIP, 192, 38, 2 end Move_NIGHTMARE:: @ 81CB043 @@ -3156,7 +3156,7 @@ Move_NIGHTMARE:: @ 81CB043 monbg ANIM_DEF_PARTNER createvisualtask AnimTask_NightmareClone, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 40, 1 - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER restorebg @@ -3166,7 +3166,7 @@ Move_NIGHTMARE:: @ 81CB043 NightmareInContest:: @ 81CB06F createvisualtask AnimTask_BlendMonInAndOut, 2, 0, RGB_WHITE, 10, 2, 1 createvisualtask AnimTask_ShakeMon, 2, 0, 3, 0, 32, 1 - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 waitforvisualfinish restorebg waitbgfadein @@ -3177,11 +3177,11 @@ Move_FLAIL:: @ 81CB099 monbg 1 setalpha 12, 8 createvisualtask AnimTask_FlailMovement, 2, 0 - loopsewithpan SE_W029, 192, 8, 2 + loopsewithpan SE_M_HEADBUTT, 192, 8, 2 waitforvisualfinish createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 30, 1, 0 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -3189,12 +3189,12 @@ Move_FLAIL:: @ 81CB099 Move_SPITE:: @ 81CB0D6 fadetobg 2 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 waitbgfadein monbg ANIM_DEF_PARTNER createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 6, 0, 8, RGB_WHITE createvisualtask AnimTask_SpiteTargetShadow, 2 - loopsewithpan SE_W060, 63, 20, 3 + loopsewithpan SE_M_PSYBEAM, 63, 20, 3 waitforvisualfinish restorebg waitbgfadein @@ -3216,11 +3216,11 @@ MachPunchContinue:: @ 81CB11E delay 0 setalpha 9, 8 createvisualtask AnimTask_AttackerPunchWithTrace, 2, 28968, 10 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -3242,13 +3242,13 @@ Move_FORESIGHT:: @ 81CB18D setalpha 16, 0 createsprite gForesightMagnifyingGlassSpriteTemplate, ANIM_TARGET, 2, 1 delay 17 - loopsewithpan SE_W166, 63, 16, 4 + loopsewithpan SE_M_SKETCH, 63, 16, 4 delay 48 delay 24 - playsewithpan SE_W166, 63 + playsewithpan SE_M_SKETCH, 63 delay 10 createvisualtask AnimTask_BlendMonInAndOut, 5, 1, RGB_WHITE, 12, 2, 1 - playsewithpan SE_W197, 63 + playsewithpan SE_M_DETECT, 63 waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -3257,16 +3257,16 @@ Move_FORESIGHT:: @ 81CB18D Move_DESTINY_BOND:: @ 81CB1CC loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg 2 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 waitbgfadein createvisualtask AnimTask_DestinyBondWhiteShadow, 5, 0, 48 - playsewithpan SE_W109, 192 + playsewithpan SE_M_CONFUSE_RAY, 192 delay 48 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 24, 1 createvisualtask AnimTask_BlendExcept, 2, 6, 1, 0, 12, 30653 delay 24 createvisualtask AnimTask_BlendExcept, 2, 6, 1, 12, 0, 30653 - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 waitforvisualfinish restorebg waitbgfadein @@ -3276,7 +3276,7 @@ Move_DESTINY_BOND:: @ 81CB1CC Move_ENDURE:: @ 81CB227 loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 call EndureEffect delay 8 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 @@ -3303,13 +3303,13 @@ Move_CHARM:: @ 81CB2BB loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 waitforvisualfinish end @@ -3324,7 +3324,7 @@ Move_ROLLOUT:: @ 81CB2FE waitforvisualfinish createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 30, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 1, 2 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -3334,44 +3334,44 @@ Move_FALSE_SWIPE:: @ 81CB33F loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_IMPACT createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2, - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 delay 16 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 0 - playsewithpan SE_W104, 63 + playsewithpan SE_M_DOUBLE_TEAM, 63 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 16 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 32 - playsewithpan SE_W104, 63 + playsewithpan SE_M_DOUBLE_TEAM, 63 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 48 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 64 - playsewithpan SE_W104, 63 + playsewithpan SE_M_DOUBLE_TEAM, 63 delay 2 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 80 delay 2 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 end Move_SWAGGER:: @ 81CB3C6 loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER createvisualtask AnimTask_GrowAndShrink, 2, - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 waitforvisualfinish createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, - loopsewithpan SE_W207, 192, 4, 2 + loopsewithpan SE_M_SWAGGER, 192, 4, 2 waitforvisualfinish delay 24 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 delay 12 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 waitforvisualfinish end @@ -3382,14 +3382,14 @@ Move_MILK_DRINK:: @ 81CB40E monbg 1 createsprite gMilkBottleSpriteTemplate, ANIM_ATTACKER, 2, delay 40 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 delay 12 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 delay 20 - playsewithpan SE_W152, 192 + playsewithpan SE_M_CRABHAMMER, 192 waitforvisualfinish createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 - playsewithpan SE_W208, 192 + playsewithpan SE_M_MILK_DRINK, 192 waitforvisualfinish clearmonbg 1 call HealingEffect2 @@ -3407,13 +3407,13 @@ MagnitudeEnd:: @ 81CB468 MagnitudeRegular:: @ 81CB469 createvisualtask AnimTask_HorizontalShake, 5, 5, 0, 50 createvisualtask AnimTask_HorizontalShake, 5, 4, 0, 50 - loopsewithpan SE_W070, 63, 8, 10 + loopsewithpan SE_M_STRENGTH, 63, 8, 10 goto MagnitudeEnd MagnitudeIntense:: @ 81CB48E createvisualtask AnimTask_HorizontalShake, 5, 5, 0, 50 createvisualtask AnimTask_HorizontalShake, 5, 4, 0, 50 - loopsewithpan SE_W070, 63, 8, 10 + loopsewithpan SE_M_STRENGTH, 63, 8, 10 delay 10 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 delay 16 @@ -3426,15 +3426,15 @@ Move_RAPID_SPIN:: @ 81CB4E1 monbg ANIM_ATTACKER createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 0 - loopsewithpan SE_W013B, 192, 8, 4 + loopsewithpan SE_M_RAZOR_WIND2, 192, 8, 4 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 10, 1, 0 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 waitforvisualfinish delay 8 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 1 - loopsewithpan SE_W013B, 192, 8, 4 + loopsewithpan SE_M_RAZOR_WIND2, 192, 8, 4 waitforvisualfinish clearmonbg ANIM_ATTACKER end @@ -3448,7 +3448,7 @@ Move_MOONLIGHT:: @ 81CB54E waitforvisualfinish createsprite gMoonSpriteTemplate, ANIM_ATTACKER, 2, 120, 56 createvisualtask AnimTask_AlphaFadeIn, 3, 0, 16, 16, 0, 1 - playsewithpan SE_W236, 0 + playsewithpan SE_M_MOONLIGHT, 0 delay 30 createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, -12, 0 delay 30 @@ -3478,7 +3478,7 @@ ExtremeSpeedContinue:: @ 81CB5F5 createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein createvisualtask AnimTask_StretchAttacker, 2 - loopsewithpan SE_W013B, 192, 8, 3 + loopsewithpan SE_M_RAZOR_WIND2, 192, 8, 3 waitforvisualfinish delay 1 createvisualtask AnimTask_SetAttackerInvisibleWaitForSignal, 2 @@ -3487,19 +3487,19 @@ ExtremeSpeedContinue:: @ 81CB5F5 delay 18 createvisualtask AnimTask_ExtremeSpeedImpact, 2, delay 2 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, 1, 0, -12, 3 delay 10 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, 1, 0, 12, 3 delay 10 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, 3 waitforvisualfinish createvisualtask AnimTask_SpeedDust, 2, delay 10 createvisualtask AnimTask_ExtremeSpeedMonReappear, 2, - loopsewithpan SE_W104, 192, 8, 4 + loopsewithpan SE_M_DOUBLE_TEAM, 192, 8, 4 waitforvisualfinish restorebg waitbgfadeout @@ -3522,19 +3522,19 @@ Move_UPROAR:: @ 81CB69C monbg ANIM_DEF_PARTNER createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, 192 + playsewithpan SE_M_UPROAR, 192 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1 delay 16 createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, 192 + playsewithpan SE_M_UPROAR, 192 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0 delay 16 createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 - playsewithpan SE_W253, 192 + playsewithpan SE_M_UPROAR, 192 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1 createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, -24, 0 waitforvisualfinish @@ -3546,7 +3546,7 @@ Move_HEAT_WAVE:: @ 81CB766 createvisualtask AnimTask_BlendParticle, 5, 10261, 0, 6, 6, 31 createvisualtask AnimTask_LoadSandstormBackground, 5, 1 createvisualtask AnimTask_BlendBackground, 6, 6, 31 - panse_1B SE_W257, 192, 63, 2, 0 + panse_1B SE_M_HEAT_WAVE, 192, 63, 2, 0 delay 4 createvisualtask AnimTask_MoveHeatWaveTargets, 5 delay 12 @@ -3571,7 +3571,7 @@ Move_HAIL:: @ 81CB816 createvisualtask AnimTask_BlendSelected, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_Hail1, 5, - loopsewithpan SE_W258, 0, 8, 10 + loopsewithpan SE_M_HAIL, 0, 8, 10 waitforvisualfinish createvisualtask AnimTask_BlendSelected, 10, 1, 3, 6, 0, RGB_BLACK end @@ -3583,10 +3583,10 @@ Move_TORMENT:: @ 81CB84E waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, 1, 31, 10, 1, 1 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 delay 20 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 end Move_MEMENTO:: @ 81CB892 @@ -3595,9 +3595,9 @@ Move_MEMENTO:: @ 81CB892 createvisualtask AnimTask_InitMementoShadow, 2 delay 1 createvisualtask AnimTask_MoveAttackerMementoShadow, 5 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 delay 48 - playsewithpan SE_W060B, 192 + playsewithpan SE_M_PSYBEAM2, 192 waitforvisualfinish createvisualtask sub_80B8664, 2, delay 12 @@ -3605,7 +3605,7 @@ Move_MEMENTO:: @ 81CB892 delay 1 monbg_22 1 createvisualtask AnimTask_MoveTargetMementoShadow, 5 - playsewithpan SE_W060, 63 + playsewithpan SE_M_PSYBEAM, 63 waitforvisualfinish clearmonbg_23 1 delay 1 @@ -3617,7 +3617,7 @@ Move_FACADE:: @ 81CB8D6 loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask AnimTask_SquishAndSweatDroplets, 2, 0, 3 createvisualtask AnimTask_FacadeColorBlend, 2, 0, 72 - loopsewithpan SE_W207, 192, 24, 3 + loopsewithpan SE_M_SWAGGER, 192, 24, 3 end Move_SMELLING_SALT:: @ 81CB8F6 @@ -3627,22 +3627,22 @@ Move_SMELLING_SALT:: @ 81CB8F6 createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, 1, 1, 2 delay 32 createvisualtask AnimTask_SmellingSaltsSquish, 3, 1, 2 - loopsewithpan SE_W003, 63, 12, 2 + loopsewithpan SE_M_DOUBLE_SLAP, 63, 12, 2 waitforvisualfinish delay 4 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 6, 2 createsprite gSmellingSaltExclamationSpriteTemplate, ANIM_TARGET, 2, 1, 8, 3 - loopsewithpan SE_W207B, 63, 16, 3 + loopsewithpan SE_M_SWAGGER2, 63, 16, 3 end Move_FOLLOW_ME:: @ 81CB951 loadspritegfx ANIM_TAG_FINGER createsprite gFollowMeFingerSpriteTemplate, ANIM_ATTACKER, 2, 0 - playsewithpan SE_W039, 192 + playsewithpan SE_M_TAIL_WHIP, 192 delay 18 - playsewithpan SE_W213, 192 + playsewithpan SE_M_ATTRACT, 192 delay 71 - loopsewithpan SE_W039, 192, 22, 3 + loopsewithpan SE_M_TAIL_WHIP, 192, 22, 3 end Move_CHARGE:: @ 81CB970 @@ -3654,26 +3654,26 @@ Move_CHARGE:: @ 81CB970 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 0 waitforvisualfinish createvisualtask AnimTask_ElectricChargingParticles, 2, 0, 60, 2, 12 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 delay 30 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 delay 30 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 createsprite gGrowingChargeOrbSpriteTemplate, ANIM_ATTACKER, 2, 0 delay 25 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 delay 20 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 delay 15 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 delay 10 delay 6 - loopsewithpan SE_W268, 192, 6, 5 + loopsewithpan SE_M_CHARGE, 192, 6, 5 waitforvisualfinish createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 16 delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -16 - playsewithpan SE_W085B, 192 + playsewithpan SE_M_THUNDERBOLT2, 192 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, 0 clearmonbg ANIM_ATTACKER @@ -3685,19 +3685,19 @@ Move_TAUNT:: @ 81CBA0B loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 45 - playsewithpan SE_W118, 192 + playsewithpan SE_M_METRONOME, 192 delay 6 createsprite gTauntFingerSpriteTemplate, ANIM_ATTACKER, 12, 0 delay 4 - loopsewithpan SE_W039, 192, 16, 2 + loopsewithpan SE_M_TAIL_WHIP, 192, 16, 2 waitforvisualfinish delay 8 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 waitforvisualfinish delay 12 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -28 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 end Move_HELPING_HAND:: @ 81CBA5F @@ -3706,13 +3706,13 @@ Move_HELPING_HAND:: @ 81CBA5F createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0 createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1 delay 19 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, 2, 2, 0, 5, 1 delay 14 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, 2, 2, 0, 5, 1 delay 20 - playsewithpan SE_W227, 0 + playsewithpan SE_M_ENCORE, 0 createvisualtask AnimTask_ShakeMon2, 2, 2, 3, 0, 10, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, 2, 1023, 12, 1, 1 end @@ -3722,16 +3722,16 @@ Move_ASSIST:: @ 81CBAD2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 end Move_SUPERPOWER:: @ 81CBB43 @@ -3742,7 +3742,7 @@ Move_SUPERPOWER:: @ 81CBB43 monbgprio_28 0 setalpha 12, 8 createsprite gSuperpowerOrbSpriteTemplate, ANIM_TARGET, 2, 0 - playsewithpan SE_W025, 192 + playsewithpan SE_M_MEGA_KICK, 192 delay 20 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 180, 1 createvisualtask SoundTask_PlaySE2WithPanning, 5, 227, 0 @@ -3758,10 +3758,10 @@ Move_SUPERPOWER:: @ 81CBB43 createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 60, 288, 3, 88 delay 74 createsprite gSuperpowerFireballSpriteTemplate, ANIM_TARGET, 3, 0 - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 delay 16 createvisualtask AnimTask_ShakeMon2, 2, 1, 8, 0, 16, 1 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -3774,10 +3774,10 @@ Move_RECYCLE:: @ 81CBBFE setalpha 0, 16 delay 1 createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2, - loopsewithpan SE_W036, 192, 24, 3 + loopsewithpan SE_M_TAKE_DOWN, 192, 24, 3 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, 0, RGB_WHITE, 12, 2, 1 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 waitforvisualfinish blendoff clearmonbg ANIM_ATTACKER @@ -3799,20 +3799,20 @@ BrickBreakNormal:: @ 81CBC47 delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, -18, -18, 10, 1, 0 - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 18, 18, 10, 1, 0 - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 delay 20 createvisualtask AnimTask_WindUpLunge, 2, 0, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, 0 delay 37 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, 0 waitforvisualfinish @@ -3828,26 +3828,26 @@ BrickBreakShatteredWall:: @ 81CBD16 delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -18, -18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, -18, -18, 10, 1, 0 - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, 18, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 18, 18, 10, 1, 0 - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 delay 20 createvisualtask AnimTask_WindUpLunge, 2, 0, -24, 0, 24, 10, 24, 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 6, 0 delay 37 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 10, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, -8, -12 createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 8, -12 createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, -8, 12 createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 8, 12 - playsewithpan SE_W280, 63 + playsewithpan SE_M_BRICK_BREAK, 63 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 6, 0, 0 waitforvisualfinish @@ -3857,33 +3857,33 @@ BrickBreakShatteredWall:: @ 81CBD16 Move_YAWN:: @ 81CBE37 loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask AnimTask_DeepInhale, 2, 0 - playsewithpan SE_W281, 192 + playsewithpan SE_M_YAWN, 192 waitforvisualfinish createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 2 - playsewithpan SE_W255, 192 + playsewithpan SE_M_SPIT_UP, 192 delay 4 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 1 delay 4 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 0 waitforvisualfinish createvisualtask AnimTask_DeepInhale, 2, 1 - playsewithpan SE_W281, 63 + playsewithpan SE_M_YAWN, 63 end Move_ENDEAVOR:: @ 81CBE7A loadspritegfx ANIM_TAG_SWEAT_DROP loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SquishAndSweatDroplets, 2, 0, 2 - loopsewithpan SE_W039, 192, 24, 2 + loopsewithpan SE_M_TAIL_WHIP, 192, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 703, 12, 1, 2 delay 6 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, 0, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -12, 1, 2 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 delay 24 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, 0, 1, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -12, 12, 1, 2 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 end Move_ERUPTION:: @ 81CBEEF @@ -3891,10 +3891,10 @@ Move_ERUPTION:: @ 81CBEEF createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 2, 0, 4, 31 waitforvisualfinish createvisualtask AnimTask_EruptionLaunchRocks, 2 - waitplaysewithpan SE_W153, 192, 60 + waitplaysewithpan SE_M_EXPLOSION, 192, 60 waitforvisualfinish createvisualtask AnimTask_EruptionLaunchRocks, 2 - waitplaysewithpan SE_W153, 192, 60 + waitplaysewithpan SE_M_EXPLOSION, 192, 60 waitforvisualfinish delay 30 createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 200, -32, 0, 100, 0 @@ -3906,7 +3906,7 @@ Move_ERUPTION:: @ 81CBEEF delay 22 createvisualtask AnimTask_HorizontalShake, 5, 5, 8, 60 createvisualtask AnimTask_HorizontalShake, 5, 4, 8, 60 - loopsewithpan SE_W088, 63, 16, 12 + loopsewithpan SE_M_ROCK_THROW, 63, 16, 12 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, 31, 4, 4, 0, 31 end @@ -3916,7 +3916,7 @@ Move_SKILL_SWAP:: @ 81CBFBC call SetPsychicBackground createvisualtask AnimTask_SkillSwap, 3, 1 createvisualtask AnimTask_BlendMonInAndOut, 5, 1, RGB_WHITE, 12, 3, 1 - loopsewithpan SE_W179, 192, 24, 3 + loopsewithpan SE_M_REVERSAL, 192, 24, 3 delay 16 createvisualtask AnimTask_SkillSwap, 3, 0 createvisualtask AnimTask_BlendMonInAndOut, 5, 0, RGB_WHITE, 12, 3, 1 @@ -3931,12 +3931,12 @@ Move_IMPRISON:: @ 81CC007 monbg ANIM_DEF_PARTNER createvisualtask AnimTask_ImprisonOrbs, 5 delay 8 - loopsewithpan SE_W030, 192, 8, 5 + loopsewithpan SE_M_HORN_ATTACK, 192, 8, 5 waitforvisualfinish delay 4 createsprite gRedXSpriteTemplate, ANIM_ATTACKER, 5, 0, 40 createvisualtask AnimTask_HorizontalShake, 5, 4, 1, 10 - playsewithpan SE_W063, 192 + playsewithpan SE_M_HYPER_BEAM, 192 clearmonbg ANIM_DEF_PARTNER call UnsetPsychicBg end @@ -3946,13 +3946,13 @@ Move_GRUDGE:: @ 81CC04A monbg ANIM_ATTACKER monbgprio_29 fadetobg 2 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 waitbgfadein createvisualtask AnimTask_GrudgeFlames, 3 - loopsewithpan SE_W052, 192, 16, 4 + loopsewithpan SE_M_EMBER, 192, 16, 4 delay 10 delay 80 - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 waitforvisualfinish restorebg waitbgfadein @@ -3966,7 +3966,7 @@ Move_CAMOUFLAGE:: @ 81CC072 createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 3, 0, 14 delay 16 createvisualtask AnimTask_AttackerFadeToInvisible, 2, 4 - playsewithpan SE_W185, 192 + playsewithpan SE_M_FAINT_ATTACK, 192 waitforvisualfinish delay 8 createvisualtask AnimTask_SetCamouflageBlend, 5, 2, 0, 0, 0 @@ -3985,7 +3985,7 @@ Move_TAIL_GLOW:: @ 81CC0B8 waitforvisualfinish createsprite gTailGlowOrbSpriteTemplate, ANIM_ATTACKER, 66, 0 delay 18 - loopsewithpan SE_W234, 192, 16, 6 + loopsewithpan SE_M_MORNING_SUN, 192, 16, 6 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, 0 clearmonbg ANIM_ATTACKER @@ -4002,7 +4002,7 @@ Move_LUSTER_PURGE:: @ 81CC0FB waitbgfadein monbg ANIM_ATTACKER setalpha 12, 8 - playsewithpan SE_W076, 192 + playsewithpan SE_M_SOLAR_BEAM, 192 createsprite gLusterPurgeCircleSpriteTemplate, ANIM_ATTACKER, 41, 0, 0, 0, 0 delay 20 createvisualtask AnimTask_BlendExcept, 5, 5, 2, 0, 16, -1 @@ -4040,14 +4040,14 @@ Move_MIST_BALL:: @ 81CC212 loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 - playsewithpan SE_W081, 192 + playsewithpan SE_M_STRING_SHOT, 192 createsprite gMistBallSpriteTemplate, ANIM_TARGET, 0, 0, 0, 0, 0, 30, 0 waitforvisualfinish - playsewithpan SE_W028, 63 + playsewithpan SE_M_SAND_ATTACK, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 10, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, 32279, 16, RGB_WHITE, 16 delay 0 - playsewithpan SE_W114, 0 + playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_LoadMistTiles, 5, createvisualtask AnimTask_BlendSelected, 10, 4, 3, 0, 16, RGB_WHITE delay 8 @@ -4060,7 +4060,7 @@ Move_FEATHER_DANCE:: @ 81CC2A1 loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_DEF_PARTNER monbgprio_29 - playsewithpan SE_W080, 63 + playsewithpan SE_M_PETAL_DANCE, 63 delay 0 createsprite gFallingFeatherSpriteTemplate, ANIM_TARGET, 0, 0, -16, 64, 2, 104, 11304, 32, 1 delay 6 @@ -4083,19 +4083,19 @@ Move_TEETER_DANCE:: @ 81CC371 loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_TeeterDanceMovement, 5, createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_M_TEETER_DANCE, 192 delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_M_TEETER_DANCE, 192 delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_M_TEETER_DANCE, 192 delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, -8, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_M_TEETER_DANCE, 192 delay 24 createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 2, 8, -2 - playsewithpan SE_W298, 192 + playsewithpan SE_M_TEETER_DANCE, 192 end Move_MUD_SPORT:: @ 81CC3DC @@ -4104,52 +4104,52 @@ Move_MUD_SPORT:: @ 81CC3DC delay 24 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -4, -16 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 4, -12 - playsewithpan SE_W091, 192 + playsewithpan SE_M_DIG, 192 delay 32 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -3, -12 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 5, -14 - playsewithpan SE_W091, 192 + playsewithpan SE_M_DIG, 192 delay 32 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, -5, -18 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 0, 3, -14 - playsewithpan SE_W091, 192 + playsewithpan SE_M_DIG, 192 delay 16 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 220, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 60, 100 - waitplaysewithpan SE_W145B, 0, 25 + waitplaysewithpan SE_M_BUBBLE2, 0, 25 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 140, 55 - waitplaysewithpan SE_W145B, 0, 14 + waitplaysewithpan SE_M_BUBBLE2, 0, 14 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 180, 50 - waitplaysewithpan SE_W145B, 0, 10 + waitplaysewithpan SE_M_BUBBLE2, 0, 10 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 20, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 90, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 160, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 30, 90 - waitplaysewithpan SE_W145B, 0, 22 + waitplaysewithpan SE_M_BUBBLE2, 0, 22 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 120, 60 - waitplaysewithpan SE_W145B, 0, 15 + waitplaysewithpan SE_M_BUBBLE2, 0, 15 delay 2 createsprite gMudsportMudSpriteTemplate, ANIM_TARGET, 2, 1, 200, 40 - waitplaysewithpan SE_W145B, 0, 10 + waitplaysewithpan SE_M_BUBBLE2, 0, 10 end Move_NEEDLE_ARM:: @ 81CC513 loadspritegfx ANIM_TAG_GREEN_SPIKE loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - loopsewithpan SE_W030, 63, 2, 16 + loopsewithpan SE_M_HORN_ATTACK, 63, 2, 16 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, -32, 16 delay 2 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 22, -22, 16 @@ -4177,7 +4177,7 @@ Move_NEEDLE_ARM:: @ 81CC513 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 18, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 0, -24, 10 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 17, -17, 10 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 24, 0, 10 @@ -4191,7 +4191,7 @@ Move_NEEDLE_ARM:: @ 81CC513 Move_SLACK_OFF:: @ 81CC6C3 loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_SlackOffSquish, 2, 0 - playsewithpan SE_W281, 192 + playsewithpan SE_M_YAWN, 192 waitforvisualfinish call HealingEffect waitforvisualfinish @@ -4208,11 +4208,11 @@ Move_CRUSH_CLAW:: @ 81CC6DB createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 18, 1 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 delay 12 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish waitforvisualfinish blendoff @@ -4220,7 +4220,7 @@ Move_CRUSH_CLAW:: @ 81CC6DB end Move_AROMATHERAPY:: @ 81CC74B - playsewithpan SE_W080, 0 + playsewithpan SE_M_PETAL_DANCE, 0 loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 @@ -4244,15 +4244,15 @@ Move_AROMATHERAPY:: @ 81CC74B delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 0, 7, 0, 13293 delay 1 - playsewithpan SE_W287, 192 + playsewithpan SE_M_STAT_INCREASE, 192 createvisualtask AnimTask_StatusClearedEffect, 2, 1 waitforvisualfinish - playsewithpan SE_W234, 192 + playsewithpan SE_M_MORNING_SUN, 192 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_SHINY, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 43, 3, 10, 0, 13293 createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 waitforvisualfinish @@ -4265,7 +4265,7 @@ Move_FAKE_TEARS:: @ 81CC8AD createvisualtask AnimTask_BlendParticle, 5, 10155, 0, 4, 4, 32108 waitforvisualfinish createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 1 - loopsewithpan SE_W039, 192, 12, 4 + loopsewithpan SE_M_TAIL_WHIP, 192, 12, 4 delay 8 createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0, 1 @@ -4291,7 +4291,7 @@ Move_AIR_CUTTER:: @ 81CC93D delay 0 createvisualtask AnimTask_AirCutterProjectile, 2, 32, -24, 1536, 2, 128 waitforvisualfinish - playsewithpan SE_W015, 63 + playsewithpan SE_M_CUT, 63 createsprite gAirCutterSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0, 2 delay 5 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 @@ -4307,15 +4307,15 @@ Move_ODOR_SLEUTH:: @ 81CC99F createvisualtask AnimTask_OdorSleuthMovement, 5, delay 24 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 delay 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 waitforvisualfinish clearmonbg 1 delay 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, -1, 16, -1, 0 - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 end Move_GRASS_WHISTLE:: @ 81CC9E9 @@ -4324,7 +4324,7 @@ Move_GRASS_WHISTLE:: @ 81CC9E9 waitforvisualfinish createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish - panse_1B SE_W320, 192, 63, 2, 0 + panse_1B SE_M_GRASSWHISTLE, 192, 63, 2, 0 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 1, 0 delay 5 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 6, 1, 0 @@ -4361,7 +4361,7 @@ Move_TICKLE:: @ 81CCADC waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 - playsewithpan SE_W197, 192 + playsewithpan SE_M_DETECT, 192 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 16, 0, 0 waitforvisualfinish @@ -4369,7 +4369,7 @@ Move_TICKLE:: @ 81CCADC createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, 0 delay 12 createvisualtask AnimTask_RockMonBackAndForth, 3, 1, 6, 2 - loopsewithpan SE_W039, 63, 8, 8 + loopsewithpan SE_M_TAIL_WHIP, 63, 8, 8 waitforvisualfinish end @@ -4379,13 +4379,13 @@ Move_WATER_SPOUT:: @ 81CCB48 monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_WaterSpoutLaunch, 5, - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 delay 44 - playsewithpan SE_W291, 192 + playsewithpan SE_M_DIVE, 192 waitforvisualfinish delay 16 createvisualtask AnimTask_WaterSpoutRain, 5, - playsewithpan SE_W057, 63 + playsewithpan SE_M_SURF, 63 clearmonbg ANIM_DEF_PARTNER blendoff end @@ -4398,11 +4398,11 @@ Move_SHADOW_PUNCH:: @ 81CCB76 monbg ANIM_ATK_PARTNER setalpha 9, 8 createvisualtask AnimTask_AttackerPunchWithTrace, 2, 0, 13 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -4417,15 +4417,15 @@ Move_EXTRASENSORY:: @ 81CCBD1 setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 891, 12, 1, 1 createvisualtask AnimTask_ExtrasensoryDistortion, 5, 0 - playsewithpan SE_W020, 63 + playsewithpan SE_M_BIND, 63 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 891, 12, 1, 1 createvisualtask AnimTask_ExtrasensoryDistortion, 5, 1 - playsewithpan SE_W020, 63 + playsewithpan SE_M_BIND, 63 waitforvisualfinish createvisualtask AnimTask_TransparentCloneGrowAndShrink, 5, ANIM_ATTACKER createvisualtask AnimTask_ExtrasensoryDistortion, 5, 2 - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 waitforvisualfinish blendoff clearmonbg ANIM_DEF_PARTNER @@ -4439,18 +4439,18 @@ Move_AERIAL_ACE:: @ 81CCC39 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 1, 5 createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 7, 3 createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 delay 5 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 10, 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 10, 0, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish clearmonbg 1 blendoff end Move_IRON_DEFENSE:: @ 81CCCA3 - loopsewithpan SE_REAPOKE, 192, 28, 2 + loopsewithpan SE_SHINY, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, -1, 14, -1, 0 waitforvisualfinish @@ -4459,7 +4459,7 @@ Move_IRON_DEFENSE:: @ 81CCCA3 Move_BLOCK:: @ 81CCCCD loadspritegfx ANIM_TAG_X_SIGN createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66, - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 end Move_HOWL:: @ 81CCCDC @@ -4475,10 +4475,10 @@ Move_HOWL:: @ 81CCCDC Move_BULK_UP:: @ 81CCCFE loadspritegfx ANIM_TAG_BREATH createvisualtask AnimTask_GrowAndShrink, 2, - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 waitforvisualfinish createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, - loopsewithpan SE_W207, 192, 4, 2 + loopsewithpan SE_M_SWAGGER, 192, 4, 2 waitforvisualfinish end @@ -4487,16 +4487,16 @@ Move_COVET:: @ 81CCD1C loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 delay 15 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 - loopsewithpan SE_W146, 63, 4, 3 + loopsewithpan SE_M_DIZZY_PUNCH, 63, 4, 3 end Move_VOLT_TACKLE:: @ 81CCD79 @@ -4508,28 +4508,28 @@ Move_VOLT_TACKLE:: @ 81CCD79 createvisualtask AnimTask_BlendSelected, 10, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish createsprite gVoltTackleOrbSlideSpriteTemplate, ANIM_ATTACKER, 1 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 waitforvisualfinish clearmonbg ANIM_ATTACKER blendoff delay 8 createvisualtask AnimTask_VoltTackleBolt, 5, 0 - playsewithpan SE_W085, 192 + playsewithpan SE_M_THUNDERBOLT, 192 waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 1 - playsewithpan SE_W085, 63 + playsewithpan SE_M_THUNDERBOLT, 63 waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 2 - playsewithpan SE_W085, 192 + playsewithpan SE_M_THUNDERBOLT, 192 waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 3 - playsewithpan SE_W085, 63 + playsewithpan SE_M_THUNDERBOLT, 63 waitforvisualfinish createvisualtask AnimTask_VoltTackleBolt, 5, 4 - playsewithpan SE_W085, 192 + playsewithpan SE_M_THUNDERBOLT, 192 delay 8 createvisualtask AnimTask_ShakeMon2, 2, 1, 10, 0, 18, 1 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, 16, 16 delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, -16 @@ -4537,7 +4537,7 @@ Move_VOLT_TACKLE:: @ 81CCD79 createvisualtask AnimTask_VoltTackleAttackerReappear, 5 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 0, 3, 0, 9, 1 - playsewithpan SE_W085B, 192 + playsewithpan SE_M_THUNDERBOLT2, 192 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 16 delay 2 createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0, -16, -16 @@ -4550,13 +4550,13 @@ Move_WATER_SPORT:: @ 81CCE71 loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask AnimTask_WaterSport, 5, delay 8 - playsewithpan SE_W057, 192 + playsewithpan SE_M_SURF, 192 delay 44 - playsewithpan SE_W057, 192 + playsewithpan SE_M_SURF, 192 delay 44 - playsewithpan SE_W057, 192 + playsewithpan SE_M_SURF, 192 delay 44 - panse_1B SE_W057, 192, 63, 2, 0 + panse_1B SE_M_SURF, 192, 63, 2, 0 end Move_CALM_MIND:: @ 81CCE97 @@ -4567,13 +4567,13 @@ Move_CALM_MIND:: @ 81CCE97 createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, 1 waitforvisualfinish createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, 192 + playsewithpan SE_M_SUPERSONIC, 192 delay 14 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, 192 + playsewithpan SE_M_SUPERSONIC, 192 delay 14 createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0 - playsewithpan SE_W048, 192 + playsewithpan SE_M_SUPERSONIC, 192 waitforvisualfinish createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 5, 0 visible 0 @@ -4589,20 +4589,20 @@ Move_LEAF_BLADE:: @ 81CCF17 createvisualtask AnimTask_LeafBlade, 5, delay 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 - playsewithpan SE_W015, 63 + playsewithpan SE_M_CUT, 63 delay 50 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 - playsewithpan SE_W015, 63 + playsewithpan SE_M_CUT, 63 delay 50 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 - playsewithpan SE_W015, 63 + playsewithpan SE_M_CUT, 63 waitforvisualfinish monbg 1 setalpha 12, 8 delay 12 createvisualtask AnimTask_ShakeMon2, 2, 1, 8, 0, 18, 1 createsprite gCrossImpactSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 36 - playsewithpan SE_W043, 63 + playsewithpan SE_M_LEER, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -4614,7 +4614,7 @@ Move_DRAGON_DANCE:: @ 81CCF9A monbgprio_28 0 delay 1 createvisualtask AnimTask_DragonDanceWaver, 5 - playsewithpan SE_W100, 192 + playsewithpan SE_M_TELEPORT, 192 delay 8 createvisualtask AnimTask_BlendPalInAndOutByTag, 5, 10249, 19456, 14, 0, 3 createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 0 @@ -4624,9 +4624,9 @@ Move_DRAGON_DANCE:: @ 81CCF9A createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 170 createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 213 delay 30 - playsewithpan SE_W100, 192 + playsewithpan SE_M_TELEPORT, 192 delay 30 - playsewithpan SE_W100, 192 + playsewithpan SE_M_TELEPORT, 192 waitforvisualfinish clearmonbg ANIM_ATTACKER delay 1 @@ -4642,7 +4642,7 @@ Move_SHOCK_WAVE:: @ 81CD009 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 0 waitforvisualfinish createvisualtask AnimTask_ElectricChargingParticles, 2, 0, 20, 0, 2 - playsewithpan SE_W268, 192 + playsewithpan SE_M_CHARGE, 192 delay 12 createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2 delay 30 @@ -4650,7 +4650,7 @@ Move_SHOCK_WAVE:: @ 81CD009 delay 12 waitforvisualfinish createvisualtask AnimTask_ShockWaveLightning, 5, - playsewithpan SE_W161B, 63 + playsewithpan SE_M_TRI_ATTACK2, 63 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, 1, 0, 6, 18, 1 createvisualtask AnimTask_BlendSelected, 5, 1, 3, 16, 0, RGB_WHITE @@ -4663,7 +4663,7 @@ Move_SHOCK_WAVE:: @ 81CD009 end Move_HARDEN:: @ 81CD0AB - loopsewithpan SE_W231, 192, 28, 2 + loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish end @@ -4675,27 +4675,27 @@ Move_BELLY_DRUM:: @ 81CD0C0 waitforvisualfinish call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0 - playsewithpan SE_W187, 192 + playsewithpan SE_M_BELLY_DRUM, 192 delay 15 call BellyDrumLeft createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 1, 0 - playsewithpan SE_W187, 192 + playsewithpan SE_M_BELLY_DRUM, 192 delay 15 call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 3, 3, 128 - playsewithpan SE_W187, 192 + playsewithpan SE_M_BELLY_DRUM, 192 delay 7 call BellyDrumLeft createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 128 - playsewithpan SE_W187, 192 + playsewithpan SE_M_BELLY_DRUM, 192 delay 7 call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 1, 0 - playsewithpan SE_W187, 192 + playsewithpan SE_M_BELLY_DRUM, 192 delay 7 call BellyDrumLeft createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 3, 0 - playsewithpan SE_W187, 192 + playsewithpan SE_M_BELLY_DRUM, 192 waitforvisualfinish createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, waitforvisualfinish @@ -4716,11 +4716,11 @@ Move_MIND_READER:: @ 81CD1A8 loadspritegfx ANIM_TAG_OPENING_EYE loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg 4 - playsewithpan SE_W109, 63 + playsewithpan SE_M_CONFUSE_RAY, 63 createsprite gOpeningEyeSpriteTemplate, ANIM_ATTACKER, 5, 0, 0, 1, 0 createsprite gWhiteHaloSpriteTemplate, ANIM_ATTACKER, 5, delay 40 - playsewithpan SE_W043, 63 + playsewithpan SE_M_LEER, 63 createvisualtask AnimTask_CurseBlendEffect, 2, 1, 1, 2, 0, 10, 0 call MindReaderEyeSpikeEffect waitforvisualfinish @@ -4760,7 +4760,7 @@ Move_ICE_PUNCH:: @ 81CD2E0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, 0 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 9, RGB(12, 26, 31) delay 20 - playsewithpan SE_W081, 63 + playsewithpan SE_M_STRING_SHOT, 63 createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 0 createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 64 createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 128 @@ -4773,7 +4773,7 @@ Move_ICE_PUNCH:: @ 81CD2E0 delay 17 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 4, 0, -10, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -10, 1, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 3, 1 waitforvisualfinish @@ -4789,7 +4789,7 @@ Move_ICE_PUNCH:: @ 81CD2E0 end Move_REST:: @ 81CD3CB - playsewithpan SE_W173, 192 + playsewithpan SE_M_SNORE, 192 loadspritegfx ANIM_TAG_LETTER_Z createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 @@ -4806,7 +4806,7 @@ Move_CONFUSION:: @ 81CD40B createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 10, 1 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE waitforvisualfinish - playsewithpan SE_W048, 63 + playsewithpan SE_M_SUPERSONIC, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, 1, 1 waitforvisualfinish @@ -4823,7 +4823,7 @@ Move_PSYCHIC:: @ 81CD46C createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 10, 1 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, 767 waitforvisualfinish - loopsewithpan SE_W048, 63, 10, 3 + loopsewithpan SE_M_SUPERSONIC, 63, 10, 3 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, 1, 1 waitforvisualfinish @@ -4843,10 +4843,10 @@ FutureSightContinue:: @ 81CD4D4 FutureSight:: @ 81CD4DD monbg ANIM_ATK_PARTNER - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, 192 + playsewithpan SE_M_SUPERSONIC, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, 0, 1 waitforvisualfinish @@ -4854,11 +4854,11 @@ FutureSight:: @ 81CD4DD blendoff goto FutureSightContinue monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, 63 - waitplaysewithpan SE_W048, 63, 8 + playsewithpan SE_M_SUPERSONIC, 63 + waitplaysewithpan SE_M_SUPERSONIC, 63, 8 createvisualtask AnimTask_ShakeMon, 2, 1, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, 1, 1 waitforvisualfinish @@ -4877,7 +4877,7 @@ Move_THUNDER:: @ 81CD570 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, 0 delay 16 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 - playsewithpan SE_W086, 63 + playsewithpan SE_M_THUNDER_WAVE, 63 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, -36 delay 1 @@ -4886,12 +4886,12 @@ Move_THUNDER:: @ 81CD570 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, 12 delay 20 createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, -32 - playsewithpan SE_W086, 63 + playsewithpan SE_M_THUNDER_WAVE, 63 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, -16 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, 16 - playsewithpan SE_W086, 63 + playsewithpan SE_M_THUNDER_WAVE, 63 delay 5 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 @@ -4906,7 +4906,7 @@ Move_THUNDER:: @ 81CD570 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -32 - playsewithpan SE_W161B, 63 + playsewithpan SE_M_TRI_ATTACK2, 63 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16 delay 1 @@ -4934,7 +4934,7 @@ Move_THUNDER_PUNCH:: @ 81CD6CA setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, 0 waitforvisualfinish - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 1 @@ -4946,7 +4946,7 @@ Move_THUNDER_PUNCH:: @ 81CD6CA delay 1 createsprite gLightningSpriteTemplate, ANIM_ATTACKER, 2, 0, 16 delay 1 - playsewithpan SE_W161B, 63 + playsewithpan SE_M_TRI_ATTACK2, 63 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 2 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 15, 1 @@ -4962,7 +4962,7 @@ Move_THUNDER_PUNCH:: @ 81CD6CA Move_SACRED_FIRE:: @ 81CD793 loadspritegfx ANIM_TAG_FIRE loadspritegfx ANIM_TAG_FIRE_PLUME - loopsewithpan SE_W221, 192, 7, 5 + loopsewithpan SE_M_SACRED_FIRE, 192, 7, 5 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 50, 5, -2, 0 delay 1 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, -20, -10, 50, 5, -1, -1 @@ -4983,13 +4983,13 @@ Move_SACRED_FIRE:: @ 81CD793 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 waitforvisualfinish - playsewithpan SE_W221B, 63 + playsewithpan SE_M_SACRED_FIRE2, 63 createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, -16, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, 63 + playsewithpan SE_M_SACRED_FIRE2, 63 createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, 0, 0, 70, 16, 0, 1 delay 10 - playsewithpan SE_W221B, 63 + playsewithpan SE_M_SACRED_FIRE2, 63 createsprite gLargeFlameSpriteTemplate, ANIM_TARGET, 2, 16, 0, 80, 16, 0, 1 delay 1 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 @@ -4997,7 +4997,7 @@ Move_SACRED_FIRE:: @ 81CD793 waitforvisualfinish createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 1 - playsewithpan SE_W172B, 63 + playsewithpan SE_M_FLAME_WHEEL2, 63 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 delay 1 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 @@ -5020,7 +5020,7 @@ Move_SCRATCH:: @ 81CD97A loadspritegfx ANIM_TAG_SCRATCH monbg 1 setalpha 12, 8 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 createsprite gScratchSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -5033,7 +5033,7 @@ Move_DRAGON_BREATH:: @ 81CD9AC loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_28 1 - loopsewithpan SE_W172, 192, 7, 7 + loopsewithpan SE_M_FLAME_WHEEL, 192, 7, 7 createsprite gDragonBreathFireSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 createsprite gDragonBreathFireSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0, 0, 20 @@ -5116,7 +5116,7 @@ Move_SNORE:: @ 81CDB98 end SnoreEffect:: @ 81CDBB1 - playsewithpan SE_W173, 192 + playsewithpan SE_M_SNORE, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 7, 1 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, 14, 0, 0 @@ -5129,7 +5129,7 @@ Move_LIGHT_SCREEN:: @ 81CDC28 loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, 192, 15 + waitplaysewithpan SE_M_REFLECT, 192, 15 createsprite gLightScreenWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, 10166 delay 10 call SpecialScreenSparkle @@ -5158,7 +5158,7 @@ Move_MIRROR_COAT:: @ 81CDCB4 setalpha 0, 16 createsprite gMirrorCoatWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, 10168 delay 10 - playsewithpan SE_W115, 192 + playsewithpan SE_M_REFLECT, 192 call SpecialScreenSparkle waitforvisualfinish delay 1 @@ -5169,7 +5169,7 @@ Move_REFLECT:: @ 81CDCDA loadspritegfx ANIM_TAG_SPARKLE_4 loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W115, 192, 15 + waitplaysewithpan SE_M_REFLECT, 192, 15 createsprite gReflectWallSpriteTemplate, ANIM_ATTACKER, 1, 40, 0, 10167 delay 20 createsprite gReflectSparkleSpriteTemplate, ANIM_ATTACKER, 2, 30, 0, 0, 1 @@ -5185,7 +5185,7 @@ Move_REFLECT:: @ 81CDCDA Move_BARRIER:: @ 81CDD2D loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, 192, 15 + waitplaysewithpan SE_M_BARRIER, 192, 15 createsprite gBarrierWallSpriteTemplate, ANIM_ATTACKER, 3, 40, 0, 10169 waitforvisualfinish delay 1 @@ -5199,28 +5199,28 @@ Move_BUBBLE:: @ 81CDD4A setalpha 12, 8 delay 1 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 15, -15, 10, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_M_BUBBLE, 192 + waitplaysewithpan SE_M_BUBBLE2, 63, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 35, 37, 40, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_M_BUBBLE, 192 + waitplaysewithpan SE_M_BUBBLE2, 63, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 10, -37, 30, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_M_BUBBLE, 192 + waitplaysewithpan SE_M_BUBBLE2, 63, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 30, 10, 15, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_M_BUBBLE, 192 + waitplaysewithpan SE_M_BUBBLE2, 63, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 20, 33, 20, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_M_BUBBLE, 192 + waitplaysewithpan SE_M_BUBBLE2, 63, 100 delay 6 createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 25, -30, 10, 128, 100 - playsewithpan SE_W145, 192 - waitplaysewithpan SE_W145B, 63, 100 + playsewithpan SE_M_BUBBLE, 192 + waitplaysewithpan SE_M_BUBBLE2, 63, 100 waitforvisualfinish call WaterBubblesEffectLong waitforvisualfinish @@ -5233,7 +5233,7 @@ Move_SMOG:: @ 81CDE20 monbg ANIM_DEF_PARTNER monbgprio_29 setalpha 12, 8 - loopsewithpan SE_W054, 63, 17, 10 + loopsewithpan SE_M_MIST, 63, 17, 10 call SmogCloud call SmogCloud call SmogCloud @@ -5242,7 +5242,7 @@ Move_SMOG:: @ 81CDE20 call SmogCloud call SmogCloud delay 120 - loopsewithpan SE_W092, 63, 18, 2 + loopsewithpan SE_M_TOXIC, 63, 18, 2 createvisualtask AnimTask_CurseBlendEffect, 2, 4, 2, 2, 0, 12, 26650 delay 10 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 15, 1 @@ -5262,7 +5262,7 @@ Move_FAINT_ATTACK:: @ 81CDE9B fadetobg 1 waitbgfadein delay 0 - playsewithpan SE_W185, 192 + playsewithpan SE_M_FAINT_ATTACK, 192 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 1, 3 createvisualtask AnimTask_AttackerFadeToInvisible, 2, 1 waitforvisualfinish @@ -5273,7 +5273,7 @@ Move_FAINT_ATTACK:: @ 81CDE9B monbg 1 setalpha 12, 8 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 9, 1 waitforvisualfinish @@ -5297,7 +5297,7 @@ Move_SAND_ATTACK:: @ 81CDF22 monbg ANIM_ATK_PARTNER monbgprio_28 0 setalpha 12, 8 - playsewithpan SE_W028, 192 + playsewithpan SE_M_SAND_ATTACK, 192 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 @@ -5323,7 +5323,7 @@ SandAttackDirt:: @ 81CDF72 Move_MUD_SLAP:: @ 81CDFCA loadspritegfx ANIM_TAG_MUD_SAND - playsewithpan SE_W028, 192 + playsewithpan SE_M_SAND_ATTACK, 192 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2 @@ -5348,14 +5348,14 @@ MudSlapMud:: @ 81CE010 Move_DRAGON_RAGE:: @ 81CE068 loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_TARGET, 2, 0, 15, 0, 0, 4 waitforvisualfinish createsprite gDragonRageFireSpitSpriteTemplate, ANIM_TARGET, 2, 30, 15, 0, 10, 10 waitforvisualfinish - loopsewithpan SE_W172B, 63, 11, 3 + loopsewithpan SE_M_FLAME_WHEEL2, 63, 11, 3 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 3, 25, 1 createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 5, 0 delay 1 @@ -5379,7 +5379,7 @@ Move_DRAGON_RAGE:: @ 81CE068 Move_RAIN_DANCE:: @ 81CE145 loadspritegfx ANIM_TAG_RAIN_DROPS - playsewithpan SE_W240, 192 + playsewithpan SE_M_RAIN_DANCE, 192 createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 120 @@ -5396,7 +5396,7 @@ Move_BITE:: @ 81CE190 loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W044, 63 + playsewithpan SE_M_BITE, 63 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0, -32, 0, 0, 819, 10 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 4, 0, -819, 10 delay 10 @@ -5415,14 +5415,14 @@ Move_CRUNCH:: @ 81CE1EE fadetobg 1 waitbgfadein setalpha 12, 8 - playsewithpan SE_W044, 63 + playsewithpan SE_M_BITE, 63 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, -32, -32, 1, 819, 819, 10 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 32, 32, 5, -819, -819, 10 delay 10 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 7, 5, 2 waitforvisualfinish - playsewithpan SE_W044, 63 + playsewithpan SE_M_BITE, 63 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 32, -32, 7, -819, 819, 10 createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, -32, 32, 3, 819, -819, 10 delay 10 @@ -5441,7 +5441,7 @@ Move_CLAMP:: @ 81CE29E loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W011, 63 + playsewithpan SE_M_VICEGRIP, 63 createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10 createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -5499,7 +5499,7 @@ IceBeamCreateCrystals:: @ 81CE3FC return Move_WITHDRAW:: @ 81CE432 - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 createvisualtask AnimTask_Withdraw, 5, waitforvisualfinish end @@ -5508,7 +5508,7 @@ Move_AURORA_BEAM:: @ 81CE43F loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg 20 waitbgfadein - playsewithpan SE_W062, 192 + playsewithpan SE_M_BUBBLE_BEAM, 192 setarg 7, 0 createvisualtask AnimTask_RotateAuroraRingColors, 10, 130 call AuroraBeamCreateRings @@ -5552,7 +5552,7 @@ SolarBeamSetUp:: @ 81CE521 monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 1, 4, 0, 11, 12287 - playsewithpan SE_W025, 192 + playsewithpan SE_M_MEGA_KICK, 192 call SolarBeamAbsorbEffect waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -5592,7 +5592,7 @@ SolarBeamAbsorbEffect:: @ 81CE54B SolarBeamUnleash:: @ 81CE61E call SetSolarbeamBg - panse_1B SE_W076, 192, 63, 2, 0 + panse_1B SE_M_SOLAR_BEAM, 192, 63, 2, 0 createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5, createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 @@ -5646,10 +5646,10 @@ BlizzardContinue:: @ 81CE77E createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein waitforvisualfinish - panse_1B SE_W059, 192, 63, 2, 0 + panse_1B SE_M_BLIZZARD, 192, 63, 2, 0 call BlizzardIceCrystals call BlizzardIceCrystals - playsewithpan SE_W059B, 63 + playsewithpan SE_M_BLIZZARD2, 63 waitforvisualfinish call IceCrystalEffectLong waitforvisualfinish @@ -5694,10 +5694,10 @@ Move_POWDER_SNOW:: @ 81CE8F4 monbg ANIM_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 0, 3, 0 waitforvisualfinish - panse_1B SE_W016, 192, 63, 2, 0 + panse_1B SE_M_GUST, 192, 63, 2, 0 call PowderSnowSnowballs call PowderSnowSnowballs - playsewithpan SE_W016B, 63 + playsewithpan SE_M_GUST2, 63 waitforvisualfinish waitsound call IceCrystalEffectLong @@ -5732,7 +5732,7 @@ Move_HYDRO_PUMP:: @ 81CE9EE setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 delay 6 - panse_1B SE_W056, 192, 63, 2, 0 + panse_1B SE_M_HYDRO_PUMP, 192, 63, 2, 0 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 call HydroPumpBeams call HydroPumpBeams @@ -5779,7 +5779,7 @@ Move_SIGNAL_BEAM:: @ 81CEAED loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 25, 1 delay 6 - panse_1B SE_W062, 192, 63, 1, 0 + panse_1B SE_M_BUBBLE_BEAM, 192, 63, 1, 0 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 call SignalBeamOrbs call SignalBeamOrbs @@ -5824,7 +5824,7 @@ Move_ABSORB:: @ 81CEBD5 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, 13293 waitforvisualfinish - playsewithpan SE_W071, 63 + playsewithpan SE_M_ABSORB, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5842,28 +5842,28 @@ Move_ABSORB:: @ 81CEBD5 end AbsorbEffect:: @ 81CEC44 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 return @@ -5877,7 +5877,7 @@ Move_MEGA_DRAIN:: @ 81CECED setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 8, 13293 waitforvisualfinish - playsewithpan SE_W071, 63 + playsewithpan SE_M_ABSORB, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5895,35 +5895,35 @@ Move_MEGA_DRAIN:: @ 81CECED end MegaDrainAbsorbEffect:: @ 81CED5C - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 delay 4 @@ -5938,7 +5938,7 @@ Move_GIGA_DRAIN:: @ 81CEE7D setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 12, 13293 waitforvisualfinish - playsewithpan SE_W071, 63 + playsewithpan SE_M_ABSORB, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 @@ -5956,42 +5956,42 @@ Move_GIGA_DRAIN:: @ 81CEE7D end GigaDrainAbsorbEffect:: @ 81CEEEC - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 @@ -6011,7 +6011,7 @@ Move_LEECH_LIFE:: @ 81CF085 createsprite gLeechLifeNeedleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 12 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 - playsewithpan SE_W071, 63 + playsewithpan SE_M_ABSORB, 63 delay 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 waitforvisualfinish @@ -6032,7 +6032,7 @@ Move_SYNTHESIS:: @ 81CF107 loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 16, 19451 - playsewithpan SE_W025, 192 + playsewithpan SE_M_MEGA_KICK, 192 call GrantingStarsEffect waitforvisualfinish call HealingEffect @@ -6052,22 +6052,22 @@ Move_TOXIC:: @ 81CF131 ToxicBubbles:: @ 81CF14B createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -24, 16, 1, 1 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 15 createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, 8, 16, 1, 1 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 15 createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -8, 16, 1, 1 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 15 createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, 24, 16, 1, 1 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 15 return Move_SLUDGE:: @ 81CF1A0 loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 5, 1 @@ -6094,19 +6094,19 @@ Move_SLUDGE_BOMB:: @ 81CF1E2 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20 - playsewithpan SE_W091, 63 + playsewithpan SE_M_DIG, 63 delay 5 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 0, 40, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -8, -44, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -46, -28, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 46, 9, 20 - playsewithpan SE_W091, 63 + playsewithpan SE_M_DIG, 63 delay 5 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 0, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -43, -12, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 16, -46, 20 createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -16, 44, 20 - playsewithpan SE_W091, 63 + playsewithpan SE_M_DIG, 63 delay 0 waitsound waitforvisualfinish @@ -6115,7 +6115,7 @@ Move_SLUDGE_BOMB:: @ 81CF1E2 end SludgeBombProjectile:: @ 81CF2F2 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 delay 3 return @@ -6124,31 +6124,31 @@ Move_ACID:: @ 81CF308 loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_DEF_PARTNER createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 0, 0 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 5 createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 24, 0 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 5 createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, -24, 0 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 15 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 5, 3, 2, 0, 10, 1 createvisualtask AnimTask_CurseBlendEffect, 2, 20, 2, 2, 0, 12, 31774 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -22, 0, 15, 55 - playsewithpan SE_W145, 63 + playsewithpan SE_M_BUBBLE, 63 delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, -26, -24, 0, 15, 55 - playsewithpan SE_W145, 63 + playsewithpan SE_M_BUBBLE, 63 delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 15, -27, 0, 15, 50 - playsewithpan SE_W145, 63 + playsewithpan SE_M_BUBBLE, 63 delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, -15, -17, 0, 10, 45 - playsewithpan SE_W145, 63 + playsewithpan SE_M_BUBBLE, 63 delay 10 createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 27, -22, 0, 15, 50 - playsewithpan SE_W145, 63 + playsewithpan SE_M_BUBBLE, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -6159,14 +6159,14 @@ Move_BONEMERANG:: @ 81CF402 monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W155, 192 + playsewithpan SE_M_BONEMERANG, 192 createsprite gBonemerangSpriteTemplate, ANIM_ATTACKER, 2 delay 20 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 5, 1 delay 17 - playsewithpan SE_W233, 192 + playsewithpan SE_M_VITAL_THROW, 192 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, -4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6179,13 +6179,13 @@ Move_BONE_CLUB:: @ 81CF456 monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W155, 63 + playsewithpan SE_M_BONEMERANG, 63 createsprite gSpinningBoneSpriteTemplate, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 5, 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, 0, 10, 0, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6196,12 +6196,12 @@ Move_BONE_RUSH:: @ 81CF4B8 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W155, 63 + playsewithpan SE_M_BONEMERANG, 63 createsprite gSpinningBoneSpriteTemplate, ANIM_ATTACKER, 2, -42, -25, 0, 0, 15 delay 12 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 3, 5, 1 - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6210,15 +6210,15 @@ Move_BONE_RUSH:: @ 81CF4B8 Move_SPIKES:: @ 81CF503 loadspritegfx ANIM_TAG_SPIKES monbg ANIM_DEF_PARTNER - playsewithpan SE_W026, 192 - waitplaysewithpan SE_W030, 63, 28 + playsewithpan SE_M_JUMP_KICK, 192 + waitplaysewithpan SE_M_HORN_ATTACK, 63, 28 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 30 delay 10 - playsewithpan SE_W026, 192 - waitplaysewithpan SE_W030, 63, 28 + playsewithpan SE_M_JUMP_KICK, 192 + waitplaysewithpan SE_M_HORN_ATTACK, 63, 28 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, -24, 24, 30 delay 10 - waitplaysewithpan SE_W030, 63, 28 + waitplaysewithpan SE_M_HORN_ATTACK, 63, 28 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 24, 24, 30 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6228,7 +6228,7 @@ Move_MEGAHORN:: @ 81CF55A loadspritegfx ANIM_TAG_HORN_HIT_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 jumpifcontest MegahornInContest fadetobg 7 waitbgfadeout @@ -6243,7 +6243,7 @@ MegahornContinue:: @ 81CF57D delay 3 createsprite gMegahornHornSpriteTemplate, ANIM_ATTACKER, 3, -42, 25, 0, 0, 6 delay 4 - playsewithpan SE_W011, 63 + playsewithpan SE_M_VICEGRIP, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 4, 1, 4 waitforvisualfinish @@ -6275,13 +6275,13 @@ Move_GUST:: @ 81CF648 monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W016, 63 + playsewithpan SE_M_GUST, 63 createsprite gEllipticalGustSpriteTemplate, ANIM_ATTACKER, 2, 0, -16 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 7, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 - playsewithpan SE_W016B, 63 + playsewithpan SE_M_GUST2, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6293,7 +6293,7 @@ Move_WING_ATTACK:: @ 81CF699 monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W017, 192, 20, 2 + loopsewithpan SE_M_WING_ATTACK, 192, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 createsprite gGustToTargetSpriteTemplate, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20 @@ -6303,7 +6303,7 @@ Move_WING_ATTACK:: @ 81CF699 delay 17 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 1, 1 - loopsewithpan SE_W003, 63, 5, 2 + loopsewithpan SE_M_DOUBLE_SLAP, 63, 5, 2 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 waitforvisualfinish @@ -6313,7 +6313,7 @@ Move_WING_ATTACK:: @ 81CF699 Move_PECK:: @ 81CF736 loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W030, 63 + playsewithpan SE_M_HORN_ATTACK, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 3, -768, 1, 2 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 0, 1, 3 waitforvisualfinish @@ -6334,7 +6334,7 @@ Move_AEROBLAST:: @ 81CF75D call AeroblastBeam waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6343,19 +6343,19 @@ Move_AEROBLAST:: @ 81CF75D end AeroblastBeam:: @ 81CF7B9 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 0, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 0, 0 delay 3 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 1, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 1, 0 delay 3 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 2, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 2, 0 delay 3 - playsewithpan SE_W026, 192 + playsewithpan SE_M_JUMP_KICK, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 3, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 3, 0 delay 3 @@ -6368,18 +6368,18 @@ Move_WATER_GUN:: @ 81CF87A monbgprio_28 1 setalpha 12, 8 createsprite gWaterGunProjectileSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 40, -25 - playsewithpan SE_W145, 192 + playsewithpan SE_M_BUBBLE, 192 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 5, 1, 1, 0, 8, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 1, 2 createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, 0, -15, 0, 15, 55 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 delay 10 createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, 15, -20, 0, 15, 50 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 delay 10 createsprite gWaterGunDropletSpriteTemplate, ANIM_ATTACKER, 2, -15, -10, 0, 10, 45 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6391,7 +6391,7 @@ Move_CRABHAMMER:: @ 81CF907 monbg ANIM_DEF_PARTNER setalpha 12, 8 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 32429, 10, 0, 0 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4 @@ -6400,7 +6400,7 @@ Move_CRABHAMMER:: @ 81CF907 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 4 waitforvisualfinish - loopsewithpan SE_W152, 63, 20, 3 + loopsewithpan SE_M_CRABHAMMER, 63, 20, 3 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 4, 8, 1 createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 20, 1 delay 4 @@ -6425,7 +6425,7 @@ Move_CRABHAMMER:: @ 81CF907 Move_SURF:: @ 81CFA01 createvisualtask AnimTask_CreateSurfWave, 2, 0 delay 24 - panse_1B SE_W057, 192, 63, 2, 0 + panse_1B SE_M_SURF, 192, 63, 2, 0 waitforvisualfinish end @@ -6437,7 +6437,7 @@ Move_FLAMETHROWER:: @ 81CFA15 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 46, 1 delay 6 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 - panse_1B SE_W053, 192, 63, 2, 0 + panse_1B SE_M_FLAMETHROWER, 192, 63, 2, 0 call FlamethrowerCreateFlames call FlamethrowerCreateFlames call FlamethrowerCreateFlames @@ -6464,7 +6464,7 @@ FlamethrowerCreateFlames:: @ 81CFA8F Move_SANDSTORM:: @ 81CFAB2 loadspritegfx ANIM_TAG_FLYING_DIRT - playsewithpan SE_W201, 0 + playsewithpan SE_M_SANDSTORM, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, 0 delay 16 createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 10, 2304, 96, 0 @@ -6489,7 +6489,7 @@ Move_WHIRLPOOL:: @ 81CFB3A setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 23968 - playsewithpan SE_W250, 63 + playsewithpan SE_M_WHIRLPOOL, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 50, 1 call WhirlpoolEffect call WhirlpoolEffect @@ -6524,19 +6524,19 @@ FlyEnd:: @ 81CFC2C end FlySetUp:: @ 81CFC2E - playsewithpan SE_W019, 192 + playsewithpan SE_M_FLY, 192 createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336 goto FlyEnd FlyUnleash:: @ 81CFC46 monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 createsprite gFlyBallAttackSpriteTemplate, ANIM_ATTACKER, 2, 20 delay 20 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6550,17 +6550,17 @@ BounceEnd:: @ 81CFC96 end BounceSetUp:: @ 81CFC97 - playsewithpan SE_W100, 192 + playsewithpan SE_M_TELEPORT, 192 createsprite gBounceBallShrinkSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 goto BounceEnd BounceUnleash:: @ 81CFCAB monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gBounceBallLandSpriteTemplate, ANIM_TARGET, 3 delay 7 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 5, 11, 1 waitforvisualfinish @@ -6574,10 +6574,10 @@ Move_KARATE_CHOP:: @ 81CFCEA monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - playsewithpan SE_W104, 63 + playsewithpan SE_M_DOUBLE_TEAM, 63 createsprite gKarateChopSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0 waitforvisualfinish - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 waitforvisualfinish @@ -6590,11 +6590,11 @@ Move_CROSS_CHOP:: @ 81CFD3C loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W025, 63 + playsewithpan SE_M_MEGA_KICK, 63 createsprite gCrossChopHandSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 createsprite gCrossChopHandSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1 delay 40 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10 createsprite gCrossImpactSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 20 createvisualtask AnimTask_ShakeMon, 5, 1, 7, 0, 9, 1 @@ -6611,11 +6611,11 @@ Move_JUMP_KICK:: @ 81CFDA5 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 3 createsprite gJumpKickSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, 63 + playsewithpan SE_M_JUMP_KICK, 63 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -6632,10 +6632,10 @@ Move_HI_JUMP_KICK:: @ 81CFE02 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 3 delay 2 createsprite gJumpKickSpriteTemplate, ANIM_ATTACKER, 2, -16, 8, 0, 0, 10, 1, 1, 1 - playsewithpan SE_W026, 63 + playsewithpan SE_M_JUMP_KICK, 63 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3 delay 3 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 3, 0, 11, 1 @@ -6654,7 +6654,7 @@ Move_DOUBLE_KICK:: @ 81CFE98 setalpha 12, 8 createsprite gFistFootRandomPosSpriteTemplate, ANIM_ATTACKER, 3, 1, 20, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6666,7 +6666,7 @@ Move_TRIPLE_KICK:: @ 81CFECB loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 jumpifmoveturn 0, TripleKickLeft jumpifmoveturn 1, TripleKickRight goto TripleKickCenter @@ -6702,26 +6702,26 @@ Move_DYNAMIC_PUNCH:: @ 81CFF92 delay 1 monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 20, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 5, 0, 7, 1 delay 1 waitsound - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createvisualtask AnimTask_ShakeMon2, 5, 1, 5, 0, 28, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -6734,23 +6734,23 @@ Move_COUNTER:: @ 81D005A monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 1, 4 - playsewithpan SE_W233, 192 + playsewithpan SE_M_VITAL_THROW, 192 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -15, 18, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 1 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 25, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -15, 18, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -4, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 0, -4, 8, 1, 0 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 15, 9, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 15, 9, 8, 1, 0 delay 5 @@ -6764,13 +6764,13 @@ Move_VITAL_THROW:: @ 81D0129 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W233, 192 + playsewithpan SE_M_VITAL_THROW, 192 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 12, 4, 1, 2 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -24, 0, 0, 4 waitforvisualfinish @@ -6792,10 +6792,10 @@ Move_ROCK_SMASH:: @ 81D01A4 delay 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 8, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 5, 1 waitforvisualfinish - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 20, 24, 14, 2 createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 5, 0, -20, 24, 14, 1 createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 0, 5, 20, -24, 14, 2 @@ -6814,16 +6814,16 @@ Move_SUBMISSION:: @ 81D029C loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W104, 192 - waitplaysewithpan SE_W004, 63, 10 - waitplaysewithpan SE_W104, 192, 20 - waitplaysewithpan SE_W004, 63, 30 - waitplaysewithpan SE_W104, 192, 40 - waitplaysewithpan SE_W004, 63, 50 - waitplaysewithpan SE_W104, 192, 60 - waitplaysewithpan SE_W004, 63, 70 - waitplaysewithpan SE_W104, 192, 80 - waitplaysewithpan SE_W004, 63, 90 + playsewithpan SE_M_DOUBLE_TEAM, 192 + waitplaysewithpan SE_M_COMET_PUNCH, 63, 10 + waitplaysewithpan SE_M_DOUBLE_TEAM, 192, 20 + waitplaysewithpan SE_M_COMET_PUNCH, 63, 30 + waitplaysewithpan SE_M_DOUBLE_TEAM, 192, 40 + waitplaysewithpan SE_M_COMET_PUNCH, 63, 50 + waitplaysewithpan SE_M_DOUBLE_TEAM, 192, 60 + waitplaysewithpan SE_M_COMET_PUNCH, 63, 70 + waitplaysewithpan SE_M_DOUBLE_TEAM, 192, 80 + waitplaysewithpan SE_M_COMET_PUNCH, 63, 90 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, -18, 6, 6, 4 createvisualtask AnimTask_TranslateMonElliptical, 2, 1, 18, 6, 6, 4 call SubmissionHit @@ -6849,7 +6849,7 @@ Move_SUNNY_DAY:: @ 81D033F setalpha 13, 3 createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 1, 0, 6, RGB_WHITE waitforvisualfinish - panse_26 SE_W080, 192, 63, 1, 0 + panse_26 SE_M_PETAL_DANCE, 192, 63, 1, 0 call SunnyDayLightRay call SunnyDayLightRay call SunnyDayLightRay @@ -6870,7 +6870,7 @@ Move_COTTON_SPORE:: @ 81D0395 loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER monbgprio_28 1 - loopsewithpan SE_W077, 63, 18, 10 + loopsewithpan SE_M_POISON_POWDER, 63, 18, 10 call CreateCottonSpores call CreateCottonSpores call CreateCottonSpores @@ -6892,7 +6892,7 @@ Move_SPORE:: @ 81D03EF monbg ANIM_DEF_PARTNER setalpha 12, 8 createvisualtask AnimTask_SporeDoubleBattle, 2, - loopsewithpan SE_W077, 63, 16, 11 + loopsewithpan SE_M_POISON_POWDER, 63, 16, 11 call CreateSpore call CreateSpore call CreateSpore @@ -6916,7 +6916,7 @@ Move_PETAL_DANCE:: @ 81D0454 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W080, 192 + playsewithpan SE_M_PETAL_DANCE, 192 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 12, 6, 6, 3 createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 8, 140 createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 16, -24, 8, 100 @@ -6938,7 +6938,7 @@ Move_PETAL_DANCE:: @ 81D0454 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 5 delay 3 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 6, 0, 8, 1 waitforvisualfinish @@ -6956,7 +6956,7 @@ Move_RAZOR_LEAF:: @ 81D058C monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, 192, 10, 5 + loopsewithpan SE_M_POISON_POWDER, 192, 10, 5 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -1, -1, 15 @@ -6977,11 +6977,11 @@ Move_RAZOR_LEAF:: @ 81D058C delay 2 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, 20, 1 createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 22, -20, 1 delay 20 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 createvisualtask AnimTask_ShakeMon2, 2, 3, 2, 0, 8, 1 waitforvisualfinish @@ -7002,7 +7002,7 @@ Move_ANCIENT_POWER:: @ 81D0693 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 20, 32, -28, 60, 1 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, -28, 30, 4 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 30, 1 - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 delay 10 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, 15, 32, -48, 25, 5 createsprite gAncientPowerRockSpriteTemplate, ANIM_ATTACKER, 2, -10, 32, -42, 30, 4 @@ -7012,7 +7012,7 @@ Move_ANCIENT_POWER:: @ 81D0693 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 0, 0, 4 delay 3 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -7025,10 +7025,10 @@ Move_ANCIENT_POWER:: @ 81D0693 Move_OCTAZOOKA:: @ 81D07BB loadspritegfx ANIM_TAG_GRAY_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL - playsewithpan SE_W025B, 192 + playsewithpan SE_M_MEGA_KICK2, 192 createsprite gOctazookaBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, 8, 8, 1, 0 delay 2 createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, -8, -8, 1, 0 @@ -7043,7 +7043,7 @@ Move_MIST:: @ 81D0821 loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W054, 192, 20, 15 + loopsewithpan SE_M_MIST, 192, 20, 15 call MistCloud call MistCloud call MistCloud @@ -7065,7 +7065,7 @@ MistCloud:: @ 81D086C Move_HAZE:: @ 81D0882 waitforvisualfinish - playsewithpan SE_W114, 0 + playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_Haze1, 5, delay 30 createvisualtask AnimTask_BlendSelected, 10, 0 | (0xF << 7), 2, 0, 16, RGB_BLACK @@ -7084,14 +7084,14 @@ Move_FIRE_PUNCH:: @ 81D08B5 createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 64 createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 128 createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 196 - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 waitforvisualfinish createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 8, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 15, 1 call FireSpreadEffect delay 4 - playsewithpan SE_W007, 63 + playsewithpan SE_M_FIRE_PUNCH, 63 waitforvisualfinish createvisualtask AnimTask_BlendSelected, 10, 4, 0, 9, 0, RGB(31, 0, 0) waitforvisualfinish @@ -7114,7 +7114,7 @@ Move_LEER:: @ 81D09C8 monbg ANIM_ATTACKER monbgprio_28 0 setalpha 8, 8 - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 24, -12 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, 0, 1 waitforvisualfinish @@ -7133,10 +7133,10 @@ Move_DREAM_EATER:: @ 81D0A1F loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER monbgprio_2A 1 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W107, 63 + playsewithpan SE_M_MINIMIZE, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, 1, 1 waitforvisualfinish @@ -7154,42 +7154,42 @@ Move_DREAM_EATER:: @ 81D0A1F end DreamEaterAbsorb:: @ 81D0A89 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 28, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 40, 39 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -32, 26 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, -15, -16, 36 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 16, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -40, 26 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -5, 15, 36, 33 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, -5, -8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, -10, 20, 20, 39 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 @@ -7204,25 +7204,25 @@ Move_POISON_GAS:: @ 81D0C22 monbgprio_29 setalpha 12, 8 delay 0 - playsewithpan SE_W054, 192 + playsewithpan SE_M_MIST, 192 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_M_MIST, 192 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_M_MIST, 192 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_M_MIST, 192 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_M_MIST, 192 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 4 - playsewithpan SE_W054, 192 + playsewithpan SE_M_MIST, 192 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 - loopsewithpan SE_W054, 63, 28, 6 + loopsewithpan SE_M_MIST, 63, 28, 6 createvisualtask AnimTask_CurseBlendEffect, 2, 4, 6, 2, 0, 12, 26650 waitforvisualfinish blendoff @@ -7235,7 +7235,7 @@ Move_BIND:: @ 81D0D00 goto BindWrap BindWrap:: @ 81D0D16 - playsewithpan SE_W020, 63 + playsewithpan SE_M_BIND, 63 call BindWrapSqueezeTarget call BindWrapSqueezeTarget waitforvisualfinish @@ -7252,7 +7252,7 @@ Move_WRAP:: @ 81D0D3A Move_PSYBEAM:: @ 81D0D50 loadspritegfx ANIM_TAG_GOLD_RING - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground createsoundtask SoundTask_LoopSEAdjustPanning, 193, -64, 63, 3, 4, 0, 15 call PsybeamRings @@ -7291,7 +7291,7 @@ Move_HYPNOSIS:: @ 81D0DEA end HypnosisRings:: @ 81D0E1D - playsewithpan SE_W048, 192 + playsewithpan SE_M_SUPERSONIC, 192 createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 0, 8, 27, 0 createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0, -8, 27, 0 delay 6 @@ -7299,7 +7299,7 @@ HypnosisRings:: @ 81D0E1D Move_PSYWAVE:: @ 81D0E4A loadspritegfx ANIM_TAG_BLUE_RING - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground createvisualtask AnimTask_StartSinAnimTimer, 5, 100 createsoundtask SoundTask_LoopSEAdjustPanning, 196, -64, 63, 2, 9, 0, 10 @@ -7325,7 +7325,7 @@ PsywaveRings:: @ 81D0EAD Move_ZAP_CANNON:: @ 81D0ED0 loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 - playsewithpan SE_W086, 192 + playsewithpan SE_M_THUNDER_WAVE, 192 createsprite gZapCannonBallSpriteTemplate, ANIM_TARGET, 3, 10, 0, 0, 0, 30, 0 createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 64, 40, 1 @@ -7338,7 +7338,7 @@ Move_ZAP_CANNON:: @ 81D0ED0 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 delay 15 - waitplaysewithpan SE_W085B, 63, 19 + waitplaysewithpan SE_M_THUNDERBOLT2, 63, 19 call ElectricityEffect waitforvisualfinish end @@ -7346,13 +7346,13 @@ Move_ZAP_CANNON:: @ 81D0ED0 Move_STEEL_WING:: @ 81D0FB5 loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT - loopsewithpan SE_W231, 192, 28, 2 + loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 - loopsewithpan SE_W017, 192, 20, 2 + loopsewithpan SE_M_WING_ATTACK, 192, 20, 2 createvisualtask AnimTask_TranslateMonElliptical, 2, 0, 12, 4, 1, 4 createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70 createsprite gGustToTargetSpriteTemplate, ANIM_ATTACKER, 2, -25, 0, 0, 0, 20 @@ -7362,7 +7362,7 @@ Move_STEEL_WING:: @ 81D0FB5 delay 17 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 1, 1 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 waitforvisualfinish createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 waitforvisualfinish @@ -7372,7 +7372,7 @@ Move_STEEL_WING:: @ 81D0FB5 Move_IRON_TAIL:: @ 81D1064 loadspritegfx ANIM_TAG_IMPACT - loopsewithpan SE_W231, 192, 28, 2 + loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 waitforvisualfinish monbg 1 @@ -7381,7 +7381,7 @@ Move_IRON_TAIL:: @ 81D1064 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 1 clearmonbg 1 @@ -7392,7 +7392,7 @@ Move_IRON_TAIL:: @ 81D1064 Move_POISON_TAIL:: @ 81D10C2 loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE - loopsewithpan SE_W231, 192, 28, 2 + loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 1, 23768 waitforvisualfinish monbg 1 @@ -7401,7 +7401,7 @@ Move_POISON_TAIL:: @ 81D10C2 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 waitforvisualfinish createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 1 clearmonbg 1 @@ -7412,19 +7412,19 @@ Move_POISON_TAIL:: @ 81D10C2 Move_METAL_CLAW:: @ 81D1128 loadspritegfx ANIM_TAG_CLAW_SLASH - loopsewithpan SE_W231, 192, 28, 2 + loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, -10, 10, 0 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 delay 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 2 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, -10, 1 createsprite gClawSlashSpriteTemplate, ANIM_TARGET, 2, 10, 10, 1 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, -4, 1, 10, 3, 1 @@ -7434,11 +7434,11 @@ Move_METAL_CLAW:: @ 81D1128 Move_NIGHT_SHADE:: @ 81D11BB monbg ANIM_ATTACKER monbgprio_28 0 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 fadetobg 2 waitbgfadein delay 10 - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 createvisualtask AnimTask_NightShadeClone, 5, 85 delay 70 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 12, 1 @@ -7453,24 +7453,24 @@ Move_NIGHT_SHADE:: @ 81D11BB Move_EGG_BOMB:: @ 81D1203 loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_LARGE_FRESH_EGG - playsewithpan SE_W039, 192 + playsewithpan SE_M_TAIL_WHIP, 192 createsprite gEggThrowSpriteTemplate, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 16, 1 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 6, 5, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -16, -15, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 16, -5, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -12, 18, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 delay 3 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 0, 5, 1, 0 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 delay 3 waitforvisualfinish end @@ -7483,7 +7483,7 @@ Move_SHADOW_BALL:: @ 81D129D createsoundtask SoundTask_LoopSEAdjustPanning, 161, -64, 63, 5, 5, 0, 5 createsprite gShadowBallSpriteTemplate, ANIM_TARGET, 2, 16, 16, 8 waitforvisualfinish - playsewithpan SE_W028, 63 + playsewithpan SE_M_SAND_ATTACK, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 8, 1 waitforvisualfinish restorebg @@ -7493,7 +7493,7 @@ Move_SHADOW_BALL:: @ 81D129D Move_LICK:: @ 81D12E0 loadspritegfx ANIM_TAG_LICK delay 15 - playsewithpan SE_W122, 63 + playsewithpan SE_M_LICK, 63 createsprite gLickSpriteTemplate, ANIM_TARGET, 2, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 16, 1 waitforvisualfinish @@ -7501,7 +7501,7 @@ Move_LICK:: @ 81D12E0 Move_FOCUS_ENERGY:: @ 81D1307 loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 call EndureEffect delay 8 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, RGB_WHITE @@ -7517,7 +7517,7 @@ Move_BIDE:: @ 81D1347 end BattleAnimScript_Bide_Setup:: @ 81D1351 - loopsewithpan SE_W036, 192, 9, 2 + loopsewithpan SE_M_TAKE_DOWN, 192, 9, 2 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 waitforvisualfinish @@ -7527,7 +7527,7 @@ BattleAnimScript_Bide_Release:: @ 81D137D loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - loopsewithpan SE_W036, 192, 9, 2 + loopsewithpan SE_M_TAKE_DOWN, 192, 9, 2 createvisualtask AnimTask_BlendSelected, 10, 2, 2, 0, 11, RGB(31, 0, 0) createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 waitforvisualfinish @@ -7535,13 +7535,13 @@ BattleAnimScript_Bide_Release:: @ 81D137D waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 12, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 16, 1 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 18, -8, 1, 1 delay 5 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -18, 8, 1, 1 delay 5 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, -8, -5, 1, 1 waitforvisualfinish delay 5 @@ -7560,7 +7560,7 @@ Move_STRING_SHOT:: @ 81D1446 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, 0 waitforvisualfinish - loopsewithpan SE_W081, 192, 9, 6 + loopsewithpan SE_M_STRING_SHOT, 192, 9, 6 call StringShotThread call StringShotThread call StringShotThread @@ -7580,7 +7580,7 @@ Move_STRING_SHOT:: @ 81D1446 call StringShotThread call StringShotThread waitforvisualfinish - playsewithpan SE_W081B, 63 + playsewithpan SE_M_STRING_SHOT2, 63 createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, 10 delay 4 createsprite gStringWrapSpriteTemplate, ANIM_TARGET, 2, 0, -2 @@ -7606,7 +7606,7 @@ Move_SPIDER_WEB:: @ 81D1518 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, 0 waitforvisualfinish monbgprio_28 1 - loopsewithpan SE_W081, 192, 9, 6 + loopsewithpan SE_M_STRING_SHOT, 192, 9, 6 call SpiderWebThread call SpiderWebThread call SpiderWebThread @@ -7622,7 +7622,7 @@ Move_SPIDER_WEB:: @ 81D1518 call SpiderWebThread call SpiderWebThread waitforvisualfinish - playsewithpan SE_W081B, 63 + playsewithpan SE_M_STRING_SHOT2, 63 createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -7644,12 +7644,12 @@ RazorWindEnd:: @ 81D15C2 RazorWindSetUp:: @ 81D15C4 loadspritegfx ANIM_TAG_GUST - playsewithpan SE_W016, 192 + playsewithpan SE_M_GUST, 192 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 170, 7, 40 waitforvisualfinish - playsewithpan SE_W016B, 192 + playsewithpan SE_M_GUST2, 192 goto RazorWindEnd RazorWindUnleash:: @ 81D1614 @@ -7657,16 +7657,16 @@ RazorWindUnleash:: @ 81D1614 loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, 8, 0, 0, 22, 2, 1 delay 2 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -8, 16, 14, 22, 1, 1 delay 2 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, 12, -16, -14, 22, 0, 1 delay 17 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 2, 3, 2, 0, 10, 1 waitforvisualfinish @@ -7679,11 +7679,11 @@ Move_DISABLE:: @ 81D169F monbg 1 monbgprio_28 1 setalpha 8, 8 - playsewithpan SE_W197, 192 + playsewithpan SE_M_DETECT, 192 createsprite gSpriteTemplate_83BF480, ANIM_ATTACKER, 13, 24, -16 waitforvisualfinish createvisualtask AnimTask_GrowAndGreyscale, 5, - loopsewithpan SE_W020, 63, 15, 4 + loopsewithpan SE_M_BIND, 63, 15, 4 waitforvisualfinish delay 1 clearmonbg 1 @@ -7695,7 +7695,7 @@ Move_RECOVER:: @ 81D16CD loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER setalpha 12, 8 - loopsewithpan SE_W025, 192, 13, 3 + loopsewithpan SE_M_MEGA_KICK, 192, 13, 3 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 6, 0, 11, 12287 call RecoverAbsorbEffect call RecoverAbsorbEffect @@ -7729,14 +7729,14 @@ Move_MIMIC:: @ 81D1777 loadspritegfx ANIM_TAG_ORBS monbg_22 3 setalpha 11, 5 - panse_1B SE_W107, 63, 192, 253, 0 + panse_1B SE_M_MINIMIZE, 63, 192, 253, 0 createvisualtask AnimTask_ShrinkTargetCopy, 5, 128, 24 delay 15 createsprite gMimicOrbSpriteTemplate, ANIM_TARGET, 2, -12, 24 delay 10 setarg 7, 65535 waitforvisualfinish - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish clearmonbg_23 3 @@ -7745,7 +7745,7 @@ Move_MIMIC:: @ 81D1777 Move_CONSTRICT:: @ 81D17C1 loadspritegfx ANIM_TAG_TENDRILS - loopsewithpan SE_W010, 63, 6, 4 + loopsewithpan SE_M_SCRATCH, 63, 6, 4 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2 delay 7 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 2 @@ -7755,7 +7755,7 @@ Move_CONSTRICT:: @ 81D17C1 delay 8 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 6, 1 delay 20 - playsewithpan SE_W020, 63 + playsewithpan SE_M_BIND, 63 setarg 7, 65535 waitforvisualfinish end @@ -7781,7 +7781,7 @@ CurseGhost:: @ 81D1832 clearmonbg ANIM_ATK_PARTNER delay 1 monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 14, 1 waitforvisualfinish @@ -7792,7 +7792,7 @@ CurseGhost:: @ 81D1832 CurseGhostShakeFromNail:: @ 81D1899 createvisualtask AnimTask_ShakeMon2, 2, 0, 4, 0, 10, 0 - playsewithpan SE_W020, 192 + playsewithpan SE_M_BIND, 192 return CurseStats:: @ 81D18AF @@ -7804,7 +7804,7 @@ CurseStats:: @ 81D18AF end CurseStats1:: @ 81D18CA - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_SetUpCurseBackground, 5, createvisualtask AnimTask_CurseBlendEffect, 5, 2, 4, 2, 0, 10, 31 return @@ -7814,13 +7814,13 @@ Move_SOFT_BOILED:: @ 81D18E9 loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER - playsewithpan SE_W039, 192 + playsewithpan SE_M_TAIL_WHIP, 192 createvisualtask AnimTask_ShakeMon, 2, 0, 0, 2, 6, 1 createsprite gSoftBoiledEggSpriteTemplate, ANIM_ATTACKER, 4, 0, 16, 0 createsprite gSoftBoiledEggSpriteTemplate, ANIM_ATTACKER, 4, 0, 16, 1 delay 120 delay 7 - playsewithpan SE_W030, 192 + playsewithpan SE_M_HORN_ATTACK, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, 31500 createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 31, 16, 0, 1 delay 8 @@ -7865,14 +7865,14 @@ Move_HEAL_BELL:: @ 81D196B unloadspritegfx ANIM_TAG_MUSIC_NOTES_2 unloadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 - playsewithpan SE_W234, 192 + playsewithpan SE_M_MORNING_SUN, 192 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish unloadspritegfx ANIM_TAG_SPARKLE_2 loadspritegfx ANIM_TAG_THIN_RING - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_SHINY, 192 createvisualtask AnimTask_BlendExcept, 10, 4, 3, 10, 0, 31500 createvisualtask AnimTask_BlendSelected, 10, 10, 3, 10, 0, RGB_WHITE createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 @@ -7882,14 +7882,14 @@ HealBellRing:: @ 81D1B2F createvisualtask AnimTask_BlendExcept, 10, 4, 3, 8, 0, 31500 createvisualtask AnimTask_BlendSelected, 10, 10, 3, 2, 10, RGB_WHITE createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1 - playsewithpan SE_W215, 192 + playsewithpan SE_M_HEAL_BELL, 192 return Move_FAKE_OUT:: @ 81D1B65 - playsewithpan SE_W260, 0 + playsewithpan SE_M_FLATTER, 0 createvisualtask AnimTask_FakeOut, 5, waitforvisualfinish - playsewithpan SE_W166, 63 + playsewithpan SE_M_SKETCH, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 createvisualtask AnimTask_StretchTargetUp, 3 waitforvisualfinish @@ -7899,17 +7899,17 @@ Move_FAKE_OUT:: @ 81D1B65 Move_SCARY_FACE:: @ 81D1BA0 loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 0, 16, 0 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 waitforvisualfinish delay 10 - playsewithpan SE_W043, 192 + playsewithpan SE_M_LEER, 192 createvisualtask AnimTask_ScaryFace, 5, delay 13 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 waitforvisualfinish createvisualtask AnimTask_ShakeTargetInPattern, 3, 20, 1, 0 - playsewithpan SE_W081B, 63 + playsewithpan SE_M_STRING_SHOT2, 63 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 16, 0, 0 waitforvisualfinish end @@ -7918,14 +7918,14 @@ Move_SWEET_KISS:: @ 81D1C03 loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL createsprite gAngelSpriteTemplate, ANIM_TARGET, 2, 16, -48 - playsewithpan SE_W215, 63 + playsewithpan SE_M_HEAL_BELL, 63 delay 23 - playsewithpan SE_W215, 63 + playsewithpan SE_M_HEAL_BELL, 63 delay 23 - playsewithpan SE_W215, 63 + playsewithpan SE_M_HEAL_BELL, 63 waitforvisualfinish createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -30 - playsewithpan SE_W213, 63 + playsewithpan SE_M_ATTRACT, 63 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -42 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -14 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38 @@ -7937,9 +7937,9 @@ Move_LOVELY_KISS:: @ 81D1C6C loadspritegfx ANIM_TAG_PINK_HEART loadspritegfx ANIM_TAG_DEVIL createsprite gDevilSpriteTemplate, ANIM_TARGET, 2, 0, -24 - playsewithpan SE_W060B, 63 + playsewithpan SE_M_PSYBEAM2, 63 waitforvisualfinish - playsewithpan SE_W213, 63 + playsewithpan SE_M_ATTRACT, 63 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -256, -42 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 128, -14 createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 416, -38 @@ -7950,13 +7950,13 @@ Move_FURY_SWIPES:: @ 81D1CB3 loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 delay 4 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, 16, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 5, 1 delay 10 createsprite gHorizontalLungeSpriteTemplate, ANIM_TARGET, 2, 5, 5 delay 4 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 createsprite gFurySwipesSpriteTemplate, ANIM_TARGET, 2, -16, 0, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 7, 1 end @@ -7965,28 +7965,28 @@ Move_INGRAIN:: @ 81D1D17 loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 - playsewithpan SE_W010, 192 + playsewithpan SE_M_SCRATCH, 192 delay 10 createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -32, 20, 1, 1, 140 - playsewithpan SE_W010, 192 + playsewithpan SE_M_SCRATCH, 192 delay 10 createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 32, 22, 1, 0, 130 - playsewithpan SE_W010, 192 + playsewithpan SE_M_SCRATCH, 192 delay 10 createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, -16, 25, -1, 3, 120 - playsewithpan SE_W010, 192 + playsewithpan SE_M_SCRATCH, 192 delay 40 createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 32, 26, -1, 3, 30 delay 5 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 5 createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, -48, 20, 1, 2, 30 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 5 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 5 createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 48, 26, -2, 3, 18 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 delay 10 waitforvisualfinish end @@ -7995,13 +7995,13 @@ Move_PRESENT:: @ 81D1DC8 loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2, createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 - playsewithpan SE_W039, 192 + playsewithpan SE_M_TAIL_WHIP, 192 delay 14 - playsewithpan SE_W145B, 192 + playsewithpan SE_M_BUBBLE2, 192 delay 14 - playsewithpan SE_W145B, 0 + playsewithpan SE_M_BUBBLE2, 0 delay 20 - playsewithpan SE_W145B, 63 + playsewithpan SE_M_BUBBLE2, 63 waitforvisualfinish jumpargeq 7, 0, PresentDamage jumpargeq 7, 1, PresentHeal @@ -8009,26 +8009,26 @@ Move_PRESENT:: @ 81D1DC8 PresentDamage:: @ 81D1E0B loadspritegfx ANIM_TAG_EXPLOSION - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 16, 16, 1, 1 end PresentHeal:: @ 81D1E76 loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W234, 63 + playsewithpan SE_M_MORNING_SUN, 63 createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -16, 32, -3, 1 delay 3 createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 16, 32, -3, -1 @@ -8053,7 +8053,7 @@ PresentHeal:: @ 81D1E76 Move_BATON_PASS:: @ 81D1F1F loadspritegfx ANIM_TAG_POKEBALL - playsewithpan SE_W226, 192 + playsewithpan SE_M_BATON_PASS, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 31, 1, 2, 0, 11, 31455 createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2, end @@ -8078,7 +8078,7 @@ Move_PERISH_SONG:: @ 81D1F41 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 240 createsprite gPerishSongMusicNote2SpriteTemplate, ANIM_ATTACKER, 4, 15, 0, 0 delay 20 - panse_1B SE_W195, 192, 63, 2, 0 + panse_1B SE_M_PERISH_SONG, 192, 63, 2, 0 delay 80 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, 0 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 0 @@ -8099,21 +8099,21 @@ Move_SLEEP_TALK:: @ 81D20AA createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, 0 delay 20 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 - playsewithpan SE_W173, 192 + playsewithpan SE_M_SNORE, 192 delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 delay 20 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5 - playsewithpan SE_W173, 192 + playsewithpan SE_M_SNORE, 192 delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5 delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5 delay 20 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3 - playsewithpan SE_W173, 192 + playsewithpan SE_M_SNORE, 192 delay 6 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3 delay 6 @@ -8123,7 +8123,7 @@ Move_SLEEP_TALK:: @ 81D20AA Move_HYPER_FANG:: @ 81D2165 loadspritegfx ANIM_TAG_FANG_ATTACK - playsewithpan SE_W044, 63 + playsewithpan SE_M_BITE, 63 delay 1 delay 2 createvisualtask AnimTask_IsContest, 2, @@ -8136,7 +8136,7 @@ HyperFangContinue:: @ 81D2193 createsprite gFangSpriteTemplate, ANIM_TARGET, 2, waitbgfadein createvisualtask AnimTask_ShakeMon, 3, 1, 0, 10, 10, 1 - playsewithpan SE_W043, 63 + playsewithpan SE_M_LEER, 63 delay 20 restorebg waitbgfadein @@ -8158,9 +8158,9 @@ HyperFangInContest:: @ 81D21C5 Move_TRI_ATTACK:: @ 81D21CC loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE createsprite gTriAttackTriangleSpriteTemplate, ANIM_TARGET, 2, 16, 0 - playsewithpan SE_W161, 192 + playsewithpan SE_M_TRI_ATTACK, 192 delay 20 - playsewithpan SE_W161, 192 + playsewithpan SE_M_TRI_ATTACK, 192 delay 20 createsoundtask SoundTask_LoopSEAdjustPanning, 213, -64, 63, 5, 6, 0, 7 waitforvisualfinish @@ -8168,7 +8168,7 @@ Move_TRI_ATTACK:: @ 81D21CC delay 16 loadspritegfx ANIM_TAG_FIRE createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 - playsewithpan SE_W172B, 63 + playsewithpan SE_M_FLAME_WHEEL2, 63 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 delay 1 createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, 30, -1, -1 @@ -8187,7 +8187,7 @@ Move_TRI_ATTACK:: @ 81D21CC waitforvisualfinish loadspritegfx ANIM_TAG_LIGHTNING createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 - playsewithpan SE_W161B, 63 + playsewithpan SE_M_TRI_ATTACK2, 63 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -48 delay 1 createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16 @@ -8209,8 +8209,8 @@ Move_WILL_O_WISP:: @ 81D2340 loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_DEF_PARTNER monbgprio_2A 1 - playsewithpan SE_W052, 192 - waitplaysewithpan SE_W052, 192, 10 + playsewithpan SE_M_EMBER, 192 + waitplaysewithpan SE_M_EMBER, 192, 10 createvisualtask SoundTask_AdjustPanningVar, 2, -64, -64, 1, 0 createsprite gWillOWispOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 delay 3 @@ -8223,7 +8223,7 @@ Move_WILL_O_WISP:: @ 81D2340 createvisualtask SoundTask_AdjustPanningVar, 2, -64, 63, 2, 0 waitforvisualfinish monbgprio_29 - playsewithpan SE_W172B, 63 + playsewithpan SE_M_FLAME_WHEEL2, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 13, 1 createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gWillOWispFireSpriteTemplate, ANIM_ATTACKER, 2, 42 @@ -8261,23 +8261,23 @@ Move_TRICK:: @ 81D24A5 createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 80 createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 208 delay 16 - playsewithpan SE_W166, 0 + playsewithpan SE_M_SKETCH, 0 createvisualtask AnimTask_StretchTargetUp, 3, createvisualtask AnimTask_StretchAttackerUp, 3 delay 30 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 24 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W104, 0 + playsewithpan SE_M_DOUBLE_TEAM, 0 delay 16 - playsewithpan SE_W213, 0 + playsewithpan SE_M_ATTRACT, 0 createvisualtask AnimTask_ShakeMon, 3, 0, 5, 0, 7, 2 createvisualtask AnimTask_ShakeMon, 3, 1, 5, 0, 7, 2 waitforvisualfinish @@ -8288,11 +8288,11 @@ Move_WISH:: @ 81D2523 loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, 0 waitforvisualfinish - panse_27 SE_W115, 63, 192, 253, 0 + panse_27 SE_M_REFLECT, 63, 192, 253, 0 createsprite gWishStarSpriteTemplate, ANIM_ATTACKER, 40, waitforvisualfinish delay 60 - loopsewithpan SE_W215, 192, 16, 3 + loopsewithpan SE_M_HEAL_BELL, 192, 16, 3 call GrantingStarsEffect waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, 0 @@ -8301,7 +8301,7 @@ Move_WISH:: @ 81D2523 Move_STOCKPILE:: @ 81D256B loadspritegfx ANIM_TAG_GRAY_ORB - playsewithpan SE_W025, 192 + playsewithpan SE_M_MEGA_KICK, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask AnimTask_StockpileDeformMon, 5, call StockpileAbsorb @@ -8332,11 +8332,11 @@ StockpileAbsorb:: @ 81D25A9 Move_SPIT_UP:: @ 81D2622 loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_IMPACT - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_SpitUpDeformMon, 5, createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 delay 45 - playsewithpan SE_W255, 192 + playsewithpan SE_M_SPIT_UP, 192 delay 3 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 12 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 32, 12 @@ -8352,10 +8352,10 @@ Move_SPIT_UP:: @ 81D2622 SpitUpContinue:: @ 81D26B2 delay 5 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 8, 1, 0 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 10, 1, 1 delay 5 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 12, -10, 1, 1 waitforvisualfinish end @@ -8381,11 +8381,11 @@ SpitUpStrongest:: @ 81D2718 Move_SWALLOW:: @ 81D2765 loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_SwallowDeformMon, 5, createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 delay 38 - playsewithpan SE_W255, 192 + playsewithpan SE_M_SPIT_UP, 192 createvisualtask AnimTask_ShakeMon2, 2, 0, 2, 0, 12, 1 call SwallowEffect jumpifmoveturn 2, SwallowGood @@ -8419,8 +8419,8 @@ SwallowBest:: @ 81D2802 Move_TRANSFORM:: @ 81D2811 monbg ANIM_ATTACKER - playsewithpan SE_W100, 192 - waitplaysewithpan SE_W107, 192, 48 + playsewithpan SE_M_TELEPORT, 192 + waitplaysewithpan SE_M_MINIMIZE, 192, 48 createvisualtask AnimTask_TransformMon, 2, 0 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -8461,7 +8461,7 @@ MorningSunStar:: @ 81D28AF Move_SWEET_SCENT:: @ 81D28BD loadspritegfx ANIM_TAG_PINK_PETAL - playsewithpan SE_W230, 192 + playsewithpan SE_M_SWEET_SCENT, 192 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100 delay 25 setpan 0 @@ -8503,7 +8503,7 @@ Move_HYPER_BEAM:: @ 81D29A7 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 0, 16, 0 waitforvisualfinish delay 10 - playsewithpan SE_W063, 192 + playsewithpan SE_M_HYPER_BEAM, 192 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 4, 1 waitforvisualfinish delay 30 @@ -8600,8 +8600,8 @@ Move_ROLE_PLAY:: @ 81D2BE5 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 16, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 10, 0 waitforvisualfinish - playsewithpan SE_W161, 192 - waitplaysewithpan SE_W197, 192, 30 + playsewithpan SE_M_TRI_ATTACK, 192 + waitplaysewithpan SE_M_DETECT, 192, 30 createvisualtask AnimTask_RolePlaySilhouette, 2, waitforvisualfinish clearmonbg ANIM_ATK_PARTNER @@ -8613,13 +8613,13 @@ Move_ROLE_PLAY:: @ 81D2BE5 Move_REFRESH:: @ 81D2C42 loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 - playsewithpan SE_W287, 192 + playsewithpan SE_M_STAT_INCREASE, 192 createvisualtask AnimTask_StatusClearedEffect, 2, 0 waitforvisualfinish - playsewithpan SE_W234, 192 + playsewithpan SE_M_MORNING_SUN, 192 call GrantingStarsEffect waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_SHINY, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 10, 0, 31500 createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 end @@ -8630,11 +8630,11 @@ Move_BLAZE_KICK:: @ 81D2C85 loadspritegfx ANIM_TAG_SMALL_EMBER monbg 1 setalpha 12, 8 - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 createsprite gSpinningHandOrFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 30 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 7, RGB_WHITE delay 30 - playsewithpan SE_W007, 63 + playsewithpan SE_M_FIRE_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 14, 1 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 0, RGB_WHITE @@ -8669,7 +8669,7 @@ Move_SAND_TOMB:: @ 81D2D96 loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 563 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 43, 1 - playsewithpan SE_W328, 63 + playsewithpan SE_M_SAND_TOMB, 63 call SandTombSwirlingDirt call SandTombSwirlingDirt call SandTombSwirlingDirt @@ -8696,14 +8696,14 @@ SandTombSwirlingDirt:: @ 81D2DE3 Move_SHEER_COLD:: @ 81D2E6E fadetobg 15 waitbgfadeout - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 waitbgfadein loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 1 setalpha 12, 8 createvisualtask AnimTask_FrozenIceCube, 2 - waitplaysewithpan SE_W258, 63, 17 + waitplaysewithpan SE_M_HAIL, 63, 17 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -8720,11 +8720,11 @@ Move_ARM_THRUST:: @ 81D2E93 delay 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 3 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gArmThrustHandSpriteTemplate, ANIM_TARGET, 2, 10, -8, 14, 3 waitforvisualfinish createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, 0, 1 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 choosetwoturnanim ArmThrustRight, ArmThrustLeft ArmThrustContinue:: @ 81D2EEC createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 @@ -8741,7 +8741,7 @@ ArmThrustLeft:: @ 81D2F14 goto ArmThrustContinue Move_MUDDY_WATER:: @ 81D2F28 - panse_1B SE_W250, 192, 63, 2, 0 + panse_1B SE_M_WHIRLPOOL, 192, 63, 2, 0 createvisualtask AnimTask_CreateSurfWave, 2, 1 waitforvisualfinish end @@ -8774,7 +8774,7 @@ Move_BULLET_SEED:: @ 81D2F3A Move_DRAGON_CLAW:: @ 81D2FD0 loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_CLAW_SLASH - playsewithpan SE_W221B, 192 + playsewithpan SE_M_SACRED_FIRE2, 192 createvisualtask AnimTask_BlendSelected, 10, 2, 4, 0, 8, RGB(31, 19, 0) createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 15, 1 call DragonClawFireSpiral @@ -8840,7 +8840,7 @@ Move_MUD_SHOT:: @ 81D3239 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 46, 1 delay 6 createvisualtask AnimTask_StartSinAnimTimer, 5, 100 - panse_1B SE_W250, 192, 63, 1, 0 + panse_1B SE_M_WHIRLPOOL, 192, 63, 1, 0 call MudShotOrbs call MudShotOrbs call MudShotOrbs @@ -8869,7 +8869,7 @@ Move_METEOR_MASH:: @ 81D32D6 loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - panse_1B SE_W112, 192, 63, 3, 0 + panse_1B SE_M_BARRIER, 192, 63, 3, 0 fadetobg 16 waitbgfadein waitforvisualfinish @@ -8880,7 +8880,7 @@ Move_METEOR_MASH:: @ 81D32D6 createsprite gSpinningHandOrFootSpriteTemplate, ANIM_TARGET, 3, 0, 0, 0, 30 createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -80, -64, 40, 32, 30 delay 20 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 5, 0, 20, 1 waitforvisualfinish @@ -8894,7 +8894,7 @@ Move_REVENGE:: @ 81D335D loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg 1 setalpha 12, 8 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createsprite gRevengeSmallScratchSpriteTemplate, ANIM_ATTACKER, 2, 10, -10 waitforvisualfinish createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 4, 2, 8, 31 @@ -8903,17 +8903,17 @@ Move_REVENGE:: @ 81D335D loadspritegfx ANIM_TAG_PURPLE_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 4 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gRevengeBigScratchSpriteTemplate, ANIM_TARGET, 2, 10, -10 waitforvisualfinish unloadspritegfx ANIM_TAG_PURPLE_SWIPE loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 10, 1 createsprite gPersistHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, 1, 1, 8 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 8 createsprite gPersistHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 8, 1, 1, 8 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish clearmonbg 1 blendoff @@ -8922,7 +8922,7 @@ Move_REVENGE:: @ 81D335D Move_POISON_FANG:: @ 81D33F4 loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE - playsewithpan SE_W044, 63 + playsewithpan SE_M_BITE, 63 createsprite gFangSpriteTemplate, ANIM_TARGET, 2, delay 10 createvisualtask AnimTask_ShakeMon, 3, 1, 3, 0, 10, 1 @@ -8933,7 +8933,7 @@ Move_POISON_FANG:: @ 81D33F4 end Move_SUBSTITUTE:: @ 81D3433 - playsewithpan SE_W213, 192 + playsewithpan SE_M_ATTRACT, 192 createvisualtask AnimTask_MonToSubstitute, 2, end @@ -8946,50 +8946,50 @@ Move_FRENZY_PLANT:: @ 81D343F createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 0, 5, 0 waitforvisualfinish createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 2, 0, 0, 100 - playsewithpan SE_W010, 192 + playsewithpan SE_M_SCRATCH, 192 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 20, -8, -2, 0, 1, 95 - playsewithpan SE_W010, 213 + playsewithpan SE_M_SCRATCH, 213 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 30, 8, -4, 0, 0, 90 - playsewithpan SE_W010, 234 + playsewithpan SE_M_SCRATCH, 234 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 40, -8, 4, 0, 1, 85 - playsewithpan SE_W010, 0 + playsewithpan SE_M_SCRATCH, 0 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 50, 8, 0, 0, 0, 85 - playsewithpan SE_W010, 21 + playsewithpan SE_M_SCRATCH, 21 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 60, -8, -2, 0, 1, 85 - playsewithpan SE_W010, 42 + playsewithpan SE_M_SCRATCH, 42 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 75, 8, 0, 0, 0, 85 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, 16, 6, 0, 3, 80 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 delay 5 createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 85, -16, -6, 0, 2, 75 - playsewithpan SE_W010, 63 + playsewithpan SE_M_SCRATCH, 63 delay 5 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -10, 1, 3 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createvisualtask AnimTask_ShakeMon, 3, 1, 8, 0, 20, 1 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, 1, 3 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -3, 1, 2 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 delay 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -3, 1, 1, 2 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, 1, 1, 1 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 delay 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 10, 1, 1 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 2, 5, 0, 0 waitforvisualfinish @@ -9013,7 +9013,7 @@ Move_METAL_SOUND:: @ 81D35E3 end MetalSoundRings:: @ 81D3616 - panse_1B SE_W103, 192, 63, 2, 0 + panse_1B SE_M_SCREECH, 192, 63, 2, 0 createsprite gMetalSoundSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return @@ -9037,20 +9037,20 @@ FocusPunchContinue:: @ 81D3668 waitbgfadein monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W207, 63 + playsewithpan SE_M_SWAGGER, 63 createsprite gFocusPunchFistSpriteTemplate, ANIM_TARGET, 2 delay 10 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 0 createvisualtask AnimTask_ShakeMon, 5, 1, 8, 0, 24, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 2, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -6, 1, 0 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 8, 1, 0 - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 waitforvisualfinish restorebg waitbgfadein @@ -9215,7 +9215,7 @@ ReturnStrongestHit:: @ 81D3B35 Move_COSMIC_POWER:: @ 81D3B89 loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask SoundTask_PlaySE2WithPanning, 5, 236, 0 - playsewithpan SE_W322, 0 + playsewithpan SE_M_COSMIC_POWER, 0 createvisualtask AnimTask_BlendNonAttackerPalettes, 2, 0, 0, 15, 0 waitforvisualfinish fadetobg 16 @@ -9242,7 +9242,7 @@ Move_BLAST_BURN:: @ 81D3C0E loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W221, 192 + playsewithpan SE_M_SACRED_FIRE, 192 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -20, -10, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, 0, -16, 24, 0, 0, 0 @@ -9252,7 +9252,7 @@ Move_BLAST_BURN:: @ 81D3C0E createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -20, 10, 24, 0, 0, 0 delay 25 - playsewithpan SE_W172B, 192 + playsewithpan SE_M_FLAME_WHEEL2, 192 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -64, 0, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 6, -40, -20, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 70, 0, -32, 24, 0, 0, 0 @@ -9264,7 +9264,7 @@ Move_BLAST_BURN:: @ 81D3C0E createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -40, 20, 24, 0, 0, 0 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 25 - playsewithpan SE_W172B, 192 + playsewithpan SE_M_FLAME_WHEEL2, 192 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, -96, 0, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 6, -60, -30, 24, 0, 0, 0 createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 70, 0, -48, 24, 0, 0, 0 @@ -9290,24 +9290,24 @@ Move_ROCK_TOMB:: @ 81D3E50 createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, 20, 12, 64, 114, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_M_STRENGTH, 63 delay 8 createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, -20, 12, 64, 98, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_M_STRENGTH, 63 delay 8 createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 66, 3, 6, 64, 82, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_M_STRENGTH, 63 delay 8 createsprite gRockTombRockSpriteTemplate, ANIM_TARGET, 2, -3, 13, 64, 66, 0 delay 8 createvisualtask AnimTask_ShakeBattleTerrain, 2, 0, 2, 3, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_M_STRENGTH, 63 delay 24 - playsewithpan SE_W063, 63 + playsewithpan SE_M_HYPER_BEAM, 63 createsprite gRedXSpriteTemplate, ANIM_TARGET, 5, 1, 50 createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 20, 1 createvisualtask AnimTask_ShakeBattleTerrain, 2, 2, 0, 10, 1 @@ -9316,8 +9316,8 @@ Move_ROCK_TOMB:: @ 81D3E50 Move_SILVER_WIND:: @ 81D3F37 loadspritegfx ANIM_TAG_SPARKLE_6 - panse_1B SE_W016, 192, 63, 2, 0 - playsewithpan SE_W234, 0 + panse_1B SE_M_GUST, 192, 63, 2, 0 + playsewithpan SE_M_MORNING_SUN, 0 delay 0 monbg ANIM_DEF_PARTNER monbgprio_29 @@ -9356,7 +9356,7 @@ SilverWindContinue:: @ 81D3F7E createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -4, 16, 0, 6, 1, 2, 1 createsprite gSilverWindSmallSparkSpriteTemplate, ANIM_TARGET, 66, -16, 12, 192, 5, 2, 3, 1 waitforvisualfinish - playsewithpan SE_W016B, 63 + playsewithpan SE_M_GUST2, 63 clearmonbg ANIM_DEF_PARTNER delay 0 restorebg @@ -9373,7 +9373,7 @@ SilverWindOnPlayer:: @ 81D4138 goto SilverWindContinue Move_SNATCH:: @ 81D414F - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_WindUpLunge, 5, 0, -12, 4, 10, 10, 12, 6 end @@ -9384,10 +9384,10 @@ Move_DIVE:: @ 81D4169 DiveSetUp:: @ 81D4178 loadspritegfx ANIM_TAG_ROUND_SHADOW - playsewithpan SE_W029, 192 + playsewithpan SE_M_HEADBUTT, 192 createsprite gDiveBallSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336 waitforvisualfinish - playsewithpan SE_W291, 192 + playsewithpan SE_M_DIVE, 192 createsprite gDiveWaterSplashSpriteTemplate, ANIM_ATTACKER, 3, 0 call DiveSetUpWaterDroplets call DiveSetUpWaterDroplets @@ -9406,7 +9406,7 @@ DiveAttack:: @ 81D41CD loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W153, 63 + playsewithpan SE_M_EXPLOSION, 63 createsprite gDiveWaterSplashSpriteTemplate, ANIM_TARGET, 3, 1 call DiveAttackWaterDroplets call DiveAttackWaterDroplets @@ -9431,11 +9431,11 @@ Move_ROCK_BLAST:: @ 81D4223 loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 3 - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 createsprite gRockBlastRockSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 25, 257 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 2, 0, 0, 20, 24, 14, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 5, 1 createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 2, 5, 0, -20, 24, 14, 1 @@ -9457,13 +9457,13 @@ Move_OVERHEAT:: @ 81D42C0 delay 1 createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 0 delay 1 - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_CopyPalUnfadedToBackup, 5, 1, 0 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 1, 0, 13, 28 createvisualtask AnimTask_ShakeMon, 5, 0, 2, 0, 15, 1 waitforvisualfinish - playsewithpan SE_W172B, 192 + playsewithpan SE_M_FLAME_WHEEL2, 192 createsprite gOverheatFlameSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 30, 25, -20 createsprite gOverheatFlameSpriteTemplate, ANIM_ATTACKER, 2, 1, 32, 30, 25, -20 createsprite gOverheatFlameSpriteTemplate, ANIM_ATTACKER, 2, 1, 64, 30, 25, -20 @@ -9493,17 +9493,17 @@ Move_OVERHEAT:: @ 81D42C0 delay 5 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, 3, 1, 0 - playsewithpan SE_W007, 63 + playsewithpan SE_M_FIRE_PUNCH, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 10, 0, 25, 1 delay 6 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -5, 1, 0 - playsewithpan SE_W007, 63 + playsewithpan SE_M_FIRE_PUNCH, 63 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 10, 1, 0 - playsewithpan SE_W007, 63 + playsewithpan SE_M_FIRE_PUNCH, 63 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 0 - playsewithpan SE_W007, 63 + playsewithpan SE_M_FIRE_PUNCH, 63 createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 1 delay 1 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, -1, 0, 13, 19026 @@ -9530,12 +9530,12 @@ Move_HYDRO_CANNON:: @ 81D45B2 loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - playsewithpan SE_W057, 192 + playsewithpan SE_M_SURF, 192 createsprite gHydroCannonChargeSpriteTemplate, ANIM_TARGET, 2, delay 10 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 30 - panse_1B SE_W056, 192, 63, 2, 0 + panse_1B SE_M_HYDRO_PUMP, 192, 63, 2, 0 call HydroCannonBeam createvisualtask AnimTask_ShakeMon, 5, 1, 10, 0, 40, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 @@ -9570,11 +9570,11 @@ HydroCannonBeam:: @ 81D467C Move_ASTONISH:: @ 81D46E4 loadspritegfx ANIM_TAG_SWEAT_BEAD - playsewithpan SE_W227, 192 + playsewithpan SE_M_ENCORE, 192 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 25 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1 - playsewithpan SE_W166, 63 + playsewithpan SE_M_SKETCH, 63 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 createvisualtask AnimTask_StretchTargetUp, 3, @@ -9593,7 +9593,7 @@ Move_SEISMIC_TOSS:: @ 81D472C fadetobg 17 waitbgfadeout createvisualtask AnimTask_MoveSeismicTossBg, 3 - playsewithpan SE_W327, 0 + playsewithpan SE_M_SKY_UPPERCUT, 0 waitbgfadein waitforvisualfinish createvisualtask AnimTask_SeismicTossBgAccelerateDownAtEnd, 3 @@ -9635,7 +9635,7 @@ SeismicTossStrong:: @ 81D47A8 SeismicTossRockScatter1:: @ 81D47C7 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, 1, 1 - playsewithpan SE_W070, 63 + playsewithpan SE_M_STRENGTH, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 5, 1 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 27, 2, 3 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 28, 3, 4 @@ -9645,7 +9645,7 @@ SeismicTossRockScatter1:: @ 81D47C7 SeismicTossRockScatter2:: @ 81D4828 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, -8, 1, 1 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 5, 1 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 32, 3, 4 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 31, 2, 2 @@ -9656,7 +9656,7 @@ SeismicTossRockScatter2:: @ 81D4828 Move_MAGIC_COAT:: @ 81D4889 loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 - waitplaysewithpan SE_W112, 192, 15 + waitplaysewithpan SE_M_BARRIER, 192, 15 createsprite gMagicCoatWallSpriteTemplate, ANIM_ATTACKER, 3, 40, 0, 10170 waitforvisualfinish delay 1 @@ -9668,7 +9668,7 @@ Move_WATER_PULSE:: @ 81D48A6 loadspritegfx ANIM_TAG_BLUE_RING_2 monbg 1 monbgprio_28 1 - playsewithpan SE_W145C, 192 + playsewithpan SE_M_BUBBLE3, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 7, 29472 delay 10 createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 100, 100, 8, 1, 20, 40, 0 @@ -9676,15 +9676,15 @@ Move_WATER_PULSE:: @ 81D48A6 createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 200, 80, 8, 1, 40, 20, 0 createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 80, 60, 10, 3, 20, 50, 0 createsprite gWaterPulseBubbleSpriteTemplate, ANIM_ATTACKER, 66, 140, 100, 16, 1, 20, 30, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 waitforvisualfinish - playsewithpan SE_W202, 192 + playsewithpan SE_M_GIGA_DRAIN, 192 createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, 192 + playsewithpan SE_M_GIGA_DRAIN, 192 createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 5 - playsewithpan SE_W202, 192 + playsewithpan SE_M_GIGA_DRAIN, 192 createsprite gWaterPulseRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 40, 15 delay 13 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 8, 18, 1 @@ -9708,13 +9708,13 @@ Move_PSYCHO_BOOST:: @ 81D499B setalpha 8, 8 delay 10 createvisualtask AnimTask_ShakeMon, 2, 0, 3, 0, 240, 0 - loopsewithpan SE_W060B, 192, 14, 10 + loopsewithpan SE_M_PSYBEAM2, 192, 14, 10 createsprite gPsychoBoostOrbSpriteTemplate, ANIM_ATTACKER, 2 delay 110 - loopsewithpan SE_W060B, 192, 7, 10 + loopsewithpan SE_M_PSYBEAM2, 192, 7, 10 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, -8, 1, 24, 1 - playsewithpan SE_W043, 63 + playsewithpan SE_M_LEER, 63 waitforvisualfinish clearmonbg ANIM_ATK_PARTNER blendoff @@ -9726,12 +9726,12 @@ Move_KNOCK_OFF:: @ 81D4A0F loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 - playsewithpan SE_W233, 63 + playsewithpan SE_M_VITAL_THROW, 63 createsprite gKnockOffStrikeSpriteTemplate, ANIM_TARGET, 2, -16, -16 delay 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 delay 3 @@ -9750,7 +9750,7 @@ Move_DOOM_DESIRE:: @ 81D4A9F createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, 0 waitforvisualfinish setalpha 8, 8 - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, 0, 1 waitforvisualfinish delay 20 @@ -9766,26 +9766,26 @@ Move_DOOM_DESIRE:: @ 81D4A9F delay 10 createvisualtask AnimTask_DoomDesireLightBeam, 5, delay 5 - playsewithpan SE_W109, 192 + playsewithpan SE_M_CONFUSE_RAY, 192 delay 10 - playsewithpan SE_W109, 0 + playsewithpan SE_M_CONFUSE_RAY, 0 delay 10 - playsewithpan SE_W109, 63 + playsewithpan SE_M_CONFUSE_RAY, 63 delay 23 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 10, 0, 20, 1 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE @@ -9798,7 +9798,7 @@ Move_SKY_UPPERCUT:: @ 81D4BC1 monbgprio_28 1 fadetobg 17 waitbgfadeout - playsewithpan SE_W327, 192 + playsewithpan SE_M_SKY_UPPERCUT, 192 createvisualtask AnimTask_MoveSkyUppercutBg, 5, 55 waitbgfadein setalpha 12, 8 @@ -9806,20 +9806,20 @@ Move_SKY_UPPERCUT:: @ 81D4BC1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 0, 0, 5 delay 4 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 6, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -28, 28, 1, 1 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -15, 8, 1, 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, -12, 1, 1 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -32, 1, 1 delay 1 - playsewithpan SE_W233B, 63 + playsewithpan SE_M_VITAL_THROW2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 5, -52, 1, 1 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -26, 16, 1, 4 delay 4 @@ -9855,7 +9855,7 @@ Move_TWISTER:: @ 81D4D0E loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER monbgprio_28 1 - playsewithpan SE_W239, 63 + playsewithpan SE_M_TWISTER, 63 createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 120, 70, 5, 70, 30 delay 1 createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 115, 55, 6, 60, 25 @@ -9878,18 +9878,18 @@ Move_TWISTER:: @ 81D4D0E createsprite gTwisterLeafParticleSpriteTemplate, ANIM_TARGET, 2, 110, 10, 8, 32, 20 waitforvisualfinish createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -32, -16, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 3, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 3, 3, 0, 12, 1 delay 4 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 4 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 delay 4 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, 1, 3 - playsewithpan SE_W004, 63 + playsewithpan SE_M_COMET_PUNCH, 63 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff @@ -9902,7 +9902,7 @@ Move_MAGICAL_LEAF:: @ 81D4E6D monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 1 - loopsewithpan SE_W077, 192, 10, 5 + loopsewithpan SE_M_POISON_POWDER, 192, 10, 5 createvisualtask AnimTask_CycleMagicalLeafPal, 5 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -2, 10 delay 2 @@ -9924,11 +9924,11 @@ Move_MAGICAL_LEAF:: @ 81D4E6D delay 2 createsprite gRazorLeafParticleSpriteTemplate, ANIM_ATTACKER, 2, -3, -5, 8 delay 60 - playsewithpan SE_W013B, 192 + playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, 20, 0 createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 20, -10, 20, 0, 32, -20, 0 delay 30 - playsewithpan SE_W013, 63 + playsewithpan SE_M_RAZOR_WIND, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, -4, 1, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 10, 4, 1, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 @@ -9945,10 +9945,10 @@ Move_ICE_BALL:: @ 81D4F8E createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 4, IceBallSetIceBg IceBallContinue:: @ 81D4FA5 - playsewithpan SE_W196, 192 + playsewithpan SE_M_ICY_WIND, 192 createsprite gIceBallChunkSpriteTemplate, ANIM_TARGET, 2, 15, 0, -12, -16, 30, -40 delay 28 - playsewithpan SE_W280, 63 + playsewithpan SE_M_BRICK_BREAK, 63 createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 0, IceBallWeakest jumpargeq 0, 1, IceBallWeak @@ -10041,11 +10041,11 @@ Move_WEATHER_BALL:: @ 81D515D loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, 0 delay 8 - playsewithpan SE_W207, 192 + playsewithpan SE_M_SWAGGER, 192 createsprite gWeatherBallUpSpriteTemplate, ANIM_ATTACKER, 2 waitforvisualfinish delay 15 - playsewithpan SE_W197, 0 + playsewithpan SE_M_DETECT, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 waitforvisualfinish createvisualtask AnimTask_GetWeather, 2, @@ -10060,7 +10060,7 @@ WeatherBallNormal:: @ 81D51C8 loadspritegfx ANIM_TAG_IMPACT createsprite gWeatherBallNormalDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish - playsewithpan SE_W025B, 63 + playsewithpan SE_M_MEGA_KICK2, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 8, 1 waitforvisualfinish @@ -10069,15 +10069,15 @@ WeatherBallNormal:: @ 81D51C8 WeatherBallFire:: @ 81D5205 loadspritegfx ANIM_TAG_SMALL_EMBER createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 40, 10 - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 delay 10 createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 delay 10 createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 waitforvisualfinish - playsewithpan SE_W172B, 63 + playsewithpan SE_M_FLAME_WHEEL2, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 8, 1 waitforvisualfinish end @@ -10085,31 +10085,31 @@ WeatherBallFire:: @ 81D5205 WeatherBallWater:: @ 81D5269 loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 50, 10 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 delay 8 createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -20, 20 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 delay 13 createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W152, 63 + playsewithpan SE_M_CRABHAMMER, 63 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 8, 1 - playsewithpan SE_W202, 63 + playsewithpan SE_M_GIGA_DRAIN, 63 waitforvisualfinish end WeatherBallSandstorm:: @ 81D52CD loadspritegfx ANIM_TAG_ROCKS createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 30, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 5 createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, -40, 20 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 delay 14 createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 - playsewithpan SE_W088, 63 + playsewithpan SE_M_ROCK_THROW, 63 waitforvisualfinish - playsewithpan SE_W070, 63 + playsewithpan SE_M_STRENGTH, 63 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 27, 2, 3 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 28, 3, 4 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -4, 30, 2, 3 @@ -10122,16 +10122,16 @@ WeatherBallIce:: @ 81D536D loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, -40, 20 - playsewithpan SE_W258, 63 + playsewithpan SE_M_HAIL, 63 delay 10 createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, 40, 0 - playsewithpan SE_W258, 63 + playsewithpan SE_M_HAIL, 63 delay 10 createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, 0, 0 - playsewithpan SE_W258, 63 + playsewithpan SE_M_HAIL, 63 waitforvisualfinish createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 call IceCrystalEffectShort waitforvisualfinish end @@ -10140,7 +10140,7 @@ Move_COUNT:: @ 81D53D9 loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -10150,64 +10150,64 @@ Move_COUNT:: @ 81D53D9 IceCrystalEffectShort:: @ 81D540A createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 10, 20, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -5, 10, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 17, -12, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, -15, 15, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 20, 2, 0 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 return IceCrystalEffectLong:: @ 81D548E createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -10, -10, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 10, 20, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -29, 0, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 29, -20, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -5, 10, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 17, -12, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -20, 0, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, -15, 15, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 26, -5, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 delay 4 createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 20, 2, 1 - playsewithpan SE_W196, 63 + playsewithpan SE_M_ICY_WIND, 63 return IceSpikesEffectShort: @ Unused - loopsewithpan SE_W196, 63, 6, 4 + loopsewithpan SE_M_ICY_WIND, 63, 6, 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 0, 24, 0 delay 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 8, 24, 0 @@ -10224,7 +10224,7 @@ IceSpikesEffectShort: @ Unused return IceSpikesEffectLong:: @ 81D55E2 - loopsewithpan SE_W196, 63, 6, 4 + loopsewithpan SE_M_ICY_WIND, 63, 6, 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 0, 24, 1 delay 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 8, 24, 1 @@ -10254,7 +10254,7 @@ GrantingStarsEffect:: @ 81D569E return HealingEffect:: @ 81D56C9 - playsewithpan SE_W071B, 192 + playsewithpan SE_M_ABSORB_2, 192 createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 0, 0 delay 7 createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, -15, 10, 0, 0 @@ -10266,7 +10266,7 @@ HealingEffect:: @ 81D56C9 return HealingEffect2:: @ 81D5712 - playsewithpan SE_W071B, 63 + playsewithpan SE_M_ABSORB_2, 63 createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 0, -5, 1, 0 delay 7 createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, -15, 10, 1, 0 @@ -10279,72 +10279,72 @@ HealingEffect2:: @ 81D5712 PoisonBubblesEffect:: @ 81D575B createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 10, 10, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, -20, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, 15, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, -20, -20, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 delay 6 createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0 - playsewithpan SE_W092, 63 + playsewithpan SE_M_TOXIC, 63 return WaterBubblesEffectShort:: @ 81D57CC createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 0 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 return WaterBubblesEffectLong:: @ 81D583D createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -28, -10, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, 15, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 27, 8, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, -20, -20, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 delay 6 createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 1 - playsewithpan SE_W145C, 63 + playsewithpan SE_M_BUBBLE3, 63 return ElectricityEffect:: @ 81D58D4 - playsewithpan SE_W085B, 63 + playsewithpan SE_M_THUNDERBOLT2, 63 createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0 delay 2 createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1 @@ -10363,7 +10363,7 @@ ElectricityEffect:: @ 81D58D4 return ConfusionEffect:: @ 81D595F - loopsewithpan SE_W146, 63, 13, 6 + loopsewithpan SE_M_DIZZY_PUNCH, 63, 13, 6 createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 0, 3, 90 createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 51, 3, 90 createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 102, 3, 90 @@ -10435,7 +10435,7 @@ UnsetSolarbeamBg:: @ 81D5A41 return Status_Poison:: @ 81D5A44 - loopsewithpan SE_W092, 63, 13, 6 + loopsewithpan SE_M_TOXIC, 63, 13, 6 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 18, 2 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 12, 31774 end @@ -10447,7 +10447,7 @@ Status_Confusion:: @ 81D5A6F Status_Burn:: @ 81D5A78 loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W172, 63 + playsewithpan SE_M_FLAME_WHEEL, 63 call BurnFlame call BurnFlame call BurnFlame @@ -10461,19 +10461,19 @@ BurnFlame:: @ 81D5A90 Status_Infatuation:: @ 81D5AA8 loadspritegfx ANIM_TAG_MAGENTA_HEART - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 delay 15 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, -20, 20 delay 15 - playsewithpan SE_W204, 192 + playsewithpan SE_M_CHARM, 192 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 end Status_Sleep:: @ 81D5ADD loadspritegfx ANIM_TAG_LETTER_Z - playsewithpan SE_W173, 192 + playsewithpan SE_M_SNORE, 192 createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 @@ -10486,11 +10486,11 @@ Status_Paralysis:: @ 81D5B09 end Status_Freeze:: @ 81D5B23 - playsewithpan SE_W196, 0 + playsewithpan SE_M_ICY_WIND, 0 loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER monbgprio_28 1 - waitplaysewithpan SE_W258, 63, 17 + waitplaysewithpan SE_M_HAIL, 63, 17 createvisualtask AnimTask_FrozenIceCube, 2, waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -10499,7 +10499,7 @@ Status_Freeze:: @ 81D5B23 Status_Curse:: @ 81D5B3E loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2, createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 14, 1 waitforvisualfinish @@ -10509,7 +10509,7 @@ Status_Curse:: @ 81D5B3E Status_Nightmare:: @ 81D5B63 loadspritegfx ANIM_TAG_DEVIL monbg ANIM_DEF_PARTNER - playsewithpan SE_W171, 63 + playsewithpan SE_M_NIGHTMARE, 63 createsprite gNightmareDevilSpriteTemplate, ANIM_TARGET, 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 14, 1 waitforvisualfinish @@ -10523,8 +10523,8 @@ General_CastformChange:: @ 81D5B88 CastformChangeContinue:: @ 81D5B9C monbg ANIM_ATTACKER - playsewithpan SE_W100, 192 - waitplaysewithpan SE_W107, 192, 48 + playsewithpan SE_M_TELEPORT, 192 + waitplaysewithpan SE_M_MINIMIZE, 192, 48 createvisualtask AnimTask_TransformMon, 2, 1 waitforvisualfinish clearmonbg ANIM_ATTACKER @@ -10560,10 +10560,10 @@ General_BaitThrow:: @ 81D5C0C createvisualtask sub_80F1C8C, 2, 0 createvisualtask AnimTask_LoadBaitGfx, 2, delay 0 - waitplaysewithpan SE_W026, 192, 22 + waitplaysewithpan SE_M_JUMP_KICK, 192, 22 createsprite gSafariBaitSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32 delay 50 - loopsewithpan SE_W039, 63, 19, 2 + loopsewithpan SE_M_TAIL_WHIP, 63, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, 1 waitforvisualfinish createvisualtask AnimTask_FreeBaitGfx, 2, @@ -10584,7 +10584,7 @@ General_TurnTrap:: @ 81D5C5F Status_BindWrap:: @ 81D5C8B loadspritegfx ANIM_TAG_TENDRILS - loopsewithpan SE_W010, 63, 6, 2 + loopsewithpan SE_M_SCRATCH, 63, 6, 2 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1 delay 7 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 1 @@ -10592,13 +10592,13 @@ Status_BindWrap:: @ 81D5C8B createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 delay 20 setarg 7, 65535 - playsewithpan SE_W020, 63 + playsewithpan SE_M_BIND, 63 waitforvisualfinish end Status_FireSpin:: @ 81D5CD3 loadspritegfx ANIM_TAG_SMALL_EMBER - playsewithpan SE_W221B, 63 + playsewithpan SE_M_SACRED_FIRE2, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call FireSpinEffect call FireSpinEffect @@ -10613,7 +10613,7 @@ Status_Whirlpool:: @ 81D5CF8 setalpha 12, 8 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 23968 - playsewithpan SE_W250, 63 + playsewithpan SE_M_WHIRLPOOL, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call WhirlpoolEffect call WhirlpoolEffect @@ -10629,7 +10629,7 @@ Status_Clamp:: @ 81D5D4C loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W011, 63 + playsewithpan SE_M_VICEGRIP, 63 createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 2, 819, 0, 10 createsprite gClampJawSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10 delay 10 @@ -10645,7 +10645,7 @@ Status_SandTomb:: @ 81D5DA9 loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 563 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 - playsewithpan SE_W328, 63 + playsewithpan SE_M_SAND_TOMB, 63 call SandTombSwirlingDirt call SandTombSwirlingDirt delay 22 @@ -10658,19 +10658,19 @@ General_ItemEffect:: @ 81D5DF2 loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W036, 192 + playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 128, 0, 2 waitforvisualfinish - playsewithpan SE_W234, 192 + playsewithpan SE_M_MORNING_SUN, 192 call GrantingStarsEffect waitforvisualfinish - playsewithpan SE_REAPOKE, 192 + playsewithpan SE_SHINY, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 3, 7, 0, 26609 createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 waitforvisualfinish @@ -10681,23 +10681,23 @@ General_SmokeballEscape:: @ 81D5E66 monbg ANIM_ATTACKER setalpha 12, 4 delay 0 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BALL_OPEN, 63 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_TARGET, 0, 0, 32, 28, 30 delay 4 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BALL_OPEN, 63 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 127, 2, 12, 20, 30 delay 12 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BALL_OPEN, 63 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 126, 2, -28, 4, 30 delay 12 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BALL_OPEN, 63 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 124, 2, 14, -20, 30 delay 4 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BALL_OPEN, 63 createvisualtask AnimTask_AttackerFadeToInvisible, 2, 2 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 123, 3, 4, 4, 30 delay 14 - playsewithpan SE_BOWA2, 63 + playsewithpan SE_BALL_OPEN, 63 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 46 delay 0 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, -14, 46 @@ -10716,7 +10716,7 @@ General_SmokeballEscape:: @ 81D5E66 General_HangedOn:: @ 81D5F42 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 7, 0, 9, 31 - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_SlideMonForFocusBand, 5, 30, 128, 0, 1, 2, 0, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 4, 9, 0, 31 @@ -10727,7 +10727,7 @@ General_HangedOn:: @ 81D5F42 General_Rain:: @ 81D5F8F loadspritegfx ANIM_TAG_RAIN_DROPS - playsewithpan SE_W240, 192 + playsewithpan SE_M_RAIN_DANCE, 192 createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_CreateRaindrops, 2, 0, 3, 60 @@ -10756,7 +10756,7 @@ General_MonHit:: @ 81D5FF5 loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish @@ -10789,23 +10789,23 @@ SnatchMoveContinue:: @ 81D6082 end SnatchOpposingMonMove:: @ 81D6089 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 createvisualtask AnimTask_SnatchOpposingMonMove, 2, goto SnatchMoveContinue SnatchPartnerMonMove:: @ 81D6099 - playsewithpan SE_W104, 192 + playsewithpan SE_M_DOUBLE_TEAM, 192 createvisualtask AnimTask_SnatchPartnerMove, 2, goto SnatchMoveContinue General_FutureSightHit:: @ 81D60A9 createvisualtask AnimTask_SetAnimTargetToBattlerTarget, 2 monbg ANIM_DEF_PARTNER - playsewithpan SE_W060, 192 + playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground setalpha 8, 8 - playsewithpan SE_W048, 63 - waitplaysewithpan SE_W048, 63, 8 + playsewithpan SE_M_SUPERSONIC, 63 + waitplaysewithpan SE_M_SUPERSONIC, 63, 8 createvisualtask AnimTask_ShakeMon, 2, 1, 4, 0, 15, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, 1, 1 waitforvisualfinish @@ -10826,26 +10826,26 @@ General_DoomDesireHit:: @ 81D6108 delay 10 createvisualtask AnimTask_DoomDesireLightBeam, 5, delay 9 - playsewithpan SE_W109, 192 + playsewithpan SE_M_CONFUSE_RAY, 192 delay 9 - playsewithpan SE_W109, 0 + playsewithpan SE_M_CONFUSE_RAY, 0 delay 9 - playsewithpan SE_W109, 63 + playsewithpan SE_M_CONFUSE_RAY, 63 delay 25 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 10, 0, 20, 1 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 24, -24, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -16, 16, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, -24, -12, 1, 1 delay 6 - playsewithpan SE_W120, 63 + playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE @@ -10854,7 +10854,7 @@ General_DoomDesireHit:: @ 81D6108 General_FocusPunchSetUp:: @ 81D61CD loadspritegfx ANIM_TAG_FOCUS_ENERGY - playsewithpan SE_W082, 192 + playsewithpan SE_M_DRAGON_RAGE, 192 call EndureEffect delay 8 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 @@ -10889,7 +10889,7 @@ General_WishHeal:: @ 81D6250 loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, 0 waitforvisualfinish - playsewithpan SE_W025, 192 + playsewithpan SE_M_MEGA_KICK, 192 call GrantingStarsEffect waitforvisualfinish call HealingEffect @@ -10905,7 +10905,7 @@ General_MonScared:: @ 81D628A createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 10, 1 delay 20 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1 - playsewithpan SE_W166, 63 + playsewithpan SE_M_SKETCH, 63 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 createvisualtask AnimTask_StretchTargetUp, 3, @@ -10922,7 +10922,7 @@ General_GhostGetOut:: @ 81D6301 monbg_22 0 createvisualtask sub_80B6BBC, 2, waitbgfadein - loopsewithpan SE_W060, 63, 20, 3 + loopsewithpan SE_M_PSYBEAM, 63, 20, 3 waitforvisualfinish clearmonbg_23 0 delay 1 @@ -10941,8 +10941,8 @@ General_GhostGetOut:: @ 81D6301 General_SilphScoped:: @ 81D637B monbg ANIM_ATTACKER - playsewithpan SE_W100, 192 - waitplaysewithpan SE_W107, 192, 48 + playsewithpan SE_M_TELEPORT, 192 + waitplaysewithpan SE_M_MINIMIZE, 192, 48 createvisualtask AnimTask_TransformMon, 2, 255 waitsound waitforvisualfinish @@ -10955,13 +10955,13 @@ General_SafariRockThrow:: @ 81D6394 loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT delay 0 - waitplaysewithpan SE_W026, 192, 22 + waitplaysewithpan SE_M_JUMP_KICK, 192, 22 createsprite gSafariRockTemplate, ANIM_TARGET, 3, -17, 14, 8, 0 delay 50 monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 0 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -4, -20, 1, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -10978,28 +10978,28 @@ General_SafariReaction:: @ 81D63DC end gUnknown_81D63FD:: @ 81D63FD - playsewithpan SE_W036, 63 + playsewithpan SE_M_TAKE_DOWN, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 96, 0, 2 waitforvisualfinish - playsewithpan SE_W036, 63 + playsewithpan SE_M_TAKE_DOWN, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, -96, 0, 2 end gUnknown_81D6425:: @ 81D6425 loadspritegfx ANIM_TAG_ANGER createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -20 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 waitforvisualfinish delay 12 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -20 - playsewithpan SE_W207B, 63 + playsewithpan SE_M_SWAGGER2, 63 end gUnknown_81D644E:: @ 81D644E - playsewithpan SE_W036, 63 + playsewithpan SE_M_TAKE_DOWN, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 8, 136, 0, 2 waitforvisualfinish - playsewithpan SE_W036, 63 + playsewithpan SE_M_TAKE_DOWN, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 8, 136, 0, 2 end @@ -11030,7 +11030,7 @@ SnatchMoveSwapMonForSubstitute:: @ 81D64A7 goto SnatchMoveTrySwapToSubstituteEnd Special_LevelUp:: @ 81D64B6 - playsewithpan SE_EXPMAX, 0 + playsewithpan SE_EXP_MAX, 0 createvisualtask AnimTask_LoadHealthboxPalsForLevelUp, 2 delay 0 createvisualtask AnimTask_FlashHealthboxOnLevelUp, 5, 0, 0 @@ -11053,7 +11053,7 @@ Special_SwitchOutOpponentMon:: @ 81D64E8 Special_BallThrow:: @ 81D64F9 createvisualtask AnimTask_LoadBallGfx, 2 delay 0 - playsewithpan SE_NAGERU, 0 + playsewithpan SE_BALL_THROW, 0 createvisualtask AnimTask_ThrowBall, 2 createvisualtask AnimTask_IsBallBlockedByTrainerOrDodged, 2, jumpargeq 7, -1, BallThrowTrainerBlock @@ -11069,7 +11069,7 @@ BallThrowTrainerBlock:: @ 81D652D monbg ANIM_DEF_PARTNER setalpha 12, 8 delay 0 - playsewithpan SE_W003, 63 + playsewithpan SE_M_DOUBLE_SLAP, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -4, -20, 1, 2 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -11079,8 +11079,8 @@ BallThrowTrainerBlock:: @ 81D652D BallThrowGhostDodged:: @ 81D6555 delay 16 createvisualtask AnimTask_WindUpLunge, 2, 1, 48, 6, 16, 48, -48, 16 - playsewithpan SE_W036, 63 - waitplaysewithpan SE_W036, 63, 48 + playsewithpan SE_M_TAKE_DOWN, 63 + waitplaysewithpan SE_M_TAKE_DOWN, 63, 48 waitforvisualfinish goto BallThrowEnd diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 2ac9f7f6d..79b5dffc1 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3119,7 +3119,7 @@ BattleScript_Pausex20:: return BattleScript_LevelUp:: - fanfare MUS_FANFA1 + fanfare MUS_LEVEL_UP printstring STRINGID_PKMNGREWTOLV setbyte sLVLBOX_STATE, 0 drawlvlupbox @@ -3149,7 +3149,7 @@ BattleScript_ForgotAndLearnedNewMove:: printstring STRINGID_ANDELLIPSIS BattleScript_LearnedNewMove:: buffermovetolearn - fanfare MUS_FANFA1 + fanfare MUS_LEVEL_UP printstring STRINGID_PKMNLEARNEDMOVE waitmessage 0x40 updatechoicemoveonlvlup BS_ATTACKER diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 288b0438d..eab0bd225 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -134,7 +134,7 @@ BattleScript_PlayerUseItem:: BattleScript_AIUseFullRestoreOrHpHeal:: printstring STRINGID_EMPTYSTRING3 pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 64 useitemonopponent @@ -150,7 +150,7 @@ BattleScript_AIUseFullRestoreOrHpHeal:: BattleScript_AIUseStatRestore:: printstring STRINGID_EMPTYSTRING3 pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 64 useitemonopponent @@ -163,7 +163,7 @@ BattleScript_AIUseStatRestore:: BattleScript_AIUseXstat:: printstring STRINGID_EMPTYSTRING3 pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 64 useitemonopponent @@ -175,7 +175,7 @@ BattleScript_AIUseXstat:: BattleScript_AIUseGuardSpec:: printstring STRINGID_EMPTYSTRING3 pause 48 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 64 useitemonopponent @@ -185,7 +185,7 @@ BattleScript_AIUseGuardSpec:: finishaction BattleScript_UseFluffyTail:: - playse SE_NIGERU + playse SE_FLEE setbyte gBattleOutcome, B_OUTCOME_RAN finishturn @@ -199,7 +199,7 @@ BattleScript_UsePokeFlute:: BattleScript_PokeFluteWakeUp:: printstring STRINGID_POKEFLUTE waitmessage 64 - fanfare MUS_POKEFUE + fanfare MUS_POKE_FLUTE waitfanfare BS_ATTACKER printstring STRINGID_MONHEARINGFLUTEAWOKE waitmessage 64 diff --git a/data/event_scripts.s b/data/event_scripts.s index ec9409782..e9d49cc15 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1078,13 +1078,13 @@ Common_ShowEasyChatScreen:: @ 81A6AC0 @ Unused EventScript_GymBadgeFanfare:: @ 81A6C21 - playfanfare MUS_ME_BACHI + playfanfare MUS_OBTAIN_BADGE waitfanfare return EventScript_OutOfCenterPartyHeal:: @ 81A6C26 fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special HealPlayerParty fadescreen FADE_FROM_BLACK @@ -1113,7 +1113,7 @@ EventScript_ChangePokemonNickname:: @ 81A74EB @ Unused EventScript_HandOverItem:: @ 81A74F2 getitemname 0, VAR_0x8004 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message Text_HandedOverItem waitmessage waitfanfare diff --git a/data/maps/BattleColosseum_2P/map.json b/data/maps/BattleColosseum_2P/map.json index 9f113352e..84c7b2a8c 100644 --- a/data/maps/BattleColosseum_2P/map.json +++ b/data/maps/BattleColosseum_2P/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_COLOSSEUM_2P", "name": "BattleColosseum_2P", "layout": "LAYOUT_BATTLE_COLOSSEUM_2P", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BattleColosseum_4P/map.json b/data/maps/BattleColosseum_4P/map.json index 600a7a2c9..3a1be5e7d 100644 --- a/data/maps/BattleColosseum_4P/map.json +++ b/data/maps/BattleColosseum_4P/map.json @@ -2,7 +2,7 @@ "id": "MAP_BATTLE_COLOSSEUM_4P", "name": "BattleColosseum_4P", "layout": "LAYOUT_BATTLE_COLOSSEUM_4P", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 30f3b3891..c20e19129 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -72,7 +72,7 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0 setfieldeffectarg 1, 56 setfieldeffectarg 2, 2 dofieldeffect 68 - playbgm MUS_DEOEYE, 0 + playbgm MUS_ENCOUNTER_DEOXYS, 0 waitfieldeffect 68 applymovement 2, Movement_DeoxysApproach waitmovement 0 diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 78e63ac74..6aa1807d3 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY", "name": "CeladonCity", "layout": "LAYOUT_CELADON_CITY", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index 1aa8501be..aeac5b626 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_1F", "name": "CeladonCity_Condominiums_1F", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_1F", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json index 300be7ee9..756f74fb3 100644 --- a/data/maps/CeladonCity_Condominiums_2F/map.json +++ b/data/maps/CeladonCity_Condominiums_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_2F", "name": "CeladonCity_Condominiums_2F", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_2F", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 3f816ba07..cf2d74454 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_3F", "name": "CeladonCity_Condominiums_3F", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_3F", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json index c5d43e4ef..7492b8718 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/map.json +++ b/data/maps/CeladonCity_Condominiums_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF", "name": "CeladonCity_Condominiums_Roof", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index 90cb8d3d9..999f32e1f 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", "name": "CeladonCity_Condominiums_RoofRoom", "layout": "LAYOUT_CELADON_CITY_CONDOMINIUMS_ROOF_ROOM", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 3f3363674..96a1a69a4 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -21,7 +21,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6 removeobject 2 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage waitfanfare @@ -36,7 +36,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6 CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC:: @ 816C4DA removeobject 2 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee waitmessage waitfanfare diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index 424719a0a..0a33592cc 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_1F", "name": "CeladonCity_DepartmentStore_1F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index ca64f92a7..0ebc6977e 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_2F", "name": "CeladonCity_DepartmentStore_2F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index c4d3d8c3f..d59f34f42 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_3F", "name": "CeladonCity_DepartmentStore_3F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_3F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index 48062a10e..225a88043 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_4F", "name": "CeladonCity_DepartmentStore_4F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_4F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 5f56ecbd2..09c967ec2 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_5F", "name": "CeladonCity_DepartmentStore_5F", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_5F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json index d2ad4fa76..a863045a7 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", "name": "CeladonCity_DepartmentStore_Elevator", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ELEVATOR", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 8b1c534c7..e13de4ef8 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_DEPARTMENT_STORE_ROOF", "name": "CeladonCity_DepartmentStore_Roof", "layout": "LAYOUT_CELADON_CITY_DEPARTMENT_STORE_ROOF", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index dfd19d51f..32aed768c 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -149,7 +149,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward additem VAR_0x8009 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_ReceivedItemFromLittleGirl waitmessage waitfanfare @@ -269,7 +269,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: @ 816C0CB call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade updatemoneybox 0, 0, 0 getitemname 0, VAR_TEMP_0 - playse SE_JIHANKI + playse SE_VEND msgbox CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut additem VAR_TEMP_0 goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 8f27be39a..b352a3967 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_GAME_CORNER", "name": "CeladonCity_GameCorner", "layout": "LAYOUT_CELADON_CITY_GAME_CORNER", - "music": "MUS_SLOT", + "music": "MUS_GAME_CORNER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 4e1ddae41..f0c865ef5 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -403,7 +403,7 @@ CeladonCity_GameCorner_EventScript_Poster:: @ 816CAAA end CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE - playse SE_KI_GASYAN + playse SE_UNLOCK setmetatile 15, 2, METATILE_GameCorner_Floor_StairsTop, 0 setmetatile 16, 2, METATILE_GameCorner_StairsTop, 1 setmetatile 17, 2, METATILE_GameCorner_StairsBottom, 1 diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 7bf6091b1..60063cd08 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", "name": "CeladonCity_GameCorner_PrizeRoom", "layout": "LAYOUT_CELADON_CITY_GAME_CORNER_PRIZE_ROOM", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index ca8119594..09fcd2da5 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -214,7 +214,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: @ 816CDB3 removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_PlayerObtainedTheMon waitmessage waitfanfare @@ -228,7 +228,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: @ 816CDE0 removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_PlayerObtainedTheMon waitmessage waitfanfare diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc index 9e372584e..4cd29a4e9 100644 --- a/data/maps/CeladonCity_Gym/text.inc +++ b/data/maps/CeladonCity_Gym/text.inc @@ -12,7 +12,7 @@ CeladonCity_Gym_Text_ErikaIntro:: @ 8197114 .string "GRASS type.\p" .string "…Oh, I'm sorry, I had no idea that\n" .string "you wished to challenge me.\p" - .string "Very well, but I shall not lose.{PLAY_BGM MUS_EXEYE}$" + .string "Very well, but I shall not lose.{PLAY_BGM MUS_ENCOUNTER_GYM_LEADER}$" CeladonCity_Gym_Text_ErikaDefeat:: @ 8197260 .string "Oh!\n" diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index e323330ba..02d7c416b 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_HOTEL", "name": "CeladonCity_Hotel", "layout": "LAYOUT_CELADON_CITY_HOTEL", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index f4855dcd9..acf95fde5 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_HOUSE1", "name": "CeladonCity_House1", "layout": "LAYOUT_HOUSE5", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index 391a7daf9..5c2ca4f02 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_POKEMON_CENTER_1F", "name": "CeladonCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index b83e53cca..9431c273d 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_POKEMON_CENTER_2F", "name": "CeladonCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 5d66e4f26..71f2e4f30 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -2,7 +2,7 @@ "id": "MAP_CELADON_CITY_RESTAURANT", "name": "CeladonCity_Restaurant", "layout": "LAYOUT_CELADON_CITY_RESTAURANT", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_CELADON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index 6cf50ea13..abc495f92 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CAVE_1F", "name": "CeruleanCave_1F", "layout": "LAYOUT_CERULEAN_CAVE_1F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index a75ea2017..45e4fc963 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CAVE_2F", "name": "CeruleanCave_2F", "layout": "LAYOUT_CERULEAN_CAVE_2F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index b8ad317b6..478ddf111 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CAVE_B1F", "name": "CeruleanCave_B1F", "layout": "LAYOUT_CERULEAN_CAVE_B1F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_CERULEAN_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 0cd5f2628..5dd7aabf0 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -33,7 +33,7 @@ CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5 waitmessage waitmoncry delay 20 - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setwildbattle SPECIES_MEWTWO, 70, ITEM_NONE setflag FLAG_SYS_SPECIAL_WILD_BATTLE diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index 9ffcce5d5..282eaf4cc 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY", "name": "CeruleanCity", "layout": "LAYOUT_CERULEAN_CITY", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index 7d1f455a4..b1fc63b5e 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -42,7 +42,7 @@ CeruleanCity_EventScript_RivalTriggerRight:: @ 81664B9 CeruleanCity_EventScript_Rival:: @ 81664CC textcolor 0 setvar VAR_MAP_SCENE_ROUTE22, 2 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 addobject LOCALID_RIVAL applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalEnter waitmovement 0 @@ -57,7 +57,7 @@ CeruleanCity_EventScript_Rival:: @ 81664CC famechecker FAMECHECKER_BILL, 0 msgbox CeruleanCity_Text_RivalPostBattle closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq CeruleanCity_EventScript_RivalStartExit compare VAR_TEMP_1, 1 @@ -179,7 +179,7 @@ CeruleanCity_EventScript_Grunt:: @ 8166603 goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_EventScript_GruntDefeated message CeruleanCity_Text_GruntIntro waitmessage - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 waitbuttonpress trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_Text_GruntDefeat setvar VAR_MAP_SCENE_CERULEAN_CITY_ROCKET, 1 diff --git a/data/maps/CeruleanCity/text.inc b/data/maps/CeruleanCity/text.inc index 7a940032d..0ae618008 100644 --- a/data/maps/CeruleanCity/text.inc +++ b/data/maps/CeruleanCity/text.inc @@ -53,7 +53,7 @@ CeruleanCity_Text_GruntIntro:: @ 817EE0E .string "…Huh?\n" .string "Me?\p" .string "I'm an innocent bystander!\n" - .string "Don't you believe me?{PLAY_BGM}{MUS_ROCKET}$" + .string "Don't you believe me?{PLAY_BGM}{MUS_ENCOUNTER_ROCKET}$" CeruleanCity_Text_GruntDefeat:: @ 817EE70 .string "GRUNT: Stop! I give up!\n" diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index f7d3b573b..d7c0ea6d2 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_BIKE_SHOP", "name": "CeruleanCity_BikeShop", "layout": "LAYOUT_CERULEAN_CITY_BIKE_SHOP", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 48077084f..45a1c2a6a 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -30,7 +30,7 @@ CeruleanCity_BikeShop_EventScript_ClerkGoodbye:: @ 816AC15 CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher:: @ 816AC22 msgbox CeruleanCity_BikeShop_Text_OhBikeVoucherHereYouGo - msgreceiveditem CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle, ITEM_BICYCLE, 1, MUS_FAN5 + msgreceiveditem CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle, ITEM_BICYCLE, 1, MUS_OBTAIN_KEY_ITEM setflag FLAG_GOT_BICYCLE additem ITEM_BICYCLE removeitem ITEM_BIKE_VOUCHER diff --git a/data/maps/CeruleanCity_Gym/text.inc b/data/maps/CeruleanCity_Gym/text.inc index 19e8357bb..231f33c94 100644 --- a/data/maps/CeruleanCity_Gym/text.inc +++ b/data/maps/CeruleanCity_Gym/text.inc @@ -5,7 +5,7 @@ CeruleanCity_Gym_Text_MistyIntro:: @ 81921EF .string "What is your approach when you\n" .string "catch and train POKéMON?\p" .string "My policy is an all-out offensive\n" - .string "with WATER-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$" + .string "with WATER-type POKéMON!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" CeruleanCity_Gym_Text_ExplainTM03:: @ 81922BF .string "TM03 teaches WATER PULSE.\p" diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index c26ec9435..006be49fa 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE1", "name": "CeruleanCity_House1", "layout": "LAYOUT_CERULEAN_CITY_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index f70b0922f..4cc6cd713 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE2", "name": "CeruleanCity_House2", "layout": "LAYOUT_CERULEAN_CITY_HOUSE2", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index db0bc7f94..0c0bb10c4 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE3", "name": "CeruleanCity_House3", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index cb7c7fe0e..a2b792ede 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE4", "name": "CeruleanCity_House4", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 331d7ff54..a54a593b6 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_HOUSE5", "name": "CeruleanCity_House5", "layout": "LAYOUT_CERULEAN_CITY_HOUSE5", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index f5dfc959f..69dfbd2c0 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_MART", "name": "CeruleanCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 91dcfd544..7c797a653 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_1F", "name": "CeruleanCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index 929d46d1e..a706e5b4d 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CERULEAN_CITY_POKEMON_CENTER_2F", "name": "CeruleanCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CERULEAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index c738cff3b..9798a6be3 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND", "name": "CinnabarIsland", "layout": "LAYOUT_CINNABAR_ISLAND", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 40e8288cd..179c06a51 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -18,7 +18,7 @@ CinnabarIsland_OnTransition:: @ 8166EE1 end CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: @ 8166F0B - savebgm MUS_ANNAI + savebgm MUS_FOLLOW_ME setflag FLAG_TEMP_2 setobjectxyperm LOCALID_BILL, 15, 12 setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index f31d6f7bb..c2d95a706 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -217,7 +217,7 @@ CinnabarIsland_Gym_EventScript_Quiz1:: @ 816DC00 end CinnabarIsland_Gym_EventScript_CorrectAnswer:: @ 816DC27 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare msgbox CinnabarIsland_Gym_Text_CorrectGoOnThrough return @@ -238,7 +238,7 @@ CinnabarIsland_Gym_EventScript_Quiz1Correct:: @ 816DC43 end CinnabarIsland_Gym_EventScript_Quiz1Complete:: @ 816DC58 - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor1 special DrawWholeMapView @@ -318,7 +318,7 @@ CinnabarIsland_Gym_EventScript_Quiz2Correct:: @ 816DD1C end CinnabarIsland_Gym_EventScript_Quiz2Complete:: @ 816DD31 - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor2 special DrawWholeMapView @@ -403,7 +403,7 @@ CinnabarIsland_Gym_EventScript_Quiz3Correct:: @ 816DDFA end CinnabarIsland_Gym_EventScript_Quiz3Complete:: @ 816DE0F - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor3 special DrawWholeMapView @@ -479,7 +479,7 @@ CinnabarIsland_Gym_EventScript_Quiz4Correct:: @ 816DED1 end CinnabarIsland_Gym_EventScript_Quiz4Complete:: @ 816DEE6 - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor4 special DrawWholeMapView @@ -555,7 +555,7 @@ CinnabarIsland_Gym_EventScript_Quiz5Correct:: @ 816DFA8 end CinnabarIsland_Gym_EventScript_Quiz5Complete:: @ 816DFBD - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor5 special DrawWholeMapView @@ -631,7 +631,7 @@ CinnabarIsland_Gym_EventScript_Quiz6Correct:: @ 816E07F end CinnabarIsland_Gym_EventScript_Quiz6Complete:: @ 816E094 - playse SE_KI_GASYAN + playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor6 special DrawWholeMapView diff --git a/data/maps/CinnabarIsland_Gym/text.inc b/data/maps/CinnabarIsland_Gym/text.inc index 4543ffcc8..781238ccb 100644 --- a/data/maps/CinnabarIsland_Gym/text.inc +++ b/data/maps/CinnabarIsland_Gym/text.inc @@ -6,7 +6,7 @@ CinnabarIsland_Gym_Text_BlaineIntro:: @ 8199543 .string "and ready with intense heat!\p" .string "They incinerate all challengers!\p" .string "Hah!\n" - .string "You better have BURN HEAL!{PLAY_BGM}{MUS_EXEYE}$" + .string "You better have BURN HEAL!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" CinnabarIsland_Gym_Text_BlaineDefeat:: @ 81995FA .string "I have burned down to nothing!\n" diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index e1d02595a..0d5c16415 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_MART", "name": "CinnabarIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index 9a4182fe9..83b962c02 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_1F", "name": "CinnabarIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 844c38997..40ede6c6e 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -34,8 +34,8 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A goto_if_eq CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail msgbox CinnabarIsland_PokemonCenter_1F_Text_LetsGo closemessage - playbgm MUS_ANNAI, 1 - savebgm MUS_ANNAI + playbgm MUS_FOLLOW_ME, 1 + savebgm MUS_FOLLOW_ME setflag FLAG_DONT_TRANSITION_MUSIC setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 948e9850e..32fcb549f 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_CENTER_2F", "name": "CinnabarIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 775ad23c0..8d3b7c92b 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", "name": "CinnabarIsland_PokemonLab_Entrance", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_ENTRANCE", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index 25d094aa2..d6856c1f1 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", "name": "CinnabarIsland_PokemonLab_ExperimentRoom", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 08fe9acb8..3232c824a 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -255,7 +255,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: @ 816E7E2 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E827 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor waitmessage waitfanfare @@ -270,7 +270,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E82 CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC:: @ 816E85B textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor waitmessage waitfanfare diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 354bcfc2f..f51aa1fa8 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", "name": "CinnabarIsland_PokemonLab_Lounge", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_LOUNGE", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index df02316d7..a615b6830 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", "name": "CinnabarIsland_PokemonLab_ResearchRoom", "layout": "LAYOUT_CINNABAR_ISLAND_POKEMON_LAB_RESEARCH_ROOM", - "music": "MUS_GUREN", + "music": "MUS_CINNABAR", "region_map_section": "MAPSEC_CINNABAR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DiglettsCave_B1F/map.json b/data/maps/DiglettsCave_B1F/map.json index 13cdfac0a..a95991fad 100644 --- a/data/maps/DiglettsCave_B1F/map.json +++ b/data/maps/DiglettsCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_DIGLETTS_CAVE_B1F", "name": "DiglettsCave_B1F", "layout": "LAYOUT_DIGLETTS_CAVE_B1F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index f3bf00f42..5135b3e28 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_DIGLETTS_CAVE_NORTH_ENTRANCE", "name": "DiglettsCave_NorthEntrance", "layout": "LAYOUT_DIGLETTS_CAVE_NORTH_ENTRANCE", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index 0c6fb74e9..493f30be7 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_DIGLETTS_CAVE_SOUTH_ENTRANCE", "name": "DiglettsCave_SouthEntrance", "layout": "LAYOUT_DIGLETTS_CAVE_SOUTH_ENTRANCE", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_DIGLETTS_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index 413782a68..29e667d27 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND", "name": "FiveIsland", "layout": "LAYOUT_FIVE_ISLAND", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index 04b5b134b..e86f2333a 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_HARBOR", "name": "FiveIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 63c4e9c84..c4a14839d 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_HOUSE1", "name": "FiveIsland_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index 872818a50..bd75ab0c3 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_HOUSE2", "name": "FiveIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_LostCave_Entrance/map.json b/data/maps/FiveIsland_LostCave_Entrance/map.json index b257237bd..d91c86b79 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/map.json +++ b/data/maps/FiveIsland_LostCave_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE", "name": "FiveIsland_LostCave_Entrance", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index be0c1a618..9d6e27c73 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM1", "name": "FiveIsland_LostCave_Room1", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM1", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 1ad0c8d76..20835f0bc 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM10", "name": "FiveIsland_LostCave_Room10", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM10", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index d8b4dbb62..ab63d2ea3 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM11", "name": "FiveIsland_LostCave_Room11", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM11", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index cfe11f2c0..c14996b6f 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM12", "name": "FiveIsland_LostCave_Room12", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM12", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index 877ebe89a..84a0f34ea 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM13", "name": "FiveIsland_LostCave_Room13", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM13", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 20c960ff2..2d24d97c8 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM14", "name": "FiveIsland_LostCave_Room14", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM14", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room2/map.json b/data/maps/FiveIsland_LostCave_Room2/map.json index eaeabf81b..d1a5ff27d 100644 --- a/data/maps/FiveIsland_LostCave_Room2/map.json +++ b/data/maps/FiveIsland_LostCave_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM2", "name": "FiveIsland_LostCave_Room2", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM2", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room3/map.json b/data/maps/FiveIsland_LostCave_Room3/map.json index bcd56fec5..97c46a1dd 100644 --- a/data/maps/FiveIsland_LostCave_Room3/map.json +++ b/data/maps/FiveIsland_LostCave_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM3", "name": "FiveIsland_LostCave_Room3", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM3", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 9789e22ac..93de2af9a 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM4", "name": "FiveIsland_LostCave_Room4", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM4", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room5/map.json b/data/maps/FiveIsland_LostCave_Room5/map.json index 94a33e0be..099d76722 100644 --- a/data/maps/FiveIsland_LostCave_Room5/map.json +++ b/data/maps/FiveIsland_LostCave_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM5", "name": "FiveIsland_LostCave_Room5", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM5", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room6/map.json b/data/maps/FiveIsland_LostCave_Room6/map.json index 1941530d6..c96ab57f7 100644 --- a/data/maps/FiveIsland_LostCave_Room6/map.json +++ b/data/maps/FiveIsland_LostCave_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM6", "name": "FiveIsland_LostCave_Room6", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM6", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room7/map.json b/data/maps/FiveIsland_LostCave_Room7/map.json index 459c54736..91f787589 100644 --- a/data/maps/FiveIsland_LostCave_Room7/map.json +++ b/data/maps/FiveIsland_LostCave_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM7", "name": "FiveIsland_LostCave_Room7", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM7", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room8/map.json b/data/maps/FiveIsland_LostCave_Room8/map.json index d0c0c0d87..243b3fed6 100644 --- a/data/maps/FiveIsland_LostCave_Room8/map.json +++ b/data/maps/FiveIsland_LostCave_Room8/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM8", "name": "FiveIsland_LostCave_Room8", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM8", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_LostCave_Room9/map.json b/data/maps/FiveIsland_LostCave_Room9/map.json index 1669d671e..b2bb357d8 100644 --- a/data/maps/FiveIsland_LostCave_Room9/map.json +++ b/data/maps/FiveIsland_LostCave_Room9/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_LOST_CAVE_ROOM9", "name": "FiveIsland_LostCave_Room9", "layout": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ROOM9", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_LOST_CAVE", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index f88dfed92..16c52f2af 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_MEADOW", "name": "FiveIsland_Meadow", "layout": "LAYOUT_FIVE_ISLAND_MEADOW", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_FIVE_ISLE_MEADOW", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 21e92146d..489f63372 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_MEMORIAL_PILLAR", "name": "FiveIsland_MemorialPillar", "layout": "LAYOUT_FIVE_ISLAND_MEMORIAL_PILLAR", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_MEMORIAL_PILLAR", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index edc012fb7..24c72dd7e 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_1F", "name": "FiveIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 7564186ad..bb3bdd1eb 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_POKEMON_CENTER_2F", "name": "FiveIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FIVE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index 77bb5125c..5c596b3bc 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS", "name": "FiveIsland_ResortGorgeous", "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index 05178a289..d361589b7 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", "name": "FiveIsland_ResortGorgeous_House", "layout": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_RESORT_GORGEOUS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index c5863a524..e14361861 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_ROCKET_WAREHOUSE", "name": "FiveIsland_RocketWarehouse", "layout": "LAYOUT_FIVE_ISLAND_ROCKET_WAREHOUSE", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_WAREHOUSE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index 33c06d199..002a02f36 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -2,7 +2,7 @@ "id": "MAP_FIVE_ISLAND_WATER_LABYRINTH", "name": "FiveIsland_WaterLabyrinth", "layout": "LAYOUT_FIVE_ISLAND_WATER_LABYRINTH", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_WATER_LABYRINTH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index b07235406..d7815af0c 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -34,7 +34,7 @@ FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA setflag FLAG_GOT_TOGEPI_EGG giveegg SPECIES_TOGEPI textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan waitfanfare waitmessage diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 1c0b06c83..33abf1091 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND", "name": "FourIsland", "layout": "LAYOUT_FOUR_ISLAND", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index ac670db55..8fbf028fc 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -32,7 +32,7 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC textcolor 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 applymovement LOCALID_RIVAL, Movement_Delay48 @@ -46,7 +46,7 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit waitmovement 0 fadedefaultbgm - playse SE_KAIDAN + playse SE_EXIT delay 35 removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_FOUR_ISLAND, 1 @@ -113,7 +113,7 @@ FourIsland_EventScript_DaycareReceivedEgg:: @ 8167DEB textcolor 3 message DayCare_Text_ReceivedEgg call EventScript_RestorePrevTextColor - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress msgbox DayCare_Text_TakeGoodCareOfIt diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index c324696cc..afa0aca6c 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_HARBOR", "name": "FourIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index 7016ab9ab..44bf35f30 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_HOUSE1", "name": "FourIsland_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index af7a3322d..d31d74e77 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_HOUSE2", "name": "FourIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 8e7f52c9e..d8ddd44d1 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_1F", "name": "FourIsland_IcefallCave_1F", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index be73f02fc..797c05d6b 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -21,7 +21,7 @@ FourIsland_IcefallCave_1F_EventScript_FallDownHole:: @ 8163D65 delay 20 applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F waitstate diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 02db224cb..8e5bdb8bf 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_B1F", "name": "FourIsland_IcefallCave_B1F", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_B1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index a9d838841..bbb4afb7c 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_BACK", "name": "FourIsland_IcefallCave_Back", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_BACK", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index a0a94d4be..3edbc3886 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -47,7 +47,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98 waitmovement 0 applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown waitmovement 0 - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 textcolor 0 msgbox FourIsland_IcefallCave_Back_Text_GruntIntro setvar VAR_LAST_TALKED, LOCALID_ROCKET3 diff --git a/data/maps/FourIsland_IcefallCave_Entrance/map.json b/data/maps/FourIsland_IcefallCave_Entrance/map.json index 0dfe89452..aa97ac246 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/map.json +++ b/data/maps/FourIsland_IcefallCave_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", "name": "FourIsland_IcefallCave_Entrance", "layout": "LAYOUT_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ICEFALL_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index 77eb60ff2..72070ccbf 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_LORELEIS_HOUSE", "name": "FourIsland_LoreleisHouse", "layout": "LAYOUT_FOUR_ISLAND_LORELEIS_HOUSE", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index 178b8b4bf..ab36dfb24 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_MART", "name": "FourIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index e87c2955b..89ddda178 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_1F", "name": "FourIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index 5191528a8..7d6092bea 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_POKEMON_CENTER_2F", "name": "FourIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index 3cfb9dc54..81c7c0d9d 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_FOUR_ISLAND_POKEMON_DAY_CARE", "name": "FourIsland_PokemonDayCare", "layout": "LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE", - "music": "MUS_NANA45", + "music": "MUS_SEVII_45", "region_map_section": "MAPSEC_FOUR_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index dc04c477f..d09dc5369 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -132,7 +132,7 @@ FourIsland_PokemonDayCare_RetrieveMon:: @ 8171B05 waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare special SubtractMoneyFromVar0x8005 - playse SE_REGI + playse SE_RS_SHOP msgbox DayCare_Text_HeresYourMon waitse playmoncry VAR_RESULT, 0 diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index aab3609d4..4fbe92321 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY", "name": "FuchsiaCity", "layout": "LAYOUT_FUCHSIA_CITY", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/FuchsiaCity_Gym/text.inc b/data/maps/FuchsiaCity_Gym/text.inc index 2bfe9e53f..4b3314e0e 100644 --- a/data/maps/FuchsiaCity_Gym/text.inc +++ b/data/maps/FuchsiaCity_Gym/text.inc @@ -9,7 +9,7 @@ FuchsiaCity_Gym_Text_KogaIntro:: @ 819832E .string "Poison brings steady doom.\n" .string "Sleep renders foes helpless.\p" .string "Despair to the creeping horror of\n" - .string "POISON-type POKéMON!{PLAY_BGM}{MUS_EXEYE}$" + .string "POISON-type POKéMON!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" FuchsiaCity_Gym_Text_KogaDefeat:: @ 8198444 .string "Humph!\n" diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index 68f802b88..ac9fbd673 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_HOUSE1", "name": "FuchsiaCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 25361a07d..9d66853a4 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_HOUSE2", "name": "FuchsiaCity_House2", "layout": "LAYOUT_FUCHSIA_CITY_HOUSE2", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index fde85e8f9..b6916bec8 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_HOUSE3", "name": "FuchsiaCity_House3", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index d392f0aaf..d3d027c2c 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -37,7 +37,7 @@ FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0 FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919 special MoveDeleterForgetMove - playfanfare MUS_ME_WASURE + playfanfare MUS_MOVE_DELETED waitfanfare msgbox FuchsiaCity_House3_Text_MonHasForgottenMoveCompletely release diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index d7ac2c49d..10e7deb5a 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_MART", "name": "FuchsiaCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index b97fbb232..04e1112cd 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_1F", "name": "FuchsiaCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index 588d1a3eb..16e7f5606 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_POKEMON_CENTER_2F", "name": "FuchsiaCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index 85b2d38e7..62161f69f 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", "name": "FuchsiaCity_SafariZone_Entrance", "layout": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 5b0f06b08..459c9c76b 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -120,7 +120,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone:: @ 816D3CA updatemoneybox 0, 0, 0 msgbox FuchsiaCity_SafariZone_Entrance_Text_ThatllBe500WeOnlyUseSpecialBalls textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message FuchsiaCity_SafariZone_Entrance_Text_PlayerReceived30SafariBalls waitfanfare call EventScript_RestorePrevTextColor diff --git a/data/maps/FuchsiaCity_SafariZone_Office/map.json b/data/maps/FuchsiaCity_SafariZone_Office/map.json index 77704acae..89bf9cffc 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Office/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_SAFARI_ZONE_OFFICE", "name": "FuchsiaCity_SafariZone_Office", "layout": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_OFFICE", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_WardensHouse/map.json b/data/maps/FuchsiaCity_WardensHouse/map.json index ceb1d7398..73a8ee885 100644 --- a/data/maps/FuchsiaCity_WardensHouse/map.json +++ b/data/maps/FuchsiaCity_WardensHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_FUCHSIA_CITY_WARDENS_HOUSE", "name": "FuchsiaCity_WardensHouse", "layout": "LAYOUT_FUCHSIA_CITY_WARDENS_HOUSE", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_FUCHSIA_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/FuchsiaCity_WardensHouse/scripts.inc b/data/maps/FuchsiaCity_WardensHouse/scripts.inc index 1f0c891d6..7f1df4e44 100644 --- a/data/maps/FuchsiaCity_WardensHouse/scripts.inc +++ b/data/maps/FuchsiaCity_WardensHouse/scripts.inc @@ -16,7 +16,7 @@ FuchsiaCity_WardensHouse_EventScript_Warden:: @ 816D74C FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth:: @ 816D780 textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message FuchsiaCity_WardensHouse_Text_GaveGoldTeethToWarden waitmessage waitfanfare diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index be976f4ae..31461c51f 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_INDIGO_PLATEAU_EXTERIOR", "name": "IndigoPlateau_Exterior", "layout": "LAYOUT_INDIGO_PLATEAU_EXTERIOR", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index ecea7899a..e54d60e0d 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -13,7 +13,7 @@ IndigoPlateau_Exterior_OnTransition:: @ 8167246 end IndigoPlateau_Exterior_EventScript_PlayCreditsMusic:: @ 8167255 - playbgm MUS_ENDING, 0 + playbgm MUS_CREDITS, 0 return IndigoPlateau_Exterior_OnFrame:: @ 816725A diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 8181715b0..bdb442d7a 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_INDIGO_PLATEAU_POKEMON_CENTER_2F", "name": "IndigoPlateau_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_INDIGO_PLATEAU", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index 6f9bd7a0b..07fe80598 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN", "name": "LavenderTown", "layout": "LAYOUT_LAVENDER_TOWN", - "music": "MUS_SHION", + "music": "MUS_LAVENDER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index ae6263789..2920d0f11 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_HOUSE1", "name": "LavenderTown_House1", "layout": "LAYOUT_HOUSE5", - "music": "MUS_SHION", + "music": "MUS_LAVENDER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 565db668d..51f227c93 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_HOUSE2", "name": "LavenderTown_House2", "layout": "LAYOUT_HOUSE5", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index 5cb531347..c855026dc 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_MART", "name": "LavenderTown_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 4af67cd2a..f418ed011 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_1F", "name": "LavenderTown_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index da2a5786a..108d34364 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_POKEMON_CENTER_2F", "name": "LavenderTown_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 07ac2badd..02b70d9ef 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", "name": "LavenderTown_VolunteerPokemonHouse", "layout": "LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE", - "music": "MUS_SHION", + "music": "MUS_LAVENDER", "region_map_section": "MAPSEC_LAVENDER_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 703a71296..29972d993 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -10,7 +10,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji:: @ 816B14A compare VAR_RESULT, FALSE goto_if_eq LavenderTown_VolunteerPokemonHouse_EventScript_NoRoomForPokeFlute setflag FLAG_GOT_POKE_FLUTE - giveitem_msg LavenderTown_VolunteerPokemonHouse_Text_ReceivedPokeFluteFromMrFuji, ITEM_POKE_FLUTE, 1, MUS_FAN5 + giveitem_msg LavenderTown_VolunteerPokemonHouse_Text_ReceivedPokeFluteFromMrFuji, ITEM_POKE_FLUTE, 1, MUS_OBTAIN_KEY_ITEM msgbox LavenderTown_VolunteerPokemonHouse_Text_ExplainPokeFlute release end diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 6b0c1a8fb..42e1ea87f 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_EXTERIOR", "name": "MtEmber_Exterior", "layout": "LAYOUT_MT_EMBER_EXTERIOR", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 7d67eea09..36d82ca18 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -40,7 +40,7 @@ MtEmber_Exterior_EventScript_Grunt1Defeated:: @ 816399E MtEmber_Exterior_EventScript_BattleGrunt1:: @ 81639A8 applymovement 2, Movement_FacePlayer waitmovement 0 - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 msgbox MtEmber_Exterior_Text_Grunt1Intro trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_43, MtEmber_Exterior_Text_Grunt1Defeat msgbox MtEmber_Exterior_Text_Grunt1PostBattle @@ -77,7 +77,7 @@ MtEmber_Exterior_EventScript_DefeatedGrunt2:: @ 8163A1B end MtEmber_Exterior_EventScript_BattleGrunt2:: @ 8163A25 - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 msgbox MtEmber_Exterior_Text_Grunt2Intro trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, MtEmber_Exterior_Text_Grunt2Defeat msgbox MtEmber_Exterior_Text_Grunt2PostBattle diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index 46da66957..3a3d01a84 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_1F", "name": "MtEmber_RubyPath_1F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index af102d21a..131ba8fd6 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B1F", "name": "MtEmber_RubyPath_B1F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 426dfd840..ea9fa2586 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B1F_STAIRS", "name": "MtEmber_RubyPath_B1F_Stairs", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B1F_STAIRS", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index ae9032e1a..aaf1b8dc3 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B2F", "name": "MtEmber_RubyPath_B2F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 5aff19b08..b9c4074f9 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B2F_STAIRS", "name": "MtEmber_RubyPath_B2F_Stairs", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B2F_STAIRS", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index 80a475e31..7ee35c5ef 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B3F", "name": "MtEmber_RubyPath_B3F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B3F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 3c6852535..a031e598b 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -7,6 +7,6 @@ MtEmber_RubyPath_B5F_EventScript_Ruby:: @ 8163C49 faceplayer setflag FLAG_GOT_RUBY removeobject 1 - giveitem_msg MtEmber_RubyPath_B3F_Text_FoundARuby, ITEM_RUBY, 1, MUS_FAN5 + giveitem_msg MtEmber_RubyPath_B3F_Text_FoundARuby, ITEM_RUBY, 1, MUS_OBTAIN_KEY_ITEM release end diff --git a/data/maps/MtEmber_RubyPath_B4F/map.json b/data/maps/MtEmber_RubyPath_B4F/map.json index 5d4da8a7a..d4ed67e9c 100644 --- a/data/maps/MtEmber_RubyPath_B4F/map.json +++ b/data/maps/MtEmber_RubyPath_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B4F", "name": "MtEmber_RubyPath_B4F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B4F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index 8ca8f26f7..267cedd37 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_RUBY_PATH_B5F", "name": "MtEmber_RubyPath_B5F", "layout": "LAYOUT_MT_EMBER_RUBY_PATH_B5F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 521adf657..e750d9d65 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT", "name": "MtEmber_Summit", "layout": "LAYOUT_MT_EMBER_SUMMIT", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index f34e9ff6f..f0dc178bb 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -34,7 +34,7 @@ MtEmber_Summit_EventScript_Moltres:: @ 8163B33 waitmessage waitmoncry delay 10 - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle diff --git a/data/maps/MtEmber_SummitPath_1F/map.json b/data/maps/MtEmber_SummitPath_1F/map.json index 77c89d7f2..2f577dc02 100644 --- a/data/maps/MtEmber_SummitPath_1F/map.json +++ b/data/maps/MtEmber_SummitPath_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT_PATH_1F", "name": "MtEmber_SummitPath_1F", "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index ee43d3bce..0cc16016d 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT_PATH_2F", "name": "MtEmber_SummitPath_2F", "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_2F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtEmber_SummitPath_3F/map.json b/data/maps/MtEmber_SummitPath_3F/map.json index 330bc6fe5..19dd584bc 100644 --- a/data/maps/MtEmber_SummitPath_3F/map.json +++ b/data/maps/MtEmber_SummitPath_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_EMBER_SUMMIT_PATH_3F", "name": "MtEmber_SummitPath_3F", "layout": "LAYOUT_MT_EMBER_SUMMIT_PATH_3F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_MT_EMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 7a53c094a..4e91905de 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_MOON_1F", "name": "MtMoon_1F", "layout": "LAYOUT_MT_MOON_1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_B1F/map.json b/data/maps/MtMoon_B1F/map.json index e330d5510..68723ddee 100644 --- a/data/maps/MtMoon_B1F/map.json +++ b/data/maps/MtMoon_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_MOON_B1F", "name": "MtMoon_B1F", "layout": "LAYOUT_MT_MOON_B1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 172a1be21..358d791b8 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_MT_MOON_B2F", "name": "MtMoon_B2F", "layout": "LAYOUT_MT_MOON_B2F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_MT_MOON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 9bfe16f79..4ea99eb24 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -36,7 +36,7 @@ MtMoon_B2F_EventScript_BattleMiguel:: @ 81606DD textcolor 0 message MtMoon_B2F_Text_MiguelIntro waitmessage - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setvar VAR_LAST_TALKED, LOCALID_MIGUEL trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_Text_MiguelDefeat @@ -61,7 +61,7 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B compare VAR_RESULT, NO goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil removeobject LOCALID_DOME_FOSSIL - giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5 + giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_OBTAIN_KEY_ITEM closemessage special QuestLog_CutRecording delay 10 @@ -69,7 +69,7 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B waitmovement 0 moveobjectoffscreen LOCALID_MIGUEL textcolor 0 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message MtMoon_B2F_Text_ThenThisFossilIsMine waitmessage waitfanfare @@ -93,7 +93,7 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F compare VAR_RESULT, NO goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil removeobject LOCALID_HELIX_FOSSIL - giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 + giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_OBTAIN_KEY_ITEM closemessage special QuestLog_CutRecording delay 10 @@ -101,7 +101,7 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F waitmovement 0 moveobjectoffscreen LOCALID_MIGUEL textcolor 0 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message MtMoon_B2F_Text_ThenThisFossilIsMine waitmessage waitfanfare diff --git a/data/maps/NavelRock_1F/map.json b/data/maps/NavelRock_1F/map.json index 703240141..1cee54ae8 100644 --- a/data/maps/NavelRock_1F/map.json +++ b/data/maps/NavelRock_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_1F", "name": "NavelRock_1F", "layout": "LAYOUT_NAVEL_ROCK_1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json index b1a6deada..8ebd55017 100644 --- a/data/maps/NavelRock_B1F/map.json +++ b/data/maps/NavelRock_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_B1F", "name": "NavelRock_B1F", "layout": "LAYOUT_NAVEL_ROCK_B1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 8c00f2a75..6350185f9 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE", "name": "NavelRock_Base", "layout": "LAYOUT_NAVEL_ROCK_BASE", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 9308f1ee1..09cea7949 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -35,14 +35,14 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134 faceplayer waitse delay 20 - playse SE_T_AME_E + playse SE_THUNDERSTORM_STOP setvar VAR_0x8004, 0 @ Vertical pan setvar VAR_0x8005, 3 @ Horizontal pan setvar VAR_0x8006, 4 @ Num shakes setvar VAR_0x8007, 2 @ Shake delay special ShakeScreen delay 30 - playse SE_T_AME_E + playse SE_THUNDERSTORM_STOP setvar VAR_0x8004, 0 @ Vertical pan setvar VAR_0x8005, 3 @ Horizontal pan setvar VAR_0x8006, 4 @ Num shakes diff --git a/data/maps/NavelRock_BasePath_B10F/map.json b/data/maps/NavelRock_BasePath_B10F/map.json index 716ae04db..c579af031 100644 --- a/data/maps/NavelRock_BasePath_B10F/map.json +++ b/data/maps/NavelRock_BasePath_B10F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B10F", "name": "NavelRock_BasePath_B10F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B10F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B11F/map.json b/data/maps/NavelRock_BasePath_B11F/map.json index 1b92ca1fc..579b13577 100644 --- a/data/maps/NavelRock_BasePath_B11F/map.json +++ b/data/maps/NavelRock_BasePath_B11F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B11F", "name": "NavelRock_BasePath_B11F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B11F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B1F/map.json b/data/maps/NavelRock_BasePath_B1F/map.json index 624f800ee..f0289d880 100644 --- a/data/maps/NavelRock_BasePath_B1F/map.json +++ b/data/maps/NavelRock_BasePath_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B1F", "name": "NavelRock_BasePath_B1F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B1F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B2F/map.json b/data/maps/NavelRock_BasePath_B2F/map.json index b6af50439..5cd175db3 100644 --- a/data/maps/NavelRock_BasePath_B2F/map.json +++ b/data/maps/NavelRock_BasePath_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B2F", "name": "NavelRock_BasePath_B2F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B2F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B3F/map.json b/data/maps/NavelRock_BasePath_B3F/map.json index 22cc90c60..fdbe8f4e3 100644 --- a/data/maps/NavelRock_BasePath_B3F/map.json +++ b/data/maps/NavelRock_BasePath_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B3F", "name": "NavelRock_BasePath_B3F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B3F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B4F/map.json b/data/maps/NavelRock_BasePath_B4F/map.json index 33c4d41be..e90cabc93 100644 --- a/data/maps/NavelRock_BasePath_B4F/map.json +++ b/data/maps/NavelRock_BasePath_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B4F", "name": "NavelRock_BasePath_B4F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B4F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B5F/map.json b/data/maps/NavelRock_BasePath_B5F/map.json index 26cf212c6..61737e2e6 100644 --- a/data/maps/NavelRock_BasePath_B5F/map.json +++ b/data/maps/NavelRock_BasePath_B5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B5F", "name": "NavelRock_BasePath_B5F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B5F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B6F/map.json b/data/maps/NavelRock_BasePath_B6F/map.json index 0d3ffdf8f..54801807e 100644 --- a/data/maps/NavelRock_BasePath_B6F/map.json +++ b/data/maps/NavelRock_BasePath_B6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B6F", "name": "NavelRock_BasePath_B6F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B6F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B7F/map.json b/data/maps/NavelRock_BasePath_B7F/map.json index acfc1da43..b64c7ae1c 100644 --- a/data/maps/NavelRock_BasePath_B7F/map.json +++ b/data/maps/NavelRock_BasePath_B7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B7F", "name": "NavelRock_BasePath_B7F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B7F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B8F/map.json b/data/maps/NavelRock_BasePath_B8F/map.json index 4756a0655..5a50563b7 100644 --- a/data/maps/NavelRock_BasePath_B8F/map.json +++ b/data/maps/NavelRock_BasePath_B8F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B8F", "name": "NavelRock_BasePath_B8F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B8F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_BasePath_B9F/map.json b/data/maps/NavelRock_BasePath_B9F/map.json index d033dd887..a14c35048 100644 --- a/data/maps/NavelRock_BasePath_B9F/map.json +++ b/data/maps/NavelRock_BasePath_B9F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_BASE_PATH_B9F", "name": "NavelRock_BasePath_B9F", "layout": "LAYOUT_NAVEL_ROCK_BASE_PATH_B9F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json index 9b10f6d8c..e7578b073 100644 --- a/data/maps/NavelRock_Exterior/map.json +++ b/data/maps/NavelRock_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_EXTERIOR", "name": "NavelRock_Exterior", "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json index ec9fec5df..25e7ecf40 100644 --- a/data/maps/NavelRock_Fork/map.json +++ b/data/maps/NavelRock_Fork/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_FORK", "name": "NavelRock_Fork", "layout": "LAYOUT_NAVEL_ROCK_FORK", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index 3b859459e..a94603087 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_HARBOR", "name": "NavelRock_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index a7bacb9f5..2718158b2 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT", "name": "NavelRock_Summit", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/NavelRock_SummitPath_2F/map.json b/data/maps/NavelRock_SummitPath_2F/map.json index d103d5f70..9a61e4b79 100644 --- a/data/maps/NavelRock_SummitPath_2F/map.json +++ b/data/maps/NavelRock_SummitPath_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_2F", "name": "NavelRock_SummitPath_2F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_2F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_SummitPath_3F/map.json b/data/maps/NavelRock_SummitPath_3F/map.json index 3a122a2d2..e61f23fb8 100644 --- a/data/maps/NavelRock_SummitPath_3F/map.json +++ b/data/maps/NavelRock_SummitPath_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_3F", "name": "NavelRock_SummitPath_3F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_3F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_SummitPath_4F/map.json b/data/maps/NavelRock_SummitPath_4F/map.json index fa74a2c92..3d55fb5d7 100644 --- a/data/maps/NavelRock_SummitPath_4F/map.json +++ b/data/maps/NavelRock_SummitPath_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_4F", "name": "NavelRock_SummitPath_4F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_4F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/NavelRock_SummitPath_5F/map.json b/data/maps/NavelRock_SummitPath_5F/map.json index 25d3ba773..0182b2eec 100644 --- a/data/maps/NavelRock_SummitPath_5F/map.json +++ b/data/maps/NavelRock_SummitPath_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_NAVEL_ROCK_SUMMIT_PATH_5F", "name": "NavelRock_SummitPath_5F", "layout": "LAYOUT_NAVEL_ROCK_SUMMIT_PATH_5F", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_NAVEL_ROCK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index 394af5a6d..e49ef37ef 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND", "name": "OneIsland", "layout": "LAYOUT_ONE_ISLAND", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index f44aaa144..0ca6c7b3f 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_HARBOR", "name": "OneIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index c6fa1d06f..5823a4c3c 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_HOUSE1", "name": "OneIsland_House1", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index da306f19e..3f51fb461 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_HOUSE2", "name": "OneIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index c22c95e05..963d70acc 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_KINDLE_ROAD", "name": "OneIsland_KindleRoad", "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_KINDLE_ROAD", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index d7fa5d88f..f31b4b26f 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", "name": "OneIsland_KindleRoad_EmberSpa", "layout": "LAYOUT_ONE_ISLAND_KINDLE_ROAD_EMBER_SPA", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_EMBER_SPA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index e3d94753a..1223e5a2d 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_POKEMON_CENTER_1F", "name": "OneIsland_PokemonCenter_1F", "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_1F", - "music": "MUS_NETWORK", + "music": "MUS_NET_CENTER", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 524c99272..1d46a2bf8 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -104,12 +104,12 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: @ 8170CB1 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer - msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_FAN5 + msgreceiveditem OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill, ITEM_METEORITE, 1, MUS_OBTAIN_KEY_ITEM additem ITEM_METEORITE applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestDown waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis - giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_FAN5 + giveitem_msg OneIsland_PokemonCenter_1F_Text_ObtainedTriPass, ITEM_TRI_PASS, 1, MUS_OBTAIN_KEY_ITEM msgbox OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands compare VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 call_if_ge OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage @@ -137,7 +137,7 @@ OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp:: @ 8170E3D OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap waitmessage waitfanfare @@ -147,7 +147,7 @@ OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: @ 8170E58 setflag FLAG_HIDE_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE, 2 - giveitem_msg OneIsland_PokemonCenter_1F_Text_ReceivedTownMap, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg OneIsland_PokemonCenter_1F_Text_ReceivedTownMap, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM return OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio:: @ 8170E7D @@ -260,7 +260,7 @@ OneIsland_PokemonCenter_1F_EventScript_CelioJustGivenSapphire:: @ 8170F9B OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio waitmessage waitfanfare @@ -270,7 +270,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 closemessage applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine waitmovement 0 - playse SE_TK_KASYA + playse SE_CLICK call OneIsland_PokemonCenter_1F_EventScript_SetSapphireMetatile special DrawWholeMapView msgbox OneIsland_PokemonCenter_1F_Text_OkayThisIsGood @@ -306,7 +306,7 @@ OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass:: @ 817103A OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044 msgbox OneIsland_PokemonCenter_1F_Text_OhThats textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio waitmessage waitfanfare @@ -314,7 +314,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044 closemessage applymovement LOCALID_CELIO, OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine waitmovement 0 - playse SE_TK_KASYA + playse SE_CLICK call OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile special DrawWholeMapView delay 30 @@ -341,11 +341,11 @@ OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass:: @ 81710B2 additem ITEM_RAINBOW_PASS setflag FLAG_SYS_SEVII_MAP_4567 textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message OneIsland_PokemonCenter_1F_Text_ReturnedTriPassForRainbowPass waitmessage waitfanfare - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message OneIsland_PokemonCenter_1F_Text_ObtainedExtraMapPage waitmessage waitfanfare @@ -501,7 +501,7 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: @ 81711DA applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerExit applymovement LOCALID_BILL, OneIsland_PokemonCenter_1F_Movement_BillExit waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT setflag FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 3 clearflag FLAG_HIDE_CINNABAR_BILL diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index 13d3d1d02..f7fd1a1bb 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_POKEMON_CENTER_2F", "name": "OneIsland_PokemonCenter_2F", "layout": "LAYOUT_ONE_ISLAND_POKEMON_CENTER_2F", - "music": "MUS_NETWORK", + "music": "MUS_NET_CENTER", "region_map_section": "MAPSEC_ONE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 2f96d4b26..1eaf448bc 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -2,7 +2,7 @@ "id": "MAP_ONE_ISLAND_TREASURE_BEACH", "name": "OneIsland_TreasureBeach", "layout": "LAYOUT_ONE_ISLAND_TREASURE_BEACH", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_TREASURE_BEACH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 8ebfb8bcc..91819b8b1 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN", "name": "PalletTown", "layout": "LAYOUT_PALLET_TOWN", - "music": "MUS_MASARA", + "music": "MUS_PALLET", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 62e9d8a01..bed477a5c 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -65,7 +65,7 @@ PalletTown_EventScript_OakRatingScene:: @ 81654D8 goto_if_lt PalletTown_EventScript_NotEnoughMonsForNationalDex msgbox PalletTown_Text_CaughtXImpressiveFollowMe closemessage - playbgm MUS_ANNAI, 0 + playbgm MUS_FOLLOW_ME, 0 applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse waitmovement 0 @@ -189,7 +189,7 @@ PalletTown_EventScript_OakTrigger:: @ 8165605 famechecker FAMECHECKER_OAK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 textcolor 0 delay 30 - playbgm MUS_OHKIDO, 0 + playbgm MUS_OAK, 0 message PalletTown_Text_OakDontGoOut waitmessage delay 85 diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index 0808e9534..b59a5fc0f 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_GARYS_HOUSE", "name": "PalletTown_GarysHouse", "layout": "LAYOUT_PALLET_TOWN_GARYS_HOUSE", - "music": "MUS_MASARA", + "music": "MUS_PALLET", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index b9ce39e52..e61904c71 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -69,7 +69,7 @@ PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9 msgbox PalletTown_GarysHouse_Text_LookingNiceInNoTime closemessage fadescreen FADE_TO_BLACK - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare special DaisyMassageServices fadescreen FADE_FROM_BLACK @@ -155,7 +155,7 @@ PalletTown_GarysHouse_EventScript_GiveTownMap:: @ 8168EF6 applymovement LOCALID_DAISY, Movement_FacePlayer waitmovement 0 delay 12 - giveitem_msg PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_FAN5 + giveitem_msg PalletTown_GarysHouse_Text_ReceivedTownMapFromDaisy, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM release end diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 60d0d1960..f40f63125 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_1F", "name": "PalletTown_PlayersHouse_1F", "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F", - "music": "MUS_MASARA", + "music": "MUS_PALLET", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_PlayersHouse_2F/map.json b/data/maps/PalletTown_PlayersHouse_2F/map.json index bd2aec42f..9d38997a1 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/map.json +++ b/data/maps/PalletTown_PlayersHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_PLAYERS_HOUSE_2F", "name": "PalletTown_PlayersHouse_2F", "layout": "LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F", - "music": "MUS_MASARA", + "music": "MUS_PALLET", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index ad076b0c6..4ba6d636b 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -2,7 +2,7 @@ "id": "MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB", "name": "PalletTown_ProfessorOaksLab", "layout": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB", - "music": "MUS_KENKYU", + "music": "MUS_OAK_LAB", "region_map_section": "MAPSEC_PALLET_TOWN", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index c21a0e184..43000bc34 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -41,7 +41,7 @@ PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished:: @ 8168FC0 PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene:: @ 8168FC6 setobjectxyperm LOCALID_PROF_OAK, 6, 11 setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP - savebgm MUS_OHKIDO + savebgm MUS_OAK return PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene:: @ 8168FD5 @@ -124,7 +124,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 compare VAR_FACING, DIR_WEST call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded waitmessage waitfanfare @@ -133,7 +133,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 msgbox PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex msgbox PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_FACING, DIR_NORTH call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth compare VAR_FACING, DIR_SOUTH @@ -151,7 +151,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: @ 8169174 setobjectxyperm LOCALID_RIVAL, 5, 10 addobject LOCALID_RIVAL - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 @@ -160,7 +160,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: @ 8169 PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: @ 8169194 setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter @@ -170,7 +170,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: @ 8 PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth:: @ 81691BB setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalEnter waitmovement 0 @@ -239,7 +239,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene:: @ 816923E applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp waitmovement 0 clearflag FLAG_DONT_TRANSITION_MUSIC - savebgm SE_STOP + savebgm MUS_DUMMY fadedefaultbgm msgbox PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting closemessage @@ -316,7 +316,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight:: @ 81692FF PalletTown_ProfessorOaksLab_EventScript_RivalBattle:: @ 816930B textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp @@ -509,7 +509,7 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: @ 81694C2 special HealPlayerParty msgbox PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_2, 1 call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft compare VAR_TEMP_2, 2 @@ -517,7 +517,7 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: @ 81694C2 compare VAR_TEMP_2, 3 call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight removeobject LOCALID_RIVAL - playse SE_KAIDAN + playse SE_EXIT fadedefaultbgm setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 4 setflag FLAG_BEAT_RIVAL_IN_OAKS_LAB @@ -651,14 +651,14 @@ PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow:: @ 8169614 PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E msgbox PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel waitmessage waitfanfare call EventScript_RestorePrevTextColor removeitem ITEM_OAKS_PARCEL, 1 msgbox PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 msgbox PalletTown_ProfessorOaksLab_Text_RivalGramps closemessage compare VAR_FACING, DIR_NORTH @@ -717,7 +717,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E call_if_eq PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest delay 10 textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak waitmessage waitfanfare @@ -741,7 +741,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E call_if_eq PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest msgbox PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_FACING, DIR_NORTH call_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth compare VAR_FACING, DIR_SOUTH @@ -1220,7 +1220,7 @@ PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: @ 8169C74 getspeciesname 0, PLAYER_STARTER_SPECIES message PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak waitmessage - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM waitfanfare msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, YES @@ -1271,7 +1271,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter:: @ 8169D2F getspeciesname 0, RIVAL_STARTER_SPECIES message PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak waitmessage - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 call_if_set FLAG_OPENED_START_MENU, PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 6d6fc0396..eca9af0b8 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY", "name": "PewterCity", "layout": "LAYOUT_PEWTER_CITY", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 5bb795169..2d0320b10 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -18,7 +18,7 @@ PewterCity_EventScript_GymGuide:: @ 8165B9D faceplayer msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe closemessage - playbgm MUS_ANNAI, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_FACING, DIR_EAST call_if_eq PewterCity_EventScript_WalkToGymEast msgbox PewterCity_Text_GoTakeOnBrock @@ -287,7 +287,7 @@ PewterCity_EventScript_GymGuideTrigger:: @ 8165DBE textcolor 0 msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe closemessage - playbgm MUS_ANNAI, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_TEMP_1, 0 call_if_eq PewterCity_EventScript_WalkToGymTop compare VAR_TEMP_1, 1 @@ -445,7 +445,7 @@ PewterCity_EventScript_MuseumGuide:: @ 816607E msgbox PewterCity_Text_ReallyYouHaveToGo closemessage delay 10 - playbgm MUS_ANNAI, 0 + playbgm MUS_FOLLOW_ME, 0 compare VAR_FACING, DIR_NORTH call_if_eq PewterCity_EventScript_LeadToMuseumNorth compare VAR_FACING, DIR_SOUTH @@ -719,7 +719,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE call_if_eq PewterCity_EventScript_AideApproachPlayer3 msgbox PewterCity_Text_AskedToDeliverThis textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message PewterCity_Text_ReceivedRunningShoesFromAide waitmessage waitfanfare diff --git a/data/maps/PewterCity_Gym/text.inc b/data/maps/PewterCity_Gym/text.inc index c47a60b05..b6a1d87ee 100644 --- a/data/maps/PewterCity_Gym/text.inc +++ b/data/maps/PewterCity_Gym/text.inc @@ -12,7 +12,7 @@ PewterCity_Gym_Text_BrockIntro:: @ 8190CD4 .string "That's the TRAINER's honor that\n" .string "compels you to challenge me.\p" .string "Fine, then!\n" - .string "Show me your best!{PLAY_BGM}{MUS_EXEYE}$" + .string "Show me your best!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PewterCity_Gym_Text_BrockDefeat:: @ 8190E4F .string "I took you for granted, and so\n" @@ -21,7 +21,7 @@ PewterCity_Gym_Text_BrockDefeat:: @ 8190E4F .string "on you this…the official POKéMON\l" .string "LEAGUE BOULDERBADGE.\p" .string "{SIZE}Á{PLAYER} received the BOULDERBADGE\n" - .string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p" + .string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p" .string "{SIZE}ÇJust having the BOULDERBADGE makes\n" .string "your POKéMON more powerful.\p" .string "It also enables the use of the\n" diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 1c45b8da0..70b274917 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_HOUSE1", "name": "PewterCity_House1", "layout": "LAYOUT_HOUSE2", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index cb65aa873..224bf438e 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_HOUSE2", "name": "PewterCity_House2", "layout": "LAYOUT_HOUSE2", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index ec45af3a6..df4620ff7 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_MART", "name": "PewterCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 26cdfbdcd..a96ec184e 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_MUSEUM_1F", "name": "PewterCity_Museum_1F", "layout": "LAYOUT_PEWTER_CITY_MUSEUM_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 6a3601717..1b481d392 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -159,7 +159,7 @@ PewterCity_Museum_1F_EventScript_OldAmberScientist:: @ 816A4AE goto_if_eq PewterCity_Museum_1F_EventScript_NoRoomForOldAmber setflag FLAG_GOT_OLD_AMBER removeobject 4 - giveitem_msg PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan, ITEM_OLD_AMBER, 1, MUS_FAN5 + giveitem_msg PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan, ITEM_OLD_AMBER, 1, MUS_OBTAIN_KEY_ITEM release end diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 2e3c40177..95c1b6aa4 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_MUSEUM_2F", "name": "PewterCity_Museum_2F", "layout": "LAYOUT_PEWTER_CITY_MUSEUM_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index 6918c6df2..ebc6c532b 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_POKEMON_CENTER_1F", "name": "PewterCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index 5ec0e0cd9..8cd8c3415 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -22,11 +22,11 @@ PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781 lock faceplayer fadeoutbgm 0 - playbgm MUS_PURIN, 0 + playbgm MUS_JIGGLYPUFF, 0 message PewterCity_Museum_1F_Text_Jigglypuff waitmessage delay 455 - playbgm MUS_POKECEN, 1 + playbgm MUS_POKE_CENTER, 1 release end diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index d080b6965..45d753045 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_PEWTER_CITY_POKEMON_CENTER_2F", "name": "PewterCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_PEWTER_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 87f9eb0a7..86fda6a3e 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_AGATHAS_ROOM", "name": "PokemonLeague_AgathasRoom", "layout": "LAYOUT_POKEMON_LEAGUE_AGATHAS_ROOM", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_AgathasRoom/text.inc b/data/maps/PokemonLeague_AgathasRoom/text.inc index 06a8af142..dc1923238 100644 --- a/data/maps/PokemonLeague_AgathasRoom/text.inc +++ b/data/maps/PokemonLeague_AgathasRoom/text.inc @@ -11,7 +11,7 @@ PokemonLeague_AgathasRoom_Text_Intro:: @ 817844D .string "He's wrong.\n" .string "POKéMON are for battling!\p" .string "{PLAYER}! I'll show you how a real\n" - .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$" + .string "TRAINER battles!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_AgathasRoom_Text_RematchIntro:: @ 817858D .string "I am AGATHA of the ELITE FOUR.\p" @@ -26,7 +26,7 @@ PokemonLeague_AgathasRoom_Text_RematchIntro:: @ 817858D .string "He's wrong.\n" .string "POKéMON are for battling!\p" .string "{PLAYER}! I'll show you how a real\n" - .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$" + .string "TRAINER battles!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_AgathasRoom_Text_Defeat:: @ 81786D7 .string "Oh, my!\n" diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index bcc6a1155..cf1448886 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_BRUNOS_ROOM", "name": "PokemonLeague_BrunosRoom", "layout": "LAYOUT_POKEMON_LEAGUE_BRUNOS_ROOM", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_BrunosRoom/text.inc b/data/maps/PokemonLeague_BrunosRoom/text.inc index 4c6cb4561..a9a7ef5e1 100644 --- a/data/maps/PokemonLeague_BrunosRoom/text.inc +++ b/data/maps/PokemonLeague_BrunosRoom/text.inc @@ -9,7 +9,7 @@ PokemonLeague_BrunosRoom_Text_Intro:: @ 817820F .string "{PLAYER}!\p" .string "We will grind you down with our\n" .string "superior power!\p" - .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$" + .string "Hoo hah!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_BrunosRoom_Text_RematchIntro:: @ 817830C .string "I am BRUNO of the ELITE FOUR!\p" @@ -22,7 +22,7 @@ PokemonLeague_BrunosRoom_Text_RematchIntro:: @ 817830C .string "{PLAYER}!\p" .string "We will grind you down with our\n" .string "superior power!\p" - .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$" + .string "Hoo hah!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_BrunosRoom_Text_Defeat:: @ 8178409 .string "Why?\n" diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index a0480dbd5..a4c1da00f 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_CHAMPIONS_ROOM", "name": "PokemonLeague_ChampionsRoom", "layout": "LAYOUT_POKEMON_LEAGUE_CHAMPIONS_ROOM", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 817991d5a..84879db66 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -61,7 +61,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76 goto_if_questlog PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - savebgm MUS_WIN_GYM + savebgm MUS_VICTORY_GYM_LEADER call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_ChampionsRoom_EventScript_Battle call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_ChampionsRoom_EventScript_Rematch setflag FLAG_TEMP_4 @@ -69,7 +69,7 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76 setflag FLAG_DEFEATED_CHAMP setflag FLAG_TEMP_4 msgbox PokemonLeague_ChampionsRoom_Text_PostBattle - playbgm MUS_SLOWMASARA, 0 + playbgm MUS_SLOW_PALLET, 0 addobject LOCALID_PROF_OAK msgbox PokemonLeague_ChampionsRoom_Text_OakPlayer closemessage diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index 1b694e4fb..bbe302813 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_HALL_OF_FAME", "name": "PokemonLeague_HallOfFame", "layout": "LAYOUT_POKEMON_LEAGUE_HALL_OF_FAME", - "music": "MUS_SLOWMASARA", + "music": "MUS_SLOW_PALLET", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index c112adb23..05c1daa01 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_LEAGUE_LANCES_ROOM", "name": "PokemonLeague_LancesRoom", "layout": "LAYOUT_POKEMON_LEAGUE_LANCES_ROOM", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_POKEMON_LEAGUE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 190e52d33..65afbdcb4 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -42,7 +42,7 @@ PokemonLeague_LancesRoom_EventScript_EnterRoom:: @ 8162987 waitmovement 0 setflag FLAG_TEMP_2 call PokemonLeague_LancesRoom_EventScript_SetEntryClosed - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 4 diff --git a/data/maps/PokemonLeague_LancesRoom/text.inc b/data/maps/PokemonLeague_LancesRoom/text.inc index 8c726875a..cef8c7712 100644 --- a/data/maps/PokemonLeague_LancesRoom/text.inc +++ b/data/maps/PokemonLeague_LancesRoom/text.inc @@ -12,7 +12,7 @@ PokemonLeague_LancesRoom_Text_Intro:: @ 8178764 .string "There's no being clever with them.\p" .string "Well, are you ready to lose?\p" .string "Your LEAGUE challenge ends with\n" - .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$" + .string "me, {PLAYER}!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_LancesRoom_Text_RematchIntro:: @ 81788BD .string "Ah!\n" @@ -28,7 +28,7 @@ PokemonLeague_LancesRoom_Text_RematchIntro:: @ 81788BD .string "There's no being clever with them.\p" .string "Well, are you ready to lose?\p" .string "Your LEAGUE challenge ends with\n" - .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$" + .string "me, {PLAYER}!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_LancesRoom_Text_Defeat:: @ 8178A15 .string "That's it!\p" diff --git a/data/maps/PokemonLeague_LoreleisRoom/text.inc b/data/maps/PokemonLeague_LoreleisRoom/text.inc index 55e67d764..be9ff69e2 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/text.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/text.inc @@ -7,7 +7,7 @@ PokemonLeague_LoreleisRoom_Text_Intro:: @ 8177FA4 .string "Your POKéMON will be at my mercy\n" .string "when they are frozen solid.\p" .string "Hahaha!\n" - .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$" + .string "Are you ready?{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_LoreleisRoom_Text_RematchIntro:: @ 8178089 .string "Welcome to the POKéMON LEAGUE.\p" @@ -20,7 +20,7 @@ PokemonLeague_LoreleisRoom_Text_RematchIntro:: @ 8178089 .string "Your POKéMON will be at my mercy\n" .string "when they are frozen solid.\p" .string "Hahaha!\n" - .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$" + .string "Are you ready?{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" PokemonLeague_LoreleisRoom_Text_Defeat:: @ 8178191 .string "…Things shouldn't be this way!$" diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 1cbf97e80..d8ff775b8 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_1F", "name": "PokemonMansion_1F", "layout": "LAYOUT_POKEMON_MANSION_1F", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index cc071a6ac..38b41d545 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -15,7 +15,7 @@ PokemonMansion_1F_EventScript_Statue:: @ 8162212 lockall setvar VAR_0x8004, 0 call PokemonMansion_EventScript_SecretSwitch - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 2591840bc..6fb09a8e7 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_2F", "name": "PokemonMansion_2F", "layout": "LAYOUT_POKEMON_MANSION_2F", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index a6dd709a7..9a33853b4 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -10,7 +10,7 @@ PokemonMansion_2F_EventScript_Statue:: @ 8162264 lockall setvar VAR_0x8004, 1 call PokemonMansion_EventScript_SecretSwitch - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index 6437b86b2..6ca394a7d 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_3F", "name": "PokemonMansion_3F", "layout": "LAYOUT_POKEMON_MANSION_3F", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index dd7667161..71ba27874 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -10,7 +10,7 @@ PokemonMansion_3F_EventScript_Statue:: @ 81622B1 lockall setvar VAR_0x8004, 2 call PokemonMansion_EventScript_SecretSwitch - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index 32595b885..4f4ad6ea1 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_MANSION_B1F", "name": "PokemonMansion_B1F", "layout": "LAYOUT_POKEMON_MANSION_B1F", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POKEMON_MANSION", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index 5f749fc24..c522096e1 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -10,7 +10,7 @@ PokemonMansion_B1F_EventScript_Statue:: @ 816230C lockall setvar VAR_0x8004, 3 call PokemonMansion_EventScript_SecretSwitch - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse releaseall diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index fd5d75c8b..b0d8cafa2 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_1F", "name": "PokemonTower_1F", "layout": "LAYOUT_POKEMON_TOWER_1F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index 527af409c..36281aa79 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_2F", "name": "PokemonTower_2F", "layout": "LAYOUT_POKEMON_TOWER_2F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 0042290c1..20cbe6090 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -19,7 +19,7 @@ PokemonTower_2F_EventScript_RivalTriggerDown:: @ 816329B PokemonTower_2F_EventScript_Rival:: @ 81632A7 textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 compare VAR_TEMP_1, 0 call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerRight compare VAR_TEMP_1, 1 @@ -38,12 +38,12 @@ PokemonTower_2F_EventScript_Rival:: @ 81632A7 call_if_eq PokemonTower_2F_EventScript_RivalCharmander msgbox PokemonTower_2F_Text_RivalPostBattle closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq PokemonTower_2F_EventScript_RivalExitRight compare VAR_TEMP_1, 1 call_if_eq PokemonTower_2F_EventScript_RivalExitDown - playse SE_KAIDAN + playse SE_EXIT delay 25 fadedefaultbgm removeobject 1 diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index af3480839..ee15b4a68 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_3F", "name": "PokemonTower_3F", "layout": "LAYOUT_POKEMON_TOWER_3F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index d7104bc15..7924b4f3c 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_4F", "name": "PokemonTower_4F", "layout": "LAYOUT_POKEMON_TOWER_4F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index bd22d3bff..9f74a6aab 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_5F", "name": "PokemonTower_5F", "layout": "LAYOUT_POKEMON_TOWER_5F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index a9bd74228..ae72e35e6 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_6F", "name": "PokemonTower_6F", "layout": "LAYOUT_POKEMON_TOWER_6F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index deaaab14d..327b9311b 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_POKEMON_TOWER_7F", "name": "PokemonTower_7F", "layout": "LAYOUT_POKEMON_TOWER_7F", - "music": "MUS_P_TOWER", + "music": "MUS_POKE_TOWER", "region_map_section": "MAPSEC_POKEMON_TOWER", "requires_flash": false, "weather": "WEATHER_FOG_HORIZONTAL", diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index 7b0d5f37a..12f69cedf 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -50,7 +50,7 @@ PokemonTower_7F_EventScript_Grunt1ExitRight:: @ 81635F0 PokemonTower_7F_EventScript_Grunt1ExitLeft:: @ 8163600 applymovement 2, PokemonTower_7F_Movement_Grunt1ExitLeft waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT delay 25 goto PokemonTower_7F_EventScript_RemoveGrunt1 end diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 3e92c9ebc..f019d6320 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -2,7 +2,7 @@ "id": "MAP_POWER_PLANT", "name": "PowerPlant", "layout": "LAYOUT_POWER_PLANT", - "music": "MUS_POKEYASHI", + "music": "MUS_POKE_MANSION", "region_map_section": "MAPSEC_POWER_PLANT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index ad6d3fe6a..1cbd06d48 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -45,7 +45,7 @@ PowerPlant_EventScript_Zapdos:: @ 81637B8 waitmessage waitmoncry delay 10 - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle diff --git a/data/maps/Prototype_SeviiIsle_6/map.json b/data/maps/Prototype_SeviiIsle_6/map.json index 761c204ce..8f83fc5da 100644 --- a/data/maps/Prototype_SeviiIsle_6/map.json +++ b/data/maps/Prototype_SeviiIsle_6/map.json @@ -2,7 +2,7 @@ "id": "MAP_PROTOTYPE_SEVII_ISLE_6", "name": "Prototype_SeviiIsle_6", "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_6", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVII_ISLE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Prototype_SeviiIsle_7/map.json b/data/maps/Prototype_SeviiIsle_7/map.json index 856883c02..d7260198e 100644 --- a/data/maps/Prototype_SeviiIsle_7/map.json +++ b/data/maps/Prototype_SeviiIsle_7/map.json @@ -2,7 +2,7 @@ "id": "MAP_PROTOTYPE_SEVII_ISLE_7", "name": "Prototype_SeviiIsle_7", "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_7", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVII_ISLE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Prototype_SeviiIsle_8/map.json b/data/maps/Prototype_SeviiIsle_8/map.json index dd05d6d35..758aaf8d8 100644 --- a/data/maps/Prototype_SeviiIsle_8/map.json +++ b/data/maps/Prototype_SeviiIsle_8/map.json @@ -2,7 +2,7 @@ "id": "MAP_PROTOTYPE_SEVII_ISLE_8", "name": "Prototype_SeviiIsle_8", "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_8", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVII_ISLE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Prototype_SeviiIsle_9/map.json b/data/maps/Prototype_SeviiIsle_9/map.json index b03f3866c..22ab85069 100644 --- a/data/maps/Prototype_SeviiIsle_9/map.json +++ b/data/maps/Prototype_SeviiIsle_9/map.json @@ -2,7 +2,7 @@ "id": "MAP_PROTOTYPE_SEVII_ISLE_9", "name": "Prototype_SeviiIsle_9", "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_9", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVII_ISLE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index ad4308513..710a91832 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -2,7 +2,7 @@ "id": "MAP_RECORD_CENTER", "name": "RecordCenter", "layout": "LAYOUT_RECORD_CENTER", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index b248fccdb..2c0ae4315 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCK_TUNNEL_1F", "name": "RockTunnel_1F", "layout": "LAYOUT_ROCK_TUNNEL_1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index c1b86c78f..186cd6336 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCK_TUNNEL_B1F", "name": "RockTunnel_B1F", "layout": "LAYOUT_ROCK_TUNNEL_B1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_ROCK_TUNNEL", "requires_flash": true, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 47c8f7b08..54cf4bdef 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B1F", "name": "RocketHideout_B1F", "layout": "LAYOUT_ROCKET_HIDEOUT_B1F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index 6149ac0c2..efc2c17a2 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -38,7 +38,7 @@ RocketHideout_B1F_EventScript_Grunt5:: @ 816120A RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225 call RocketHideout_B1F_EventScript_RemoveBarrier - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse release diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index 88d13e88a..9cdb75e2a 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B2F", "name": "RocketHideout_B2F", "layout": "LAYOUT_ROCKET_HIDEOUT_B2F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 0127e1f5d..5ab261edf 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B3F", "name": "RocketHideout_B3F", "layout": "LAYOUT_ROCKET_HIDEOUT_B3F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index cce2d5ebf..0e55fb111 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_B4F", "name": "RocketHideout_B4F", "layout": "LAYOUT_ROCKET_HIDEOUT_B4F", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 5919b342f..820325485 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -26,7 +26,7 @@ RocketHideout_B4F_EventScript_Giovanni:: @ 8161317 famechecker FAMECHECKER_GIOVANNI, 0 message RocketHideout_B4F_Text_GiovanniIntro waitmessage - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 waitbuttonpress trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, RocketHideout_B4F_Text_GiovanniDefeat msgbox RocketHideout_B4F_Text_GiovanniPostBattle @@ -108,7 +108,7 @@ RocketHideout_B4F_EventScript_DefeatedGrunt3:: @ 8161433 end RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462 - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse return diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json index 746d61db2..71a762a19 100644 --- a/data/maps/RocketHideout_Elevator/map.json +++ b/data/maps/RocketHideout_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROCKET_HIDEOUT_ELEVATOR", "name": "RocketHideout_Elevator", "layout": "LAYOUT_ROCKET_HIDEOUT_ELEVATOR", - "music": "MUS_AJITO", + "music": "MUS_ROCKET_HIDEOUT", "region_map_section": "MAPSEC_ROCKET_HIDEOUT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index e0d5f8b73..96878b73b 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE1", "name": "Route1", "layout": "LAYOUT_ROUTE1", - "music": "MUS_LOAD01", + "music": "MUS_ROUTE1", "region_map_section": "MAPSEC_ROUTE_1", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index aaea71eaf..8004f3626 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -11,7 +11,7 @@ Route1_EventScript_MartClerk:: @ 8167EFE compare VAR_RESULT, FALSE goto_if_eq EventScript_BagIsFull getitemname 1, ITEM_POTION - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_ObtainedTheX waitmessage waitfanfare diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 748ec3d2a..9c82434fb 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE10", "name": "Route10", "layout": "LAYOUT_ROUTE10", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index dc4978cc6..b8c0aa7ed 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE10_POKEMON_CENTER_1F", "name": "Route10_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index 33dcdb91b..665f25678 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE10_POKEMON_CENTER_2F", "name": "Route10_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_ROUTE_10", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index 37d3efa5d..c948dcfc4 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE11", "name": "Route11", "layout": "LAYOUT_ROUTE11", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index e404237d0..4063642d2 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE11_EAST_ENTRANCE_1F", "name": "Route11_EastEntrance_1F", "layout": "LAYOUT_ENTRANCE_1F", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index e085ea030..ae37f03ea 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE11_EAST_ENTRANCE_2F", "name": "Route11_EastEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_ROUTE_11", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index fefbe4f9c..49f08179c 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12", "name": "Route12", "layout": "LAYOUT_ROUTE12", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index a2546ccc6..1ae854e05 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12_FISHING_HOUSE", "name": "Route12_FishingHouse", "layout": "LAYOUT_HOUSE4", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index a5314bb34..552880a86 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12_NORTH_ENTRANCE_1F", "name": "Route12_NorthEntrance_1F", "layout": "LAYOUT_ROUTE12_NORTH_ENTRANCE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 95dc0469c..192b2f407 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE12_NORTH_ENTRANCE_2F", "name": "Route12_NorthEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_12", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 01c83ca04..d22b8fe8b 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE13", "name": "Route13", "layout": "LAYOUT_ROUTE13", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_13", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 2f6d7cd79..212b190b0 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE14", "name": "Route14", "layout": "LAYOUT_ROUTE14", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_14", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index fee9bd531..df6d62329 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE15", "name": "Route15", "layout": "LAYOUT_ROUTE15", - "music": "MUS_LOAD03", + "music": "MUS_ROUTE11", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index a48784931..1317b92f8 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE15_WEST_ENTRANCE_1F", "name": "Route15_WestEntrance_1F", "layout": "LAYOUT_ENTRANCE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index f91635160..1bba0494e 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE15_WEST_ENTRANCE_2F", "name": "Route15_WestEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_15", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 8cc2f36e2..3b63483b2 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16", "name": "Route16", "layout": "LAYOUT_ROUTE16", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index 875a14cef..f8bd335b3 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16_HOUSE", "name": "Route16_House", "layout": "LAYOUT_HOUSE1", - "music": "MUS_TAMAMUSI", + "music": "MUS_CELADON", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 2eb8919d0..d79f1d50b 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16_NORTH_ENTRANCE_1F", "name": "Route16_NorthEntrance_1F", "layout": "LAYOUT_ROUTE16_NORTH_ENTRANCE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index 00562e86d..bf37d4ab4 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE16_NORTH_ENTRANCE_2F", "name": "Route16_NorthEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_16", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 3af5c7379..7218a151b 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE17", "name": "Route17", "layout": "LAYOUT_ROUTE17", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_17", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 339e931b5..28e35b7a3 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE18", "name": "Route18", "layout": "LAYOUT_ROUTE18", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 370a52737..0cd6eaa19 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE18_EAST_ENTRANCE_1F", "name": "Route18_EastEntrance_1F", "layout": "LAYOUT_ENTRANCE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 04642eddf..80b9973f6 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE18_EAST_ENTRANCE_2F", "name": "Route18_EastEntrance_2F", "layout": "LAYOUT_ENTRANCE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_18", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index fbd12ad37..5fc1f6821 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE19", "name": "Route19", "layout": "LAYOUT_ROUTE19", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index 6f9ae1327..6ad6a8e57 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2", "name": "Route2", "layout": "LAYOUT_ROUTE2", - "music": "MUS_LOAD01", + "music": "MUS_ROUTE1", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index cb92a2361..0f606647d 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE20", "name": "Route20", "layout": "LAYOUT_ROUTE20", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_20", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index b651f0c16..33d256f6e 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE21_NORTH", "name": "Route21_North", "layout": "LAYOUT_ROUTE21_NORTH", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index 21cf0b51b..f5e648729 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE21_SOUTH", "name": "Route21_South", "layout": "LAYOUT_ROUTE21_SOUTH", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_21", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 00ac3625a..a00677beb 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE22", "name": "Route22", "layout": "LAYOUT_ROUTE22", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index dbc10e129..177269724 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -23,7 +23,7 @@ Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB Route22_EventScript_EarlyRival:: @ 81682BE textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 addobject 1 compare VAR_TEMP_1, 0 call_if_eq Route22_EventScript_EarlyRivalApproach @@ -42,7 +42,7 @@ Route22_EventScript_EarlyRival:: @ 81682BE msgbox Route22_Text_EarlyRivalPostBattle closemessage delay 10 - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq Route22_EventScript_EarlyRivalExit compare VAR_TEMP_1, 1 @@ -183,7 +183,7 @@ Route22_EventScript_LateRivalTriggerBottom:: @ 816840C Route22_EventScript_LateRival:: @ 816841F textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 addobject 1 compare VAR_TEMP_1, 0 call_if_eq Route22_EventScript_LateRivalApproach @@ -202,7 +202,7 @@ Route22_EventScript_LateRival:: @ 816841F msgbox Route22_Text_LateRivalPostBattle closemessage delay 10 - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 applymovement 1, Route22_Movement_LateRivalExit waitmovement 0 fadedefaultbgm diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 23de05134..7367db717 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE22_NORTH_ENTRANCE", "name": "Route22_NorthEntrance", "layout": "LAYOUT_ROUTE22_NORTH_ENTRANCE", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_ROUTE_22", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index 3f2de59e9..01889aff9 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE23", "name": "Route23", "layout": "LAYOUT_ROUTE23", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 0cd897e8c..d3e00bab0 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE24", "name": "Route24", "layout": "LAYOUT_ROUTE24", - "music": "MUS_OPENING", + "music": "MUS_ROUTE24", "region_map_section": "MAPSEC_ROUTE_24", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index 7a22f64e8..abaa43b47 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -58,7 +58,7 @@ Route24_EventScript_BattleRocket:: @ 81686B9 giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET message Route24_Text_JoinTeamRocket waitmessage - playbgm MUS_ROCKET, 0 + playbgm MUS_ENCOUNTER_ROCKET, 0 waitbuttonpress setvar VAR_LAST_TALKED, LOCALID_ROCKET trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_6, Route24_Text_RocketDefeat diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index c716acec5..8f93b33a7 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE25", "name": "Route25", "layout": "LAYOUT_ROUTE25", - "music": "MUS_OPENING", + "music": "MUS_ROUTE24", "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index 6a10da883..60a490867 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE25_SEA_COTTAGE", "name": "Route25_SeaCottage", "layout": "LAYOUT_ROUTE25_SEA_COTTAGE", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_ROUTE_25", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 688cdc41d..517195dfb 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -64,7 +64,7 @@ Route25_SeaCottage_EventScript_BillAskForHelp:: @ 817059C applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillEnterTeleporter waitmovement 0 removeobject LOCALID_BILL_CLEFAIRY - playse SE_C_MAKU_D + playse SE_CONTEST_CURTAIN_FALL closedoor 10, 3 waitdooranim setflag BILL_IN_TELEPORTER @@ -113,7 +113,7 @@ Route25_SeaCottage_EventScript_BillGiveSSTicket:: @ 817064A checkitemspace ITEM_SS_TICKET, 1 compare VAR_RESULT, FALSE goto_if_eq Route25_SeaCottage_EventScript_NoRoomForSSTicket - giveitem_msg Route25_SeaCottage_Text_ReceivedSSTicketFromBill, ITEM_SS_TICKET, 1, MUS_FAN5 + giveitem_msg Route25_SeaCottage_Text_ReceivedSSTicketFromBill, ITEM_SS_TICKET, 1, MUS_OBTAIN_KEY_ITEM setflag FLAG_GOT_SS_TICKET_DUP setflag FLAG_HIDE_NUGGET_BRIDGE_ROCKET setflag FLAG_GOT_SS_TICKET @@ -188,7 +188,7 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE setvar VAR_0x8004, 1 special AnimateTeleporterHousing - playse SE_TK_WARPIN + playse SE_WARP_IN special AnimateTeleporterCable waitse call Route25_SeaCottage_EventScript_PlayTeleporterBeepSE @@ -202,13 +202,13 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA addobject LOCALID_BILL_HUMAN clearflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE delay 50 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillExitTeleporter waitmovement 0 waitfanfare applymovement OBJ_EVENT_ID_CAMERA, Route25_SeaCottage_Movement_CameraPanBackFromTeleporters waitmovement 0 - playse SE_C_MAKU_D + playse SE_CONTEST_CURTAIN_FALL closedoor 3, 3 waitdooranim applymovement LOCALID_BILL_HUMAN, Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom @@ -218,7 +218,7 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA end Route25_SeaCottage_EventScript_PlayTeleporterBeepSE:: @ 81707B6 - playse SE_BOWA + playse SE_BALL waitse delay 20 return diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index 20be5345d..f7997cb0b 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_EAST_BUILDING", "name": "Route2_EastBuilding", "layout": "LAYOUT_ROUTE2_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 900ad5ba1..39c841dd3 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_HOUSE", "name": "Route2_House", "layout": "LAYOUT_HOUSE2", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index dbd7c734a..c6cc23713 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_VIRIDIAN_FOREST_NORTH_ENTRANCE", "name": "Route2_ViridianForest_NorthEntrance", "layout": "LAYOUT_ROUTE2_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 2590d03f2..fbe4c75e0 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE2_VIRIDIAN_FOREST_SOUTH_ENTRANCE", "name": "Route2_ViridianForest_SouthEntrance", "layout": "LAYOUT_ROUTE2_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 1051a4794..f310180b7 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE3", "name": "Route3", "layout": "LAYOUT_ROUTE3", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_3", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 2fa4ea4df..a588a2cd1 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE4", "name": "Route4", "layout": "LAYOUT_ROUTE4", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 7b2f02a45..b62ee3fbe 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE4_POKEMON_CENTER_1F", "name": "Route4_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index 420e18d1a..d09fd1b3b 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -109,7 +109,7 @@ Route4_PokemonCenter_1F_EventScript_BoughtMagikarp:: @ 816F86A Route4_PokemonCenter_1F_EventScript_PayForMagikarp:: @ 816F86F removemoney MAGIKARP_PRICE, 0 updatemoneybox 0, 0, 0 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp waitmessage waitfanfare diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index b83288910..b70232abd 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE4_POKEMON_CENTER_2F", "name": "Route4_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_ROUTE_4", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index a178efdc2..85b0e75a2 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE5", "name": "Route5", "layout": "LAYOUT_ROUTE5", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index 321f24a10..fa866f235 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE5_POKEMON_DAY_CARE", "name": "Route5_PokemonDayCare", "layout": "LAYOUT_ROUTE5_POKEMON_DAY_CARE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 6562e44d3..9d40775e8 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE5_SOUTH_ENTRANCE", "name": "Route5_SouthEntrance", "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_5", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index 0b044b364..47c69f5c5 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE6", "name": "Route6", "layout": "LAYOUT_ROUTE6", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index 3082859ec..287d13d1c 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE6_NORTH_ENTRANCE", "name": "Route6_NorthEntrance", "layout": "LAYOUT_SAFFRON_CITY_NORTH_SOUTH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index 5a18cd689..922a44476 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE7", "name": "Route7", "layout": "LAYOUT_ROUTE7", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index 2c990925b..b05ab81e7 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE7_EAST_ENTRANCE", "name": "Route7_EastEntrance", "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_7", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index e99df258f..7f0b2e8c4 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE8", "name": "Route8", "layout": "LAYOUT_ROUTE8", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 043b603c2..d759be75e 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE8_WEST_ENTRANCE", "name": "Route8_WestEntrance", "layout": "LAYOUT_SAFFRON_CITY_EAST_WEST_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_ROUTE_8", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index 27e91cab7..b733f7a21 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -2,7 +2,7 @@ "id": "MAP_ROUTE9", "name": "Route9", "layout": "LAYOUT_ROUTE9", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_9", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index 5d4049473..fe30bc49f 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_CORRIDOR", "name": "SSAnne_1F_Corridor", "layout": "LAYOUT_SSANNE_1F_CORRIDOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index a2e30ae70..47fa01a0c 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM1", "name": "SSAnne_1F_Room1", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 89b501da4..0f93495b2 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM2", "name": "SSAnne_1F_Room2", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index 639bbcd72..7eec1735f 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM3", "name": "SSAnne_1F_Room3", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index abdde83cd..8a932c9c9 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM4", "name": "SSAnne_1F_Room4", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index 7b6c778c4..6a3a6e6b0 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM5", "name": "SSAnne_1F_Room5", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 2db3bf143..2a504adce 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM6", "name": "SSAnne_1F_Room6", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index ca483216c..91746ee78 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_1F_ROOM7", "name": "SSAnne_1F_Room7", "layout": "LAYOUT_SSANNE_ROOM1", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index 36afea939..f23f839ee 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_CORRIDOR", "name": "SSAnne_2F_Corridor", "layout": "LAYOUT_SSANNE_2F_CORRIDOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index ed0ddd056..be6042ea9 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -21,9 +21,9 @@ SSAnne_2F_Corridor_EventScript_RivalTriggerRight:: @ 81608F7 SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903 textcolor 0 - playse SE_KAIDAN + playse SE_EXIT delay 5 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 addobject 1 delay 10 applymovement 1, Movement_WalkInPlaceFastestDown @@ -46,7 +46,7 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903 msgbox SSAnne_2F_Corridor_Text_RivalPostBattle closemessage delay 10 - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq SSAnne_2F_Corridor_EventScript_RivalExitLeft compare VAR_TEMP_1, 1 diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index 62636dfde..cfd1b60be 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM1", "name": "SSAnne_2F_Room1", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index c6cd86baa..2e12441b4 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM2", "name": "SSAnne_2F_Room2", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index 0132db9eb..5d8ff0753 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM3", "name": "SSAnne_2F_Room3", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index a84f46733..157f29bf3 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM4", "name": "SSAnne_2F_Room4", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index f6dde1406..7c3e77e1e 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM5", "name": "SSAnne_2F_Room5", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 9b90147aa..a57b2e30d 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_2F_ROOM6", "name": "SSAnne_2F_Room6", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index ce7578a4f..9c2079431 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_3F_CORRIDOR", "name": "SSAnne_3F_Corridor", "layout": "LAYOUT_SSANNE_3F_CORRIDOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Corridor/map.json b/data/maps/SSAnne_B1F_Corridor/map.json index 86fe58592..4e0ad1134 100644 --- a/data/maps/SSAnne_B1F_Corridor/map.json +++ b/data/maps/SSAnne_B1F_Corridor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_CORRIDOR", "name": "SSAnne_B1F_Corridor", "layout": "LAYOUT_SSANNE_B1F_CORRIDOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index ca979f0dd..cf7bf15ec 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM1", "name": "SSAnne_B1F_Room1", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index d2236e480..cd01d82b8 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM2", "name": "SSAnne_B1F_Room2", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index 6aed9ce58..2dbef096c 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM3", "name": "SSAnne_B1F_Room3", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index ba41cb495..68a1ecf65 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM4", "name": "SSAnne_B1F_Room4", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index bb54b7090..ee81b03b4 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_B1F_ROOM5", "name": "SSAnne_B1F_Room5", "layout": "LAYOUT_SSANNE_ROOM2", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index d0af547d9..ffd6cc1ec 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_CAPTAINS_OFFICE", "name": "SSAnne_CaptainsOffice", "layout": "LAYOUT_SSANNE_CAPTAINS_OFFICE", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 3ccd4fa51..8b89783e9 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -8,14 +8,14 @@ SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A textcolor 3 message SSAnne_CaptainsOffice_Text_RubbedCaptainsBack waitmessage - playfanfare MUS_ME_ASA + playfanfare MUS_HEAL waitfanfare call EventScript_RestorePrevTextColor delay 50 applymovement 1, Movement_FacePlayer waitmovement 0 msgbox SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut - giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_FAN5 + giveitem_msg SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain, ITEM_HM01, 1, MUS_OBTAIN_KEY_ITEM msgbox SSAnne_CaptainsOffice_Text_ExplainCut setflag FLAG_GOT_HM01 setvar VAR_MAP_SCENE_VERMILION_CITY, 1 diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index b121ed6b1..2f74b00ec 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_DECK", "name": "SSAnne_Deck", "layout": "LAYOUT_SSANNE_DECK", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index c125abd59..000138ce8 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_EXTERIOR", "name": "SSAnne_Exterior", "layout": "LAYOUT_SSANNE_EXTERIOR", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index 84a267ac8..3596ab81d 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -18,7 +18,7 @@ SSAnne_Exterior_ExitSSAnne:: @ 8160859 call_if_le SSAnne_Exterior_WalkDown compare VAR_0x8005, 7 call_if_ge SSAnne_Exterior_WalkInPlaceDown - fadenewbgm MUS_NAMINORI + fadenewbgm MUS_SURF delay 50 special DoSSAnneDepartureCutscene waitstate diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 951ab2b00..2470b482a 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -2,7 +2,7 @@ "id": "MAP_SSANNE_KITCHEN", "name": "SSAnne_Kitchen", "layout": "LAYOUT_SSANNE_KITCHEN", - "music": "MUS_SANTOAN", + "music": "MUS_SS_ANNE", "region_map_section": "MAPSEC_S_S_ANNE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 7192fd254..19231b544 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_CENTER", "name": "SafariZone_Center", "layout": "LAYOUT_SAFARI_ZONE_CENTER", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_Center_RestHouse/map.json b/data/maps/SafariZone_Center_RestHouse/map.json index 0d5a1430a..9a6211cd5 100644 --- a/data/maps/SafariZone_Center_RestHouse/map.json +++ b/data/maps/SafariZone_Center_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_CENTER_REST_HOUSE", "name": "SafariZone_Center_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index c9a1120e6..aabf6edc8 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_EAST", "name": "SafariZone_East", "layout": "LAYOUT_SAFARI_ZONE_EAST", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_East_RestHouse/map.json b/data/maps/SafariZone_East_RestHouse/map.json index 20b7a79c4..136eeb85d 100644 --- a/data/maps/SafariZone_East_RestHouse/map.json +++ b/data/maps/SafariZone_East_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_EAST_REST_HOUSE", "name": "SafariZone_East_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 9df7f64b0..9611e34fa 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTH", "name": "SafariZone_North", "layout": "LAYOUT_SAFARI_ZONE_NORTH", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_North_RestHouse/map.json b/data/maps/SafariZone_North_RestHouse/map.json index 04e70e66f..7e2f211cd 100644 --- a/data/maps/SafariZone_North_RestHouse/map.json +++ b/data/maps/SafariZone_North_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_NORTH_REST_HOUSE", "name": "SafariZone_North_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index cc0eea7df..87cd7742d 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_SECRET_HOUSE", "name": "SafariZone_SecretHouse", "layout": "LAYOUT_SAFARI_ZONE_SECRET_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index 5ccffac5d..239f7caef 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_WEST", "name": "SafariZone_West", "layout": "LAYOUT_SAFARI_ZONE_WEST", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SafariZone_West_RestHouse/map.json b/data/maps/SafariZone_West_RestHouse/map.json index 57a43a1a2..0716b11b6 100644 --- a/data/maps/SafariZone_West_RestHouse/map.json +++ b/data/maps/SafariZone_West_RestHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFARI_ZONE_WEST_REST_HOUSE", "name": "SafariZone_West_RestHouse", "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", - "music": "MUS_SHINKA", + "music": "MUS_EVOLUTION", "region_map_section": "MAPSEC_KANTO_SAFARI_ZONE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index 352f9aca5..d2a1b424e 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY", "name": "SaffronCity", "layout": "LAYOUT_SAFFRON_CITY", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SaffronCity_Connection/map.json b/data/maps/SaffronCity_Connection/map.json index 30bcffa06..fe14ef88f 100644 --- a/data/maps/SaffronCity_Connection/map.json +++ b/data/maps/SaffronCity_Connection/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_CONNECTION", "name": "SaffronCity_Connection", "layout": "LAYOUT_SAFFRON_CITY_CONNECTION", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json index 0dc8af3e4..a53910775 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F", "name": "SaffronCity_CopycatsHouse_1F", "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json index a9a3cdd59..d281922d1 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/map.json +++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F", "name": "SaffronCity_CopycatsHouse_2F", "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index bac95d5bc..34a64c7c4 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_DOJO", "name": "SaffronCity_Dojo", "layout": "LAYOUT_SAFFRON_CITY_DOJO", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 1dd8b31e1..7e08d5684 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -73,7 +73,7 @@ SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82 SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5 removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster waitmessage waitfanfare @@ -89,7 +89,7 @@ SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5 SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster waitmessage waitfanfare diff --git a/data/maps/SaffronCity_Gym/text.inc b/data/maps/SaffronCity_Gym/text.inc index 827d4bbd5..349c86423 100644 --- a/data/maps/SaffronCity_Gym/text.inc +++ b/data/maps/SaffronCity_Gym/text.inc @@ -5,7 +5,7 @@ SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C .string "It started when a spoon I\n" .string "carelessly tossed, bent.\p" .string "I dislike battling, but if you wish,\n" - .string "I will show you my powers!{PLAY_BGM}{MUS_EXEYE}$" + .string "I will show you my powers!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602 .string "This loss shocks me!\n" diff --git a/data/maps/SaffronCity_House/map.json b/data/maps/SaffronCity_House/map.json index 32b191884..d1232cadb 100644 --- a/data/maps/SaffronCity_House/map.json +++ b/data/maps/SaffronCity_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_HOUSE", "name": "SaffronCity_House", "layout": "LAYOUT_HOUSE5", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index 7b1b3b527..451ee31d9 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_MART", "name": "SaffronCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_MrPsychicsHouse/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json index 29460d55e..6e9a5508d 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/map.json +++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE", "name": "SaffronCity_MrPsychicsHouse", "layout": "LAYOUT_HOUSE5", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index f4861adb1..3bf36c736 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_1F", "name": "SaffronCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index 7ed2f6050..71c05de46 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_POKEMON_CENTER_2F", "name": "SaffronCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index 92c3b8437..dc9f24d6d 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", "name": "SaffronCity_PokemonTrainerFanClub", "layout": "LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_SAFFRON_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index bffaf7eca..b85000671 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_1F", "name": "SeafoamIslands_1F", "layout": "LAYOUT_SEAFOAM_ISLANDS_1F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index 1170cd572..014da39a1 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B1F", "name": "SeafoamIslands_B1F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B1F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index 0e76f6b7e..5d770655f 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B2F", "name": "SeafoamIslands_B2F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B2F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index 1cb129adb..21f25cfba 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B3F", "name": "SeafoamIslands_B3F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B3F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 1ce555258..44c4268c8 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEAFOAM_ISLANDS_B4F", "name": "SeafoamIslands_B4F", "layout": "LAYOUT_SEAFOAM_ISLANDS_B4F", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_SEAFOAM_ISLANDS", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 306a70562..9970bde9c 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -169,7 +169,7 @@ SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC waitmessage waitmoncry delay 10 - playbgm MUS_EXEYE, 0 + playbgm MUS_ENCOUNTER_GYM_LEADER, 0 waitbuttonpress setflag FLAG_SYS_SPECIAL_WILD_BATTLE special StartLegendaryBattle diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index 7b0b3a72d..08494194a 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND", "name": "SevenIsland", "layout": "LAYOUT_SEVEN_ISLAND", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index b71cf72bd..3e11a65ca 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_HARBOR", "name": "SevenIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 09550738c..d1dc104c8 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM1", "name": "SevenIsland_House_Room1", "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 4fc512e42..93b0a3a6e 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_HOUSE_ROOM2", "name": "SevenIsland_House_Room2", "layout": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index cf1f24cfe..a74ef6c45 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_MART", "name": "SevenIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index e3f534260..a73cb405b 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_1F", "name": "SevenIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index 65166b9ac..f7d97b3ca 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_POKEMON_CENTER_2F", "name": "SevenIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index 4b3f98695..824d75723 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON", "name": "SevenIsland_SevaultCanyon", "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index b0185700e..58c07698e 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", "name": "SevenIsland_SevaultCanyon_Entrance", "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_ENTRANCE", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_CANYON_ENTRANCE", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index f0c537add..f697cb790 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_HOUSE", "name": "SevenIsland_SevaultCanyon_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVAULT_CANYON", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 0c12e9362..eff2b5c82 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -4,7 +4,7 @@ SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183 lock goto_if_set FLAG_TEMP_2, SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced - playbgm MUS_P_SCHOOL, 0 + playbgm MUS_SCHOOL, 0 applymovement 1, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance waitmovement 0 fadedefaultbgm @@ -22,7 +22,7 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183 compare VAR_FACING, DIR_SOUTH call_if_ne SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown delay 30 - playbgm MUS_P_SCHOOL, 0 + playbgm MUS_SCHOOL, 0 applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance waitmovement 0 fadedefaultbgm diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index 183af5fb2..e8f0d9181 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", "name": "SevenIsland_SevaultCanyon_TanobyKey", "layout": "LAYOUT_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_TANOBY_KEY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 54efea505..6f973074b 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -106,7 +106,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: @ 8164F0B SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E addvar NUM_SWITCHES_PRESSED, 1 - playse SE_TRACK_MOVE + playse SE_TRUCK_MOVE setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 setvar VAR_0x8006, 8 @@ -128,7 +128,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164 setvar VAR_0x8007, 2 special ShakeScreen delay 60 - playse SE_FU_ZUZUZU + playse SE_LAVARIDGE_FALL_WARP waitse return diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index b9493d2c5..31455ac19 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS", "name": "SevenIsland_TanobyRuins", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_TANOBY_RUINS", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json index 6e8b55f18..f51307ed0 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", "name": "SevenIsland_TanobyRuins_DilfordChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_DILFORD_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DILFORD_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json index 36ae546ee..5786a9f73 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", "name": "SevenIsland_TanobyRuins_LiptooChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_LIPTOO_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_LIPTOO_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json index e7fc05f59..efb2dc13c 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", "name": "SevenIsland_TanobyRuins_MoneanChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_MONEAN_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json index c974e67a5..e0a656acf 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", "name": "SevenIsland_TanobyRuins_RixyChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_RIXY_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_RIXY_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json index 0a604bfdd..266b18579 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", "name": "SevenIsland_TanobyRuins_ScufibChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_SCUFIB_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_SCUFIB_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json index c201caaf8..a1cd61249 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", "name": "SevenIsland_TanobyRuins_ViapoisChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_VIAPOIS_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_VIAPOIS_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json index e85de29ad..b9e11db9b 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", "name": "SevenIsland_TanobyRuins_WeepthChamber", "layout": "LAYOUT_SEVEN_ISLAND_TANOBY_RUINS_WEEPTH_CHAMBER", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_WEEPTH_CHAMBER", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index ded18057f..d6be87d75 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -2,7 +2,7 @@ "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER", "name": "SevenIsland_TrainerTower", "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_TRAINER_TOWER", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index ac20284fc..b867283ab 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_10F", "name": "SilphCo_10F", "layout": "LAYOUT_SILPH_CO_10F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 33c454f88..07479d1d8 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_11F", "name": "SilphCo_11F", "layout": "LAYOUT_SILPH_CO_11F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 38de05842..eceaad4be 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -18,7 +18,7 @@ SilphCo_11F_EventScript_President:: @ 8161DFE checkitemspace ITEM_MASTER_BALL, 1 compare VAR_RESULT, FALSE goto_if_eq SilphCo_11F_EventScript_NoRoomForMasterBall - giveitem_msg SilphCo_11F_Text_ObtainedMasterBallFromPresident, ITEM_MASTER_BALL, 1, MUS_FAN5 + giveitem_msg SilphCo_11F_Text_ObtainedMasterBallFromPresident, ITEM_MASTER_BALL, 1, MUS_OBTAIN_KEY_ITEM msgbox SilphCo_11F_Text_ThatsOurSecretPrototype setflag FLAG_GOT_MASTER_BALL_FROM_SILPH release diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index c2a26235a..aba93eb0a 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_1F", "name": "SilphCo_1F", "layout": "LAYOUT_SILPH_CO_1F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index f5aab3042..55b2da754 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_2F", "name": "SilphCo_2F", "layout": "LAYOUT_SILPH_CO_2F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index 46b1381c8..b8617c70b 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_3F", "name": "SilphCo_3F", "layout": "LAYOUT_SILPH_CO_3F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index bb1db0507..e02b30912 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_4F", "name": "SilphCo_4F", "layout": "LAYOUT_SILPH_CO_4F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 960fe8ef6..6fcc56f08 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_5F", "name": "SilphCo_5F", "layout": "LAYOUT_SILPH_CO_5F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index 35ec915ad..ca17ad516 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_6F", "name": "SilphCo_6F", "layout": "LAYOUT_SILPH_CO_6F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index 2857c0a7a..2257544b7 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_7F", "name": "SilphCo_7F", "layout": "LAYOUT_SILPH_CO_7F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index 0bfac0151..c43c8bad1 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -32,7 +32,7 @@ SilphCo_7F_EventScript_RivalTriggerBottom:: @ 81619C8 SilphCo_7F_EventScript_RivalScene:: @ 81619D4 textcolor 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement 1, Movement_ExclamationMark waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown @@ -53,12 +53,12 @@ SilphCo_7F_EventScript_RivalScene:: @ 81619D4 call_if_eq SilphCo_7F_EventScript_RivalCharmander msgbox SilphCo_7F_Text_RivalPostBattle closemessage - playbgm MUS_RIVAL2, 0 + playbgm MUS_RIVAL_EXIT, 0 compare VAR_TEMP_1, 0 call_if_eq SilphCo_7F_EventScript_RivalExitTop compare VAR_TEMP_1, 1 call_if_eq SilphCo_7F_EventScript_RivalExitBottom - playse SE_TK_WARPIN + playse SE_WARP_IN fadedefaultbgm removeobject 1 waitse @@ -138,7 +138,7 @@ SilphCo_7F_EventScript_LaprasGuy:: @ 8161AC8 SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SilphCo_7F_Text_ObtainedLaprasFromEmployee waitmessage waitfanfare @@ -153,7 +153,7 @@ SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12 SilphCo_7F_EventScript_ReceiveLaprasPC:: @ 8161B45 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message SilphCo_7F_Text_ObtainedLaprasFromEmployee waitmessage waitfanfare diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 7f83591ca..ed2d8dd32 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_8F", "name": "SilphCo_8F", "layout": "LAYOUT_SILPH_CO_8F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index e164a4596..a5cb18329 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_9F", "name": "SilphCo_9F", "layout": "LAYOUT_SILPH_CO_9F", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json index 491ca323c..95e2bdfcd 100644 --- a/data/maps/SilphCo_Elevator/map.json +++ b/data/maps/SilphCo_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_SILPH_CO_ELEVATOR", "name": "SilphCo_Elevator", "layout": "LAYOUT_SILPH_CO_ELEVATOR", - "music": "MUS_SHIRUHU", + "music": "MUS_SILPH", "region_map_section": "MAPSEC_SILPH_CO", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 6156df736..89d0c6eff 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND", "name": "SixIsland", "layout": "LAYOUT_SIX_ISLAND", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_AlteringCave/map.json b/data/maps/SixIsland_AlteringCave/map.json index 124496895..b6447b1b2 100644 --- a/data/maps/SixIsland_AlteringCave/map.json +++ b/data/maps/SixIsland_AlteringCave/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_ALTERING_CAVE", "name": "SixIsland_AlteringCave", "layout": "LAYOUT_SIX_ISLAND_ALTERING_CAVE", - "music": "MUS_NANADUNGEON", + "music": "MUS_SEVII_CAVE", "region_map_section": "MAPSEC_ALTERING_CAVE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_1F/map.json b/data/maps/SixIsland_DottedHole_1F/map.json index f581ee319..802d67e26 100644 --- a/data/maps/SixIsland_DottedHole_1F/map.json +++ b/data/maps/SixIsland_DottedHole_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_1F", "name": "SixIsland_DottedHole_1F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_1F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json index 1fcfc933d..7522ff81c 100644 --- a/data/maps/SixIsland_DottedHole_B1F/map.json +++ b/data/maps/SixIsland_DottedHole_B1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B1F", "name": "SixIsland_DottedHole_B1F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B1F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json index 8458d04be..e45898a49 100644 --- a/data/maps/SixIsland_DottedHole_B2F/map.json +++ b/data/maps/SixIsland_DottedHole_B2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B2F", "name": "SixIsland_DottedHole_B2F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B2F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json index 154c12c9e..5c871db50 100644 --- a/data/maps/SixIsland_DottedHole_B3F/map.json +++ b/data/maps/SixIsland_DottedHole_B3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B3F", "name": "SixIsland_DottedHole_B3F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B3F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json index 92633086e..108aa3cce 100644 --- a/data/maps/SixIsland_DottedHole_B4F/map.json +++ b/data/maps/SixIsland_DottedHole_B4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_B4F", "name": "SixIsland_DottedHole_B4F", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_B4F", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index a6b91e4d6..9909f8a4a 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", "name": "SixIsland_DottedHole_SapphireRoom", "layout": "LAYOUT_SIX_ISLAND_DOTTED_HOLE_SAPPHIRE_ROOM", - "music": "MUS_NANAISEKI", + "music": "MUS_SEVII_DUNGEON", "region_map_section": "MAPSEC_DOTTED_HOLE", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index e0d558ae0..4792179ec 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -8,17 +8,17 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5 lock faceplayer textcolor 3 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM message SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire waitmessage waitfanfare closemessage setobjectxyperm LOCALID_THIEF, 5, 0 addobject LOCALID_THIEF - playse SE_RU_HYUU + playse SE_FALL applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn waitmovement 0 - playse SE_W070 + playse SE_M_STRENGTH compare VAR_FACING, DIR_NORTH call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft compare VAR_FACING, DIR_SOUTH @@ -71,7 +71,7 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5 call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast compare VAR_FACING, DIR_WEST call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest - playse SE_KAIDAN + playse SE_EXIT delay 35 removeobject LOCALID_THIEF setflag FLAG_LEARNED_YES_NAH_CHANSEY diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index 6a8499ab0..30ca97e51 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_GREEN_PATH", "name": "SixIsland_GreenPath", "layout": "LAYOUT_SIX_ISLAND_GREEN_PATH", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_GREEN_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index 598de86e0..ce3ba9b04 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_HARBOR", "name": "SixIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index ddb6de1c9..682351b4c 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_HOUSE", "name": "SixIsland_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index 015822d63..7201f0851 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_MART", "name": "SixIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index c81781c12..1c353c29b 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_OUTCAST_ISLAND", "name": "SixIsland_OutcastIsland", "layout": "LAYOUT_SIX_ISLAND_OUTCAST_ISLAND", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_OUTCAST_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 1546d370e..37c0cca48 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_PATTERN_BUSH", "name": "SixIsland_PatternBush", "layout": "LAYOUT_SIX_ISLAND_PATTERN_BUSH", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_PATTERN_BUSH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index 24e873369..4ddf8f3b5 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_POKEMON_CENTER_1F", "name": "SixIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index 72134595e..ff8f2c4e7 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -25,7 +25,7 @@ SixIsland_PokemonCenter_1F_EventScript_RivalScene:: @ 8171D97 textcolor 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown waitmovement 0 - playbgm MUS_RIVAL1, 0 + playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark waitmovement 0 applymovement LOCALID_RIVAL, Movement_Delay48 @@ -39,7 +39,7 @@ SixIsland_PokemonCenter_1F_EventScript_RivalScene:: @ 8171D97 applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit waitmovement 0 fadedefaultbgm - playse SE_KAIDAN + playse SE_EXIT delay 35 removeobject LOCALID_RIVAL setvar VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 1 diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index 8db84cb02..6fa988e71 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_POKEMON_CENTER_2F", "name": "SixIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SIX_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index e24853081..1233ea32a 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_RUIN_VALLEY", "name": "SixIsland_RuinValley", "layout": "LAYOUT_SIX_ISLAND_RUIN_VALLEY", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_RUIN_VALLEY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index acacd4d97..952fd541e 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_WATER_PATH", "name": "SixIsland_WaterPath", "layout": "LAYOUT_SIX_ISLAND_WATER_PATH", - "music": "MUS_NANASHIMA", + "music": "MUS_SEVII_ROUTE", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index 32fd57521..88e50542f 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE1", "name": "SixIsland_WaterPath_House1", "layout": "LAYOUT_HOUSE4", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index b853b622e..fe1e53c65 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_SIX_ISLAND_WATER_PATH_HOUSE2", "name": "SixIsland_WaterPath_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_WATER_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index db9fe9ef4..b760e50b2 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND", "name": "ThreeIsland", "layout": "LAYOUT_THREE_ISLAND", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 484d8dba0..303fd046e 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -230,7 +230,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 waitmovement 0 applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerApproach waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_WannaMakeSomethingOfYourStaring, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq ThreeIsland_EventScript_LeaveBikersAlone @@ -243,7 +243,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 closemessage applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerApproach waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_Biker2Intro setvar VAR_LAST_TALKED, LOCALID_BIKER2 trainerbattle_no_intro TRAINER_BIKER_GOON_2, ThreeIsland_Text_Biker2Defeat @@ -253,7 +253,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 closemessage applymovement LOCALID_BIKER3, ThreeIsland_Movement_BikerApproach waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_Biker3Intro setvar VAR_LAST_TALKED, LOCALID_BIKER3 trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat @@ -275,7 +275,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 call_if_eq ThreeIsland_EventScript_PaxtonApproachMidRight compare VAR_TEMP_1, 4 call_if_eq ThreeIsland_EventScript_PaxtonApproachRight - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_PaxtonIntro setvar VAR_LAST_TALKED, LOCALID_PAXTON trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, ThreeIsland_Text_PaxtonDefeat diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 0845889ad..874b9f089 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_BERRY_FOREST", "name": "ThreeIsland_BerryForest", "layout": "LAYOUT_THREE_ISLAND_BERRY_FOREST", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_BERRY_FOREST", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 6ffa25cc4..80f8c79ed 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_BOND_BRIDGE", "name": "ThreeIsland_BondBridge", "layout": "LAYOUT_THREE_ISLAND_BOND_BRIDGE", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_BOND_BRIDGE", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index a256b5ae7..f5c957505 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_DUNSPARCE_TUNNEL", "name": "ThreeIsland_DunsparceTunnel", "layout": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_THREE_ISLE_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index d42861413..f9219d5c2 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HARBOR", "name": "ThreeIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index 049581de7..aa356997b 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE1", "name": "ThreeIsland_House1", "layout": "LAYOUT_THREE_ISLAND_HOUSE1", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index 3e32d7a0b..01fd8fe58 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE2", "name": "ThreeIsland_House2", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index 7fad7b0fe..e3c4c467c 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE3", "name": "ThreeIsland_House3", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index 8daa12557..25e2193a0 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE4", "name": "ThreeIsland_House4", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index ba7f2a4de..19f808a4a 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_HOUSE5", "name": "ThreeIsland_House5", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index d83d1f533..c1e596005 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_MART", "name": "ThreeIsland_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 6d0f0391b..532c0766c 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_POKEMON_CENTER_1F", "name": "ThreeIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index 2911dc268..265d66974 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_POKEMON_CENTER_2F", "name": "ThreeIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index 4858e3645..794b27b4e 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND_PORT", "name": "ThreeIsland_Port", "layout": "LAYOUT_THREE_ISLAND_PORT", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_THREE_ISLE_PORT", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index c5f0322f2..4c35a5942 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRADE_CENTER", "name": "TradeCenter", "layout": "LAYOUT_TRADE_CENTER", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json index e5f8fc029..4b12dc8a0 100644 --- a/data/maps/TrainerTower_1F/map.json +++ b/data/maps/TrainerTower_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_1F", "name": "TrainerTower_1F", "layout": "LAYOUT_TRAINER_TOWER_1F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_2F/map.json b/data/maps/TrainerTower_2F/map.json index b574b16c6..5972e45b4 100644 --- a/data/maps/TrainerTower_2F/map.json +++ b/data/maps/TrainerTower_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_2F", "name": "TrainerTower_2F", "layout": "LAYOUT_TRAINER_TOWER_2F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_3F/map.json b/data/maps/TrainerTower_3F/map.json index 6a3080531..10becb1c8 100644 --- a/data/maps/TrainerTower_3F/map.json +++ b/data/maps/TrainerTower_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_3F", "name": "TrainerTower_3F", "layout": "LAYOUT_TRAINER_TOWER_3F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json index 4dd210f5b..07c1183f3 100644 --- a/data/maps/TrainerTower_4F/map.json +++ b/data/maps/TrainerTower_4F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_4F", "name": "TrainerTower_4F", "layout": "LAYOUT_TRAINER_TOWER_4F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_5F/map.json b/data/maps/TrainerTower_5F/map.json index 0e0783e70..5f7d41602 100644 --- a/data/maps/TrainerTower_5F/map.json +++ b/data/maps/TrainerTower_5F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_5F", "name": "TrainerTower_5F", "layout": "LAYOUT_TRAINER_TOWER_5F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json index bbece23e5..8a30e713c 100644 --- a/data/maps/TrainerTower_6F/map.json +++ b/data/maps/TrainerTower_6F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_6F", "name": "TrainerTower_6F", "layout": "LAYOUT_TRAINER_TOWER_6F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json index 404078579..bfdd31391 100644 --- a/data/maps/TrainerTower_7F/map.json +++ b/data/maps/TrainerTower_7F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_7F", "name": "TrainerTower_7F", "layout": "LAYOUT_TRAINER_TOWER_7F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json index 7f4a70deb..2b3358855 100644 --- a/data/maps/TrainerTower_8F/map.json +++ b/data/maps/TrainerTower_8F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_8F", "name": "TrainerTower_8F", "layout": "LAYOUT_TRAINER_TOWER_8F", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json index 869b50f82..c0a71f79e 100644 --- a/data/maps/TrainerTower_Elevator/map.json +++ b/data/maps/TrainerTower_Elevator/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_ELEVATOR", "name": "TrainerTower_Elevator", "layout": "LAYOUT_TRAINER_TOWER_ELEVATOR", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json index 25da318a3..1fa9f1869 100644 --- a/data/maps/TrainerTower_Lobby/map.json +++ b/data/maps/TrainerTower_Lobby/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_LOBBY", "name": "TrainerTower_Lobby", "layout": "LAYOUT_TRAINER_TOWER_LOBBY", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc index bdda45de8..016cc9e3d 100644 --- a/data/maps/TrainerTower_Lobby/scripts.inc +++ b/data/maps/TrainerTower_Lobby/scripts.inc @@ -52,7 +52,7 @@ TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8 waitmovement 0 setmetatile 17, 10, METATILE_TrainerTower_CounterBarrier, 1 special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK waitse setvar VAR_TEMP_D, 0 releaseall diff --git a/data/maps/TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json index 2e7907af8..ee528571e 100644 --- a/data/maps/TrainerTower_Roof/map.json +++ b/data/maps/TrainerTower_Roof/map.json @@ -2,7 +2,7 @@ "id": "MAP_TRAINER_TOWER_ROOF", "name": "TrainerTower_Roof", "layout": "LAYOUT_TRAINER_TOWER_ROOF", - "music": "MUS_T_TOWER", + "music": "MUS_TRAINER_TOWER", "region_map_section": "MAPSEC_TRAINER_TOWER_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index b3e7746c8..bb680ce77 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND", "name": "TwoIsland", "layout": "LAYOUT_TWO_ISLAND", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/TwoIsland_CapeBrink/map.json b/data/maps/TwoIsland_CapeBrink/map.json index 34a6766de..f4fbfe4e4 100644 --- a/data/maps/TwoIsland_CapeBrink/map.json +++ b/data/maps/TwoIsland_CapeBrink/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_CAPE_BRINK", "name": "TwoIsland_CapeBrink", "layout": "LAYOUT_TWO_ISLAND_CAPE_BRINK", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 277991b06..5ffda9b54 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_CAPE_BRINK_HOUSE", "name": "TwoIsland_CapeBrink_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_CAPE_BRINK", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index d434c3e6a..be3073e86 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_HARBOR", "name": "TwoIsland_Harbor", "layout": "LAYOUT_ISLAND_HARBOR", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 798957582..acb50d880 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_HOUSE", "name": "TwoIsland_House", "layout": "LAYOUT_HOUSE3", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index 4d99f4be4..213e7ea20 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_JOYFUL_GAME_CORNER", "name": "TwoIsland_JoyfulGameCorner", "layout": "LAYOUT_TWO_ISLAND_JOYFUL_GAME_CORNER", - "music": "MUS_SLOT", + "music": "MUS_GAME_CORNER", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 2edfe5801..2e7290eb7 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -69,11 +69,11 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F waitmovement 0 msgbox TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle closemessage - playse SE_DOOR + playse SE_RS_DOOR waitse applymovement OBJ_EVENT_ID_PLAYER, Movement_17152C waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 addobject LOCALID_BIKER applymovement LOCALID_BIKER, TwoIsland_JoyfulGameCorner_Movement_BikerLookAround waitmovement 0 @@ -85,7 +85,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F closemessage applymovement LOCALID_BIKER, Movement_WalkInPlaceFastestDown waitmovement 0 - playse SE_KAIDAN + playse SE_EXIT removeobject LOCALID_BIKER fadedefaultbgm delay 60 @@ -158,7 +158,7 @@ TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsForMe setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 textcolor 3 - playfanfare MUS_ME_WAZA + playfanfare MUS_OBTAIN_TMHM message TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy waitmessage waitfanfare diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 517821717..ad6c90d96 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_POKEMON_CENTER_1F", "name": "TwoIsland_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index bb7b1116f..d6c52f551 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_TWO_ISLAND_POKEMON_CENTER_2F", "name": "TwoIsland_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_TWO_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index fbbc056af..fdd6613a0 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_EAST_ENTRANCE", "name": "UndergroundPath_EastEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_EastWestTunnel/map.json b/data/maps/UndergroundPath_EastWestTunnel/map.json index 7f53b384e..9648812ad 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/map.json +++ b/data/maps/UndergroundPath_EastWestTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL", "name": "UndergroundPath_EastWestTunnel", "layout": "LAYOUT_UNDERGROUND_PATH_EAST_WEST_TUNNEL", - "music": "MUS_LOAD01", + "music": "MUS_ROUTE1", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index 3f7f48f68..9dda62055 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_NORTH_ENTRANCE", "name": "UndergroundPath_NorthEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/map.json b/data/maps/UndergroundPath_NorthSouthTunnel/map.json index 35b7477b5..5358160b7 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/map.json +++ b/data/maps/UndergroundPath_NorthSouthTunnel/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", "name": "UndergroundPath_NorthSouthTunnel", "layout": "LAYOUT_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL", - "music": "MUS_LOAD01", + "music": "MUS_ROUTE1", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index e6153a7f7..9109d7035 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_SOUTH_ENTRANCE", "name": "UndergroundPath_SouthEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_UNDERGROUND_PATH", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index efb5e86cd..9fbfb4cd6 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNDERGROUND_PATH_WEST_ENTRANCE", "name": "UndergroundPath_WestEntrance", "layout": "LAYOUT_UNDERGROUND_PATH_ENTRANCE", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_UNDERGROUND_PATH_2", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json index d1342af5a..ec4ea7e21 100644 --- a/data/maps/UnionRoom/map.json +++ b/data/maps/UnionRoom/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNION_ROOM", "name": "UnionRoom", "layout": "LAYOUT_UNION_ROOM", - "music": "MUS_UNION", + "music": "MUS_UNION_ROOM", "region_map_section": "MAPSEC_SPECIAL_AREA", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnknownMap_18_01/map.json b/data/maps/UnknownMap_18_01/map.json index a00f28f90..603f2bc97 100644 --- a/data/maps/UnknownMap_18_01/map.json +++ b/data/maps/UnknownMap_18_01/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNKNOWN_MAP_18_01", "name": "UnknownMap_18_01", "layout": "LAYOUT_HOUSE2", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_6", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnusedHouse_27_00/map.json b/data/maps/UnusedHouse_27_00/map.json index 6d93604e4..0d5b626e3 100644 --- a/data/maps/UnusedHouse_27_00/map.json +++ b/data/maps/UnusedHouse_27_00/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNUSED_HOUSE_27_00", "name": "UnusedHouse_27_00", "layout": "LAYOUT_HOUSE2", - "music": "MUS_LOAD02", + "music": "MUS_ROUTE3", "region_map_section": "MAPSEC_ROUTE_19", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnusedHouse_29_00/map.json b/data/maps/UnusedHouse_29_00/map.json index 50dfe3d62..f5563c4cb 100644 --- a/data/maps/UnusedHouse_29_00/map.json +++ b/data/maps/UnusedHouse_29_00/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNUSED_HOUSE_29_00", "name": "UnusedHouse_29_00", "layout": "LAYOUT_HOUSE2", - "music": "MUS_CHAMP_R", + "music": "MUS_VICTORY_ROAD", "region_map_section": "MAPSEC_ROUTE_23", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/UnusedHouse_31_05/map.json b/data/maps/UnusedHouse_31_05/map.json index 21ec7325d..9e850ee52 100644 --- a/data/maps/UnusedHouse_31_05/map.json +++ b/data/maps/UnusedHouse_31_05/map.json @@ -2,7 +2,7 @@ "id": "MAP_UNUSED_HOUSE_31_05", "name": "UnusedHouse_31_05", "layout": "LAYOUT_HOUSE4", - "music": "MUS_NANA67", + "music": "MUS_SEVII_67", "region_map_section": "MAPSEC_SEVEN_ISLAND", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index c03df3c58..9c3a5e558 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY", "name": "VermilionCity", "layout": "LAYOUT_VERMILION_CITY", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 2ac39f40e..17dae87dd 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -181,7 +181,7 @@ VermilionCity_Gym_EventScript_FoundSwitchTwo:: @ 816B8CB closemessage call VermilionCity_Gym_EventScript_SetBeamsOff special DrawWholeMapView - playse SE_KI_GASYAN + playse SE_UNLOCK waitse setflag FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES releaseall diff --git a/data/maps/VermilionCity_Gym/text.inc b/data/maps/VermilionCity_Gym/text.inc index e364f8d10..e640a2c7c 100644 --- a/data/maps/VermilionCity_Gym/text.inc +++ b/data/maps/VermilionCity_Gym/text.inc @@ -7,7 +7,7 @@ VermilionCity_Gym_Text_LtSurgeIntro:: @ 8194BA4 .string "saved me during the war!\p" .string "They zapped my enemies into\n" .string "paralysis!\p" - .string "The same as I'll do to you!{PLAY_BGM}{MUS_EXEYE}$" + .string "The same as I'll do to you!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" VermilionCity_Gym_Text_LtSurgePostBattle:: @ 8194C8E .string "A little word of advice, kid!\p" diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index 541974a38..5ddb668e4 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_HOUSE1", "name": "VermilionCity_House1", "layout": "LAYOUT_HOUSE1", - "music": "MUS_HANADA", + "music": "MUS_FUCHSIA", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 30a081607..c91403a4e 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_HOUSE2", "name": "VermilionCity_House2", "layout": "LAYOUT_HOUSE1", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index d5afa8458..00228071a 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_HOUSE3", "name": "VermilionCity_House3", "layout": "LAYOUT_HOUSE1", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index ba26357da..472cfd606 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_MART", "name": "VermilionCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index b14fc3fb5..d08b85b28 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_POKEMON_CENTER_1F", "name": "VermilionCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 1e233913e..8866e68b4 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_POKEMON_CENTER_2F", "name": "VermilionCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index dfa50ca79..b5df8639c 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -2,7 +2,7 @@ "id": "MAP_VERMILION_CITY_POKEMON_FAN_CLUB", "name": "VermilionCity_PokemonFanClub", "layout": "LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB", - "music": "MUS_KUCHIBA", + "music": "MUS_VERMILLION", "region_map_section": "MAPSEC_VERMILION_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 09f8d1d8b..a7ba114e1 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -26,7 +26,7 @@ VermilionCity_PokemonFanClub_EventScript_ChairmanStory:: @ 816B4B1 compare VAR_RESULT, FALSE goto_if_eq VermilionCity_PokemonFanClub_EventScript_NoRoomForBikeVoucher setflag FLAG_GOT_BIKE_VOUCHER - giveitem_msg VermilionCity_PokemonFanClub_Text_ReceivedBikeVoucherFromChairman, ITEM_BIKE_VOUCHER, 1, MUS_FAN5 + giveitem_msg VermilionCity_PokemonFanClub_Text_ReceivedBikeVoucherFromChairman, ITEM_BIKE_VOUCHER, 1, MUS_OBTAIN_KEY_ITEM msgbox VermilionCity_PokemonFanClub_Text_ExplainBikeVoucher release end diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 4593b178c..45801a27c 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_1F", "name": "VictoryRoad_1F", "layout": "LAYOUT_VICTORY_ROAD_1F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 5bdc91202..4c300e6e2 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -23,7 +23,7 @@ VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33 goto_if_eq VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed setmetatile 12, 14, METATILE_Cave_Floor_Ledge_Top, 0 setmetatile 12, 15, METATILE_Cave_Floor_Ledge_Bottom, 0 - playse SE_RU_GASYAN + playse SE_ICE_BREAK special DrawWholeMapView waitse moveobjectoffscreen 5 diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index 1b3c43ef6..0c389ff08 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_2F", "name": "VictoryRoad_2F", "layout": "LAYOUT_VICTORY_ROAD_2F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index 1dfd658ae..b9436a11b 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -25,7 +25,7 @@ VictoryRoad_2F_EventScript_FloorSwitch1:: @ 8160FD5 goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed setmetatile 13, 10, METATILE_Cave_Floor_Ledge_Top, 0 setmetatile 13, 11, METATILE_Cave_Floor_Ledge_Bottom, 0 - playse SE_RU_GASYAN + playse SE_ICE_BREAK special DrawWholeMapView waitse moveobjectoffscreen 11 @@ -43,7 +43,7 @@ VictoryRoad_2F_EventScript_FloorSwitch2:: @ 8161006 goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed setmetatile 33, 16, METATILE_Cave_Floor_Ledge_Top, 0 setmetatile 33, 17, METATILE_Cave_Floor_Ledge_Bottom, 0 - playse SE_RU_GASYAN + playse SE_ICE_BREAK special DrawWholeMapView waitse moveobjectoffscreen 12 diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 58870f921..c53d1d2cc 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VICTORY_ROAD_3F", "name": "VictoryRoad_3F", "layout": "LAYOUT_VICTORY_ROAD_3F", - "music": "MUS_OTSUKIMI", + "music": "MUS_MT_MOON", "region_map_section": "MAPSEC_KANTO_VICTORY_ROAD", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index f601d83be..6af6eb0bc 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -18,7 +18,7 @@ VictoryRoad_3F_EventScript_FloorSwitch:: @ 81610CF goto_if_eq VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed setmetatile 12, 12, METATILE_Cave_Floor_Ledge_Top, 0 setmetatile 12, 13, METATILE_Cave_Floor_Ledge_Bottom, 0 - playse SE_RU_GASYAN + playse SE_ICE_BREAK special DrawWholeMapView waitse moveobjectoffscreen 7 diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 0c3a19925..ea6a6794a 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY", "name": "ViridianCity", "layout": "LAYOUT_VIRIDIAN_CITY", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ViridianCity_Gym/text.inc b/data/maps/ViridianCity_Gym/text.inc index 38561c011..44ee4d9bb 100644 --- a/data/maps/ViridianCity_Gym/text.inc +++ b/data/maps/ViridianCity_Gym/text.inc @@ -7,14 +7,14 @@ ViridianCity_Gym_Text_GiovanniIntro:: @ 818F352 .string "So be it.\l" .string "This time, I'm not holding back!\p" .string "Once more, you shall face\n" - .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{MUS_ROCKET}$" + .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{MUS_ENCOUNTER_ROCKET}$" ViridianCity_Gym_Text_GiovanniDefeat:: @ 818F43F .string "Ha!\n" .string "That was a truly intense fight.\l" .string "You have won!\p" .string "As proof, here is the EARTHBADGE!\n" - .string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$" + .string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$" ViridianCity_Gym_Text_GiovanniPostBattle:: @ 818F4A2 .string "Having lost in this fashion, \n" diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index e46f3be00..eb5780daa 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_HOUSE1", "name": "ViridianCity_House1", "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE1", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index e8c66213a..3b2b1cbbf 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_HOUSE2", "name": "ViridianCity_House2", "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE2", - "music": "MUS_NIBI", + "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 26fc5e46f..0428205d0 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_MART", "name": "ViridianCity_Mart", "layout": "LAYOUT_MART", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index cb458b682..31d99c12c 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -28,7 +28,7 @@ ViridianCity_Mart_EventScript_ParcelScene:: @ 816A205 waitmovement 0 msgbox ViridianCity_Mart_Text_TakeThisToProfOak setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 - giveitem_msg ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk, ITEM_OAKS_PARCEL, 1, MUS_FAN5 + giveitem_msg ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk, ITEM_OAKS_PARCEL, 1, MUS_OBTAIN_KEY_ITEM setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5 releaseall end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index e70f09c9f..935bcd10b 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F", "name": "ViridianCity_PokemonCenter_1F", "layout": "LAYOUT_POKEMON_CENTER_1F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index bdeac2c5c..d34ec1462 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F", "name": "ViridianCity_PokemonCenter_2F", "layout": "LAYOUT_POKEMON_CENTER_2F", - "music": "MUS_POKECEN", + "music": "MUS_POKE_CENTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, "weather": "WEATHER_NONE", diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 0c6125d6e..f8d799501 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -2,7 +2,7 @@ "id": "MAP_VIRIDIAN_FOREST", "name": "ViridianForest", "layout": "LAYOUT_VIRIDIAN_FOREST", - "music": "MUS_T_MORI", + "music": "MUS_VIRIDIAN_FOREST", "region_map_section": "MAPSEC_VIRIDIAN_FOREST", "requires_flash": false, "weather": "WEATHER_SHADE", diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 0e929220c..c9c7430ab 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -52,7 +52,7 @@ SurfPichu_GiveIfPossible: @ 8488EC4 vmessage sText_MysteryGiftEgg waitmessage waitbuttonpress - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM waitfanfare release end diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 52720d0cc..c581ba332 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -93,7 +93,7 @@ CableClub_EventScript_ExitLinkRoom:: @ 81BB2E5 call CableClub_EventScript_CloseLinkAndExitLinkRoom call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -103,7 +103,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 81BB2FD call CableClub_EventScript_CloseLinkAndExitLinkRoom call CableClub_EventScript_CloseGameCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -129,7 +129,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 81BB34F call CableClub_EventScript_PlayerExitTradeCenter call CableClub_EventScript_CloseDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -154,7 +154,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 81BB39C call CableClub_EventScript_PlayerExitUnionRoom call CableClub_EventScript_CloseUnionRoomBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK erasebox 0, 0, 29, 19 releaseall end @@ -312,7 +312,7 @@ CableClub_EventScript_EnterColosseum:: @ 81BB5B3 waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -421,7 +421,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 81BB73D waitmessage call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -821,7 +821,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 81BBA94 special HelpSystem_Disable call CableClub_EventScript_OpenUnionRoomBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -1126,7 +1126,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 81BBF88 copyvar VAR_0x8007, VAR_LAST_TALKED call CableClub_EventScript_OpenDirectCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 @@ -1324,7 +1324,7 @@ CableClub_EventScript_EnterMinigame:: @ 81BC262 copyvar VAR_0x8007, VAR_LAST_TALKED call CableClub_EventScript_OpenGameCornerBarrier special DrawWholeMapView - playse SE_TK_KASYA + playse SE_CLICK delay 60 applymovement VAR_LAST_TALKED, Movement_AttendantFaceLeft waitmovement 0 diff --git a/data/scripts/hole.inc b/data/scripts/hole.inc index 98900f04a..fddd574ad 100644 --- a/data/scripts/hole.inc +++ b/data/scripts/hole.inc @@ -13,7 +13,7 @@ EventScript_FallDownHole:: @ 81C1348 delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 warphole 0xFFFF waitstate @@ -25,7 +25,7 @@ EventScript_1C1361:: @ 81C1361 delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible waitmovement 0 - playse SE_RU_HYUU + playse SE_FALL delay 60 special DoFallWarp waitstate diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index e89aabfba..6c74df5bd 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -78,11 +78,11 @@ EventScript_NoRoomForItem:: @ 81A675E return EventScript_PlayFanfareObtainedItem:: @ 81A6764 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP return EventScript_PlayFanfareObtainedTMHM:: @ 81A6768 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP return Std_ObtainDecoration:: @ 81A676C @@ -100,7 +100,7 @@ EventScript_ObtainDecorMessage:: @ 81A677A return EventScript_ObtainedDecor:: @ 81A6795 - playfanfare MUS_FANFA4 + playfanfare MUS_OBTAIN_ITEM message Text_ObtainedTheDecor waitfanfare waitmessage diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 05d27ffa9..64955bb8a 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -27,11 +27,11 @@ PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6 return PokedexRating_EventScript_NormalFanfare:: @ 81A73D8 - playfanfare MUS_FAN2 + playfanfare MUS_DEX_RATING return PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC - playfanfare MUS_FANFA5 + playfanfare MUS_EVOLVED return PokedexRating_EventScript_Rate:: @ 81A73E0 diff --git a/data/scripts/pokemon_league.inc b/data/scripts/pokemon_league.inc index 65baba59a..ad39c4528 100644 --- a/data/scripts/pokemon_league.inc +++ b/data/scripts/pokemon_league.inc @@ -1,7 +1,7 @@ PokemonLeague_EventScript_OpenDoor:: @ 81A7506 applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32 waitmovement 0 - playse SE_DOOR + playse SE_RS_DOOR call PokemonLeague_EventScript_SetDoorOpen special DrawWholeMapView setflag FLAG_TEMP_4 @@ -11,7 +11,7 @@ PokemonLeague_EventScript_EnterRoom:: @ 81A751F applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5 waitmovement 0 setflag FLAG_TEMP_2 - playse SE_KI_GASYAN + playse SE_UNLOCK call PokemonLeague_EventScript_CloseEntry special DrawWholeMapView return @@ -34,7 +34,7 @@ PokemonLeague_EventScript_PreventExit:: @ 81A754B PokemonLeague_EventScript_OpenDoorLance:: @ 81A7563 applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32 waitmovement 0 - playse SE_DOOR + playse SE_RS_DOOR setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1 setmetatile 6, 5, METATILE_PokemonLeague_Door_Mid_Open, 0 special DrawWholeMapView diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc index cfdfe53a7..c59080c6c 100644 --- a/data/scripts/route23.inc +++ b/data/scripts/route23.inc @@ -18,7 +18,7 @@ Route23_EventScript_MissingBadge:: @ 81A77DE Route23_EventScript_AlreadyRecognizedBoulderBadge:: @ 81A77EC message Text_OhThatsBadgeGoRightAhead waitmessage - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress release @@ -101,7 +101,7 @@ Route23_EventScript_CheckEarthBadge:: @ 81A793E Route23_EventScript_RecognizeBoulderBadge:: @ 81A794D message Text_OhThatsBadgeGoRightAhead waitmessage - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 @@ -196,7 +196,7 @@ Route23_EventScript_MissingBadgeTrigger:: @ 81A7A77 Route23_EventScript_RecognizeBoulderBadgeTrigger:: @ 81A7A96 message Text_OhThatsBadgeGoRightAhead waitmessage - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP waitfanfare waitbuttonpress copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 15c735821..65ddd4996 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -24,14 +24,14 @@ SafariZone_EventScript_Retire:: @ 81BFBC0 SafariZone_EventScript_TimesUp:: @ 81BFBC5 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SafariZone_Text_TimesUp goto SafariZone_EventScript_Exit end SafariZone_EventScript_OutOfBalls:: @ 81BFBD7 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox SafariZone_Text_OutOfBalls goto SafariZone_EventScript_Exit end diff --git a/data/scripts/silphco_doors.inc b/data/scripts/silphco_doors.inc index df619b345..e648301ff 100644 --- a/data/scripts/silphco_doors.inc +++ b/data/scripts/silphco_doors.inc @@ -512,7 +512,7 @@ EventScript_TryUnlockDoor:: @ 81A8B23 end EventScript_OpenDoor:: @ 81A8B32 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP msgbox Text_CardKeyOpenedDoor waitfanfare compare VAR_TEMP_1, 1 @@ -556,7 +556,7 @@ EventScript_OpenDoor:: @ 81A8B32 compare VAR_TEMP_1, 20 call_if_eq EventScript_Open11FDoor waitse - playse SE_KI_GASYAN + playse SE_UNLOCK special DrawWholeMapView waitse special SetHiddenItemFlag diff --git a/data/scripts/static_pokemon.inc b/data/scripts/static_pokemon.inc index 5334688a3..906097666 100644 --- a/data/scripts/static_pokemon.inc +++ b/data/scripts/static_pokemon.inc @@ -17,7 +17,7 @@ EventScript_MonFlewAway:: @ 81A9236 EventScript_AwakenSnorlax:: @ 81A924B message Text_PlayedPokeFlute waitmessage - playfanfare MUS_POKEFUE + playfanfare MUS_POKE_FLUTE waitfanfare msgbox Text_SnorlaxWokeUp return diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc index da53a3cc1..9e542e6e7 100644 --- a/data/scripts/std_msgbox.inc +++ b/data/scripts/std_msgbox.inc @@ -29,25 +29,25 @@ Std_MsgboxYesNo:: @ 81A4E5C Std_ReceivedItem:: @ 81A4E66 textcolor 3 - compare VAR_0x8002, MUS_FANFA1 + compare VAR_0x8002, MUS_LEVEL_UP call_if_eq EventScript_ReceivedItemFanfare1 - compare VAR_0x8002, MUS_FAN5 + compare VAR_0x8002, MUS_OBTAIN_KEY_ITEM call_if_eq EventScript_ReceivedItemFanfare2 message 0x0 waitmessage waitfanfare - compare VAR_0x8002, MUS_FANFA1 + compare VAR_0x8002, MUS_LEVEL_UP call_if_eq EventScript_ReceivedItemWaitFanfare putitemaway VAR_0x8000, VAR_0x8001 call EventScript_RestorePrevTextColor return EventScript_ReceivedItemFanfare1:: @ 81A4EA2 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP return EventScript_ReceivedItemFanfare2:: @ 81A4EA6 - playfanfare MUS_FAN5 + playfanfare MUS_OBTAIN_KEY_ITEM return EventScript_ReceivedItemWaitFanfare:: @ 81A4EAA diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 589d84a64..253e2837a 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -44,7 +44,7 @@ CeladonCity_GameCorner_EventScript_PrintTypeSepia:: @ 81B28FC CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907 message CeladonCity_GameCorner_Text_BigSmileForPhoto waitmessage - playse MUS_ME_PHOTO + playse MUS_PHOTO dofieldeffect FLDEFF_UNK_45 delay 60 special UpdateTrainerCardPhotoIcons @@ -237,7 +237,7 @@ FourIsland_House2_EventScript_AlreadyBraggedHoFMax:: @ 81B2C47 FourIsland_House2_EventScript_BraggedHoF:: @ 81B2C51 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message FourIsland_House2_Text_HoFStickerApplied waitmessage waitfanfare @@ -300,7 +300,7 @@ FourIsland_House2_EventScript_AlreadyBraggedEggsMax:: @ 81B2D11 FourIsland_House2_EventScript_BraggedEggs:: @ 81B2D1B textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message FourIsland_House2_Text_EggStickerApplied waitmessage waitfanfare @@ -363,7 +363,7 @@ FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax:: @ 81B2DDB FourIsland_House2_EventScript_BraggedLinkWins:: @ 81B2DE5 textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message FourIsland_House2_Text_VictoryStickerApplied waitmessage waitfanfare diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index 3b21c0844..94f1c7263 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -293,7 +293,7 @@ TrainerTower_Roof_EventScript_GivePrize: TrainerTower_Roof_EventScript_ReceivePrize: msgbox TrainerTower_Roof_Text_ThisIsForYou textcolor 3 - playfanfare MUS_FANFA1 + playfanfare MUS_LEVEL_UP message Text_ObtainedTheX waitfanfare waitmessage @@ -365,7 +365,7 @@ TrainerTower_EventScript_TriggerDoubleBattle: TrainerTower_EventScript_IneligibleForDoubleBattle:: @ 81C5528 lockall - playse SE_PINPON + playse SE_DING_DONG msgbox TrainerTower_Lobby_Text_NeedTwoMonsForDouble closemessage applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Movement_PushPlayerBack diff --git a/data/text/route23.inc b/data/text/route23.inc index 9fe5cd426..d46313e46 100644 --- a/data/text/route23.inc +++ b/data/text/route23.inc @@ -23,6 +23,6 @@ Text_OnlyPassWithBadgeDontHaveYet:: @ 81A57C1 Text_OnlyPassWithBadgeOhGoAhead:: @ 81A5839 .string "You can pass here only if you have\n" .string "the {STR_VAR_1}.\p" - .string "Oh! That is the {STR_VAR_1}!{PAUSE_MUSIC}{PLAY_BGM}{MUS_FANFA1}{PAUSE 0x60}{RESUME_MUSIC}\p" + .string "Oh! That is the {STR_VAR_1}!{PAUSE_MUSIC}{PLAY_BGM}{MUS_LEVEL_UP}{PAUSE 0x60}{RESUME_MUSIC}\p" .string "Okay, then.\n" .string "Please, go right ahead.$" diff --git a/include/constants/songs.h b/include/constants/songs.h index f1868ca2a..1c8f46844 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -1,354 +1,356 @@ #ifndef GUARD_CONSTANTS_SONGS_H #define GUARD_CONSTANTS_SONGS_H -#define MUS_DUMMY 0 -#define SE_STOP 0 -#define SE_KAIFUKU 1 -#define SE_PC_LOGIN 2 -#define SE_PC_OFF 3 -#define SE_PC_ON 4 -#define SE_SELECT 5 -#define SE_WIN_OPEN 6 -#define SE_WALL_HIT 7 -#define SE_DOOR 8 -#define SE_KAIDAN 9 -#define SE_DANSA 10 -#define SE_JITENSYA 11 -#define SE_KOUKA_L 12 -#define SE_KOUKA_M 13 -#define SE_KOUKA_H 14 -#define SE_BOWA2 15 -#define SE_POKE_DEAD 16 -#define SE_NIGERU 17 -#define SE_JIDO_DOA 18 -#define SE_NAMINORI 19 -#define SE_BAN 20 -#define SE_PIN 21 -#define SE_BOO 22 -#define SE_BOWA 23 -#define SE_JYUNI 24 -#define SE_SEIKAI 25 -#define SE_HAZURE 26 -#define SE_EXP 27 -#define SE_JITE_PYOKO 28 -#define SE_MU_PACHI 29 -#define SE_TK_KASYA 30 -#define SE_FU_ZAKU 31 -#define SE_FU_ZAKU2 32 -#define SE_FU_ZUZUZU 33 -#define SE_RU_GASHIN 34 -#define SE_RU_GASYAN 35 -#define SE_RU_BARI 36 -#define SE_RU_HYUU 37 -#define SE_KI_GASYAN 38 -#define SE_TK_WARPIN 39 -#define SE_TK_WARPOUT 40 -#define SE_TU_SAA 41 -#define SE_HI_TURUN 42 -#define SE_TRACK_MOVE 43 -#define SE_TRACK_STOP 44 -#define SE_TRACK_HAIKI 45 -#define SE_TRACK_DOOR 46 -#define SE_MOTER 47 -#define SE_SAVE 48 -#define SE_KON 49 -#define SE_KON2 50 -#define SE_KON3 51 -#define SE_KON4 52 -#define SE_SUIKOMU 53 -#define SE_NAGERU 54 -#define SE_TOY_C 55 -#define SE_TOY_D 56 -#define SE_TOY_E 57 -#define SE_TOY_F 58 -#define SE_TOY_G 59 -#define SE_TOY_A 60 -#define SE_TOY_B 61 -#define SE_TOY_C1 62 -#define SE_MIZU 63 -#define SE_HASHI 64 -#define SE_DAUGI 65 -#define SE_PINPON 66 -#define SE_FUUSEN1 67 -#define SE_FUUSEN2 68 -#define SE_FUUSEN3 69 -#define SE_TOY_KABE 70 -#define SE_TOY_DANGO 71 -#define SE_DOKU 72 -#define SE_ESUKA 73 -#define SE_T_AME 74 -#define SE_T_AME_E 75 -#define SE_T_OOAME 76 -#define SE_T_OOAME_E 77 -#define SE_T_KOAME 78 -#define SE_T_KOAME_E 79 -#define SE_T_KAMI 80 -#define SE_T_KAMI2 81 -#define SE_ELEBETA 82 -#define SE_HINSI 83 -#define SE_EXPMAX 84 -#define SE_TAMAKORO 85 -#define SE_TAMAKORO_E 86 -#define SE_BASABASA 87 -#define SE_REGI 88 -#define SE_C_GAJI 89 -#define SE_C_MAKU_U 90 -#define SE_C_MAKU_D 91 -#define SE_C_PASI 92 -#define SE_C_SYU 93 -#define SE_C_PIKON 94 -#define SE_REAPOKE 95 -#define SE_OP_BASYU 96 -#define SE_BT_START 97 -#define SE_DENDOU 98 -#define SE_JIHANKI 99 -#define SE_TAMA 100 -#define SE_Z_SCROLL 101 -#define SE_Z_PAGE 102 -#define SE_PN_ON 103 -#define SE_PN_OFF 104 -#define SE_Z_SEARCH 105 -#define SE_TAMAGO 106 -#define SE_TB_START 107 -#define SE_TB_KON 108 -#define SE_TB_KARA 109 -#define SE_BIDORO 110 -#define SE_W085 111 -#define SE_W085B 112 -#define SE_W231 113 -#define SE_W171 114 -#define SE_W233 115 -#define SE_W233B 116 -#define SE_W145 117 -#define SE_W145B 118 -#define SE_W145C 119 -#define SE_W240 120 -#define SE_W015 121 -#define SE_W081 122 -#define SE_W081B 123 -#define SE_W088 124 -#define SE_W016 125 -#define SE_W016B 126 -#define SE_W003 127 -#define SE_W104 128 -#define SE_W013 129 -#define SE_W196 130 -#define SE_W086 131 -#define SE_W004 132 -#define SE_W025 133 -#define SE_W025B 134 -#define SE_W152 135 -#define SE_W026 136 -#define SE_W172 137 -#define SE_W172B 138 -#define SE_W053 139 -#define SE_W007 140 -#define SE_W092 141 -#define SE_W221 142 -#define SE_W221B 143 -#define SE_W052 144 -#define SE_W036 145 -#define SE_W059 146 -#define SE_W059B 147 -#define SE_W010 148 -#define SE_W011 149 -#define SE_W017 150 -#define SE_W019 151 -#define SE_W028 152 -#define SE_W013B 153 -#define SE_W044 154 -#define SE_W029 155 -#define SE_W057 156 -#define SE_W056 157 -#define SE_W250 158 -#define SE_W030 159 -#define SE_W039 160 -#define SE_W054 161 -#define SE_W077 162 -#define SE_W020 163 -#define SE_W082 164 -#define SE_W047 165 -#define SE_W195 166 -#define SE_W006 167 -#define SE_W091 168 -#define SE_W146 169 -#define SE_W120 170 -#define SE_W153 171 -#define SE_W071B 172 -#define SE_W071 173 -#define SE_W103 174 -#define SE_W062 175 -#define SE_W062B 176 -#define SE_W048 177 -#define SE_W187 178 -#define SE_W118 179 -#define SE_W155 180 -#define SE_W122 181 -#define SE_W060 182 -#define SE_W185 183 -#define SE_W014 184 -#define SE_W043 185 -#define SE_W207 186 -#define SE_W207B 187 -#define SE_W215 188 -#define SE_W109 189 -#define SE_W173 190 -#define SE_W280 191 -#define SE_W202 192 -#define SE_W060B 193 -#define SE_W076 194 -#define SE_W080 195 -#define SE_W100 196 -#define SE_W107 197 -#define SE_W166 198 -#define SE_W129 199 -#define SE_W115 200 -#define SE_W112 201 -#define SE_W197 202 -#define SE_W199 203 -#define SE_W236 204 -#define SE_W204 205 -#define SE_W268 206 -#define SE_W070 207 -#define SE_W063 208 -#define SE_W127 209 -#define SE_W179 210 -#define SE_W151 211 -#define SE_W201 212 -#define SE_W161 213 -#define SE_W161B 214 -#define SE_W227 215 -#define SE_W227B 216 -#define SE_W226 217 -#define SE_W208 218 -#define SE_W213 219 -#define SE_W213B 220 -#define SE_W234 221 -#define SE_W260 222 -#define SE_W328 223 -#define SE_W320 224 -#define SE_W255 225 -#define SE_W291 226 -#define SE_W089 227 -#define SE_W239 228 -#define SE_W230 229 -#define SE_W281 230 -#define SE_W327 231 -#define SE_W287 232 -#define SE_W257 233 -#define SE_W253 234 -#define SE_W258 235 -#define SE_W322 236 -#define SE_W298 237 -#define SE_W287B 238 -#define SE_W114 239 -#define SE_W063B 240 -#define MUS_W_DOOR 241 -#define SE_CARD1 242 -#define SE_CARD2 243 -#define SE_CARD3 244 -#define SE_BAG1 245 -#define SE_BAG2 246 -#define SE_GETTING 247 -#define SE_SHOP 248 -#define SE_KITEKI 249 -#define SE_HELP_OP 250 -#define SE_HELP_CL 251 -#define SE_HELP_NG 252 -#define SE_DEOMOV 253 -#define SE_EXCELLENT 254 -#define SE_NAWAMISS 255 - -#define MUS_ME_ASA 256 -#define MUS_FANFA1 257 -#define MUS_FANFA4 258 -#define MUS_FANFA5 259 -#define MUS_ME_BACHI 260 -#define MUS_ME_WAZA 261 -#define MUS_ME_KINOMI 262 -#define MUS_ME_SHINKA 263 -#define MUS_SHINKA 264 -#define MUS_BATTLE32 265 -#define MUS_BATTLE20 266 -#define MUS_P_SCHOOL 267 -#define MUS_ME_B_BIG 268 -#define MUS_ME_B_SMALL 269 -#define MUS_ME_WASURE 270 -#define MUS_ME_ZANNEN 271 -#define MUS_ANNAI 272 -#define MUS_SLOT 273 -#define MUS_AJITO 274 -#define MUS_GYM 275 -#define MUS_PURIN 276 -#define MUS_DEMO 277 -#define MUS_TITLE 278 -#define MUS_GUREN 279 -#define MUS_SHION 280 -#define MUS_KAIHUKU 281 -#define MUS_CYCLING 282 -#define MUS_ROCKET 283 -#define MUS_SHOUJO 284 -#define MUS_SHOUNEN 285 -#define MUS_DENDOU 286 -#define MUS_T_MORI 287 -#define MUS_OTSUKIMI 288 -#define MUS_POKEYASHI 289 -#define MUS_ENDING 290 -#define MUS_LOAD01 291 -#define MUS_OPENING 292 -#define MUS_LOAD02 293 -#define MUS_LOAD03 294 -#define MUS_CHAMP_R 295 -#define MUS_VS_GYM 296 -#define MUS_VS_TORE 297 -#define MUS_VS_YASEI 298 -#define MUS_VS_LAST 299 -#define MUS_MASARA 300 -#define MUS_KENKYU 301 -#define MUS_OHKIDO 302 -#define MUS_POKECEN 303 -#define MUS_SANTOAN 304 -#define MUS_NAMINORI 305 -#define MUS_P_TOWER 306 -#define MUS_SHIRUHU 307 -#define MUS_HANADA 308 -#define MUS_TAMAMUSI 309 -#define MUS_WIN_TRE 310 -#define MUS_WIN_YASEI 311 -#define MUS_WIN_GYM 312 -#define MUS_KUCHIBA 313 -#define MUS_NIBI 314 -#define MUS_RIVAL1 315 -#define MUS_RIVAL2 316 -#define MUS_FAN2 317 -#define MUS_FAN5 318 -#define MUS_FAN6 319 -#define MUS_ME_PHOTO 320 -#define MUS_TITLEROG 321 -#define MUS_GET_YASEI 322 -#define MUS_SOUSA 323 -#define MUS_SEKAIKAN 324 -#define MUS_SEIBETU 325 -#define MUS_JUMP 326 -#define MUS_UNION 327 -#define MUS_NETWORK 328 -#define MUS_OKURIMONO 329 -#define MUS_KINOMIKUI 330 -#define MUS_NANADUNGEON 331 -#define MUS_OSHIE_TV 332 -#define MUS_NANASHIMA 333 -#define MUS_NANAISEKI 334 -#define MUS_NANA123 335 -#define MUS_NANA45 336 -#define MUS_NANA67 337 -#define MUS_POKEFUE 338 -#define MUS_VS_DEO 339 -#define MUS_VS_MYU2 340 -#define MUS_VS_DEN 341 -#define MUS_EXEYE 342 -#define MUS_DEOEYE 343 -#define MUS_T_TOWER 344 -#define MUS_SLOWMASARA 345 -#define MUS_TVNOIZE 346 +#define MUS_DUMMY 0 // MUS_DUMMY +#define SE_USE_ITEM 1 // SE_KAIFUKU +#define SE_PC_LOGIN 2 // SE_PC_LOGIN +#define SE_PC_OFF 3 // SE_PC_OFF +#define SE_PC_ON 4 // SE_PC_ON +#define SE_SELECT 5 // SE_SELECT +#define SE_WIN_OPEN 6 // SE_WIN_OPEN +#define SE_WALL_HIT 7 // SE_WALL_HIT +#define SE_RS_DOOR 8 // SE_DOOR +#define SE_EXIT 9 // SE_KAIDAN +#define SE_LEDGE 10 // SE_DANSA +#define SE_BIKE_BELL 11 // SE_JITENSYA +#define SE_NOT_EFFECTIVE 12 // SE_KOUKA_L +#define SE_EFFECTIVE 13 // SE_KOUKA_M +#define SE_SUPER_EFFECTIVE 14 // SE_KOUKA_H +#define SE_BALL_OPEN 15 // SE_BOWA2 +#define SE_FAINT 16 // SE_POKE_DEAD +#define SE_FLEE 17 // SE_NIGERU +#define SE_SLIDING_DOOR 18 // SE_JIDO_DOA +#define SE_SHIP 19 // SE_NAMINORI +#define SE_BANG 20 // SE_BAN +#define SE_PIN 21 // SE_PIN +#define SE_BOO 22 // SE_BOO +#define SE_BALL 23 // SE_BOWA +#define SE_CONTEST_PLACE 24 // SE_JYUNI +#define SE_SUCCESS 25 // SE_SEIKAI +#define SE_FAILURE 26 // SE_HAZURE +#define SE_EXP 27 // SE_EXP +#define SE_BIKE_HOP 28 // SE_JITE_PYOKO +#define SE_SWITCH 29 // SE_MU_PACHI +#define SE_CLICK 30 // SE_TK_KASYA +#define SE_FU_ZAKU 31 // SE_FU_ZAKU +#define SE_CONTEST_CONDITION_LOSE 32 // SE_FU_ZAKU2 +#define SE_LAVARIDGE_FALL_WARP 33 // SE_FU_ZUZUZU +#define SE_ICE_STAIRS 34 // SE_RU_GASHIN +#define SE_ICE_BREAK 35 // SE_RU_GASYAN +#define SE_ICE_CRACK 36 // SE_RU_BARI +#define SE_FALL 37 // SE_RU_HYUU +#define SE_UNLOCK 38 // SE_KI_GASYAN +#define SE_WARP_IN 39 // SE_TK_WARPIN +#define SE_WARP_OUT 40 // SE_TK_WARPOUT +#define SE_REPEL 41 // SE_TU_SAA +#define SE_ROTATING_GATE 42 // SE_HI_TURUN +#define SE_TRUCK_MOVE 43 // SE_TRACK_MOVE +#define SE_TRUCK_STOP 44 // SE_TRACK_STOP +#define SE_TRUCK_UNLOAD 45 // SE_TRACK_HAIKI +#define SE_TRUCK_DOOR 46 // SE_TRACK_DOOR +#define SE_BERRY_BLENDER 47 // SE_MOTER +#define SE_SAVE 48 // SE_SAVE +#define SE_BALL_BOUNCE_1 49 // SE_KON +#define SE_BALL_BOUNCE_2 50 // SE_KON2 +#define SE_BALL_BOUNCE_3 51 // SE_KON3 +#define SE_BALL_BOUNCE_4 52 // SE_KON4 +#define SE_BALL_TRADE 53 // SE_SUIKOMU +#define SE_BALL_THROW 54 // SE_NAGERU +#define SE_NOTE_C 55 // SE_TOY_C +#define SE_NOTE_D 56 // SE_TOY_D +#define SE_NOTE_E 57 // SE_TOY_E +#define SE_NOTE_F 58 // SE_TOY_F +#define SE_NOTE_G 59 // SE_TOY_G +#define SE_NOTE_A 60 // SE_TOY_A +#define SE_NOTE_B 61 // SE_TOY_B +#define SE_NOTE_C_HIGH 62 // SE_TOY_C1 +#define SE_PUDDLE 63 // SE_MIZU +#define SE_BRIDGE_WALK 64 // SE_HASHI +#define SE_ITEMFINDER 65 // SE_DAUGI +#define SE_DING_DONG 66 // SE_PINPON +#define SE_BALLOON_RED 67 // SE_FUUSEN1 +#define SE_BALLOON_BLUE 68 // SE_FUUSEN2 +#define SE_BALLOON_YELLOW 69 // SE_FUUSEN3 +#define SE_BREAKABLE_DOOR 70 // SE_TOY_KABE +#define SE_MUD_BALL 71 // SE_TOY_DANGO +#define SE_FIELD_POISON 72 // SE_DOKU +#define SE_ESCALATOR 73 // SE_ESUKA +#define SE_THUNDERSTORM 74 // SE_T_AME +#define SE_THUNDERSTORM_STOP 75 // SE_T_AME_E +#define SE_DOWNPOUR 76 // SE_T_OOAME +#define SE_DOWNPOUR_STOP 77 // SE_T_OOAME_E +#define SE_RAIN 78 // SE_T_KOAME +#define SE_RAIN_STOP 79 // SE_T_KOAME_E +#define SE_THUNDER 80 // SE_T_KAMI +#define SE_THUNDER2 81 // SE_T_KAMI2 +#define SE_ELEVATOR 82 // SE_ELEBETA +#define SE_LOW_HEALTH 83 // SE_HINSI +#define SE_EXP_MAX 84 // SE_EXPMAX +#define SE_ROULETTE_BALL 85 // SE_TAMAKORO +#define SE_ROULETTE_BALL2 86 // SE_TAMAKORO_E +#define SE_TAILLOW_WING_FLAP 87 // SE_BASABASA +#define SE_RS_SHOP 88 // SE_REGI +#define SE_CONTEST_HEART 89 // SE_C_GAJI +#define SE_CONTEST_CURTAIN_RISE 90 // SE_C_MAKU_U +#define SE_CONTEST_CURTAIN_FALL 91 // SE_C_MAKU_D +#define SE_CONTEST_ICON_CHANGE 92 // SE_C_PASI +#define SE_CONTEST_ICON_CLEAR 93 // SE_C_SYU +#define SE_CONTEST_MONS_TURN 94 // SE_C_PIKON +#define SE_SHINY 95 // SE_REAPOKE +#define SE_INTRO_BLAST 96 // SE_OP_BASYU +#define SE_MUGSHOT 97 // SE_BT_START +#define SE_APPLAUSE 98 // SE_DENDOU +#define SE_VEND 99 // SE_JIHANKI +#define SE_ORB 100 // SE_TAMA +#define SE_DEX_SCROLL 101 // SE_Z_SCROLL +#define SE_DEX_PAGE 102 // SE_Z_PAGE +#define SE_POKENAV_ON 103 // SE_PN_ON +#define SE_POKENAV_OFF 104 // SE_PN_OFF +#define SE_DEX_SEARCH 105 // SE_Z_SEARCH +#define SE_EGG_HATCH 106 // SE_TAMAGO +#define SE_BALL_TRAY_ENTER 107 // SE_TB_START +#define SE_BALL_TRAY_BALL 108 // SE_TB_KON +#define SE_BALL_TRAY_EXIT 109 // SE_TB_KARA +#define SE_GLASS_FLUTE 110 // SE_BIDORO +// Move SFX +#define SE_M_THUNDERBOLT 111 // SE_W085 +#define SE_M_THUNDERBOLT2 112 // SE_W085B +#define SE_M_HARDEN 113 // SE_W231 +#define SE_M_NIGHTMARE 114 // SE_W171 +#define SE_M_VITAL_THROW 115 // SE_W233 +#define SE_M_VITAL_THROW2 116 // SE_W233B +#define SE_M_BUBBLE 117 // SE_W145 +#define SE_M_BUBBLE2 118 // SE_W145B +#define SE_M_BUBBLE3 119 // SE_W145C +#define SE_M_RAIN_DANCE 120 // SE_W240 +#define SE_M_CUT 121 // SE_W015 +#define SE_M_STRING_SHOT 122 // SE_W081 +#define SE_M_STRING_SHOT2 123 // SE_W081B +#define SE_M_ROCK_THROW 124 // SE_W088 +#define SE_M_GUST 125 // SE_W016 +#define SE_M_GUST2 126 // SE_W016B +#define SE_M_DOUBLE_SLAP 127 // SE_W003 +#define SE_M_DOUBLE_TEAM 128 // SE_W104 +#define SE_M_RAZOR_WIND 129 // SE_W013 +#define SE_M_ICY_WIND 130 // SE_W196 +#define SE_M_THUNDER_WAVE 131 // SE_W086 +#define SE_M_COMET_PUNCH 132 // SE_W004 +#define SE_M_MEGA_KICK 133 // SE_W025 +#define SE_M_MEGA_KICK2 134 // SE_W025B +#define SE_M_CRABHAMMER 135 // SE_W152 +#define SE_M_JUMP_KICK 136 // SE_W026 +#define SE_M_FLAME_WHEEL 137 // SE_W172 +#define SE_M_FLAME_WHEEL2 138 // SE_W172B +#define SE_M_FLAMETHROWER 139 // SE_W053 +#define SE_M_FIRE_PUNCH 140 // SE_W007 +#define SE_M_TOXIC 141 // SE_W092 +#define SE_M_SACRED_FIRE 142 // SE_W221 +#define SE_M_SACRED_FIRE2 143 // SE_W221B +#define SE_M_EMBER 144 // SE_W052 +#define SE_M_TAKE_DOWN 145 // SE_W036 +#define SE_M_BLIZZARD 146 // SE_W059 +#define SE_M_BLIZZARD2 147 // SE_W059B +#define SE_M_SCRATCH 148 // SE_W010 +#define SE_M_VICEGRIP 149 // SE_W011 +#define SE_M_WING_ATTACK 150 // SE_W017 +#define SE_M_FLY 151 // SE_W019 +#define SE_M_SAND_ATTACK 152 // SE_W028 +#define SE_M_RAZOR_WIND2 153 // SE_W013B +#define SE_M_BITE 154 // SE_W044 +#define SE_M_HEADBUTT 155 // SE_W029 +#define SE_M_SURF 156 // SE_W057 +#define SE_M_HYDRO_PUMP 157 // SE_W056 +#define SE_M_WHIRLPOOL 158 // SE_W250 +#define SE_M_HORN_ATTACK 159 // SE_W030 +#define SE_M_TAIL_WHIP 160 // SE_W039 +#define SE_M_MIST 161 // SE_W054 +#define SE_M_POISON_POWDER 162 // SE_W077 +#define SE_M_BIND 163 // SE_W020 +#define SE_M_DRAGON_RAGE 164 // SE_W082 +#define SE_M_SING 165 // SE_W047 +#define SE_M_PERISH_SONG 166 // SE_W195 +#define SE_M_PAY_DAY 167 // SE_W006 +#define SE_M_DIG 168 // SE_W091 +#define SE_M_DIZZY_PUNCH 169 // SE_W146 +#define SE_M_SELF_DESTRUCT 170 // SE_W120 +#define SE_M_EXPLOSION 171 // SE_W153 +#define SE_M_ABSORB_2 172 // SE_W071B +#define SE_M_ABSORB 173 // SE_W071 +#define SE_M_SCREECH 174 // SE_W103 +#define SE_M_BUBBLE_BEAM 175 // SE_W062 +#define SE_M_BUBBLE_BEAM2 176 // SE_W062B +#define SE_M_SUPERSONIC 177 // SE_W048 +#define SE_M_BELLY_DRUM 178 // SE_W187 +#define SE_M_METRONOME 179 // SE_W118 +#define SE_M_BONEMERANG 180 // SE_W155 +#define SE_M_LICK 181 // SE_W122 +#define SE_M_PSYBEAM 182 // SE_W060 +#define SE_M_FAINT_ATTACK 183 // SE_W185 +#define SE_M_SWORDS_DANCE 184 // SE_W014 +#define SE_M_LEER 185 // SE_W043 +#define SE_M_SWAGGER 186 // SE_W207 +#define SE_M_SWAGGER2 187 // SE_W207B +#define SE_M_HEAL_BELL 188 // SE_W215 +#define SE_M_CONFUSE_RAY 189 // SE_W109 +#define SE_M_SNORE 190 // SE_W173 +#define SE_M_BRICK_BREAK 191 // SE_W280 +#define SE_M_GIGA_DRAIN 192 // SE_W202 +#define SE_M_PSYBEAM2 193 // SE_W060B +#define SE_M_SOLAR_BEAM 194 // SE_W076 +#define SE_M_PETAL_DANCE 195 // SE_W080 +#define SE_M_TELEPORT 196 // SE_W100 +#define SE_M_MINIMIZE 197 // SE_W107 +#define SE_M_SKETCH 198 // SE_W166 +#define SE_M_SWIFT 199 // SE_W129 +#define SE_M_REFLECT 200 // SE_W115 +#define SE_M_BARRIER 201 // SE_W112 +#define SE_M_DETECT 202 // SE_W197 +#define SE_M_LOCK_ON 203 // SE_W199 +#define SE_M_MOONLIGHT 204 // SE_W236 +#define SE_M_CHARM 205 // SE_W204 +#define SE_M_CHARGE 206 // SE_W268 +#define SE_M_STRENGTH 207 // SE_W070 +#define SE_M_HYPER_BEAM 208 // SE_W063 +#define SE_M_WATERFALL 209 // SE_W127 +#define SE_M_REVERSAL 210 // SE_W179 +#define SE_M_ACID_ARMOR 211 // SE_W151 +#define SE_M_SANDSTORM 212 // SE_W201 +#define SE_M_TRI_ATTACK 213 // SE_W161 +#define SE_M_TRI_ATTACK2 214 // SE_W161B +#define SE_M_ENCORE 215 // SE_W227 +#define SE_M_ENCORE2 216 // SE_W227B +#define SE_M_BATON_PASS 217 // SE_W226 +#define SE_M_MILK_DRINK 218 // SE_W208 +#define SE_M_ATTRACT 219 // SE_W213 +#define SE_M_ATTRACT2 220 // SE_W213B +#define SE_M_MORNING_SUN 221 // SE_W234 +#define SE_M_FLATTER 222 // SE_W260 +#define SE_M_SAND_TOMB 223 // SE_W328 +#define SE_M_GRASSWHISTLE 224 // SE_W320 +#define SE_M_SPIT_UP 225 // SE_W255 +#define SE_M_DIVE 226 // SE_W291 +#define SE_M_EARTHQUAKE 227 // SE_W089 +#define SE_M_TWISTER 228 // SE_W239 +#define SE_M_SWEET_SCENT 229 // SE_W230 +#define SE_M_YAWN 230 // SE_W281 +#define SE_M_SKY_UPPERCUT 231 // SE_W327 +#define SE_M_STAT_INCREASE 232 // SE_W287 +#define SE_M_HEAT_WAVE 233 // SE_W257 +#define SE_M_UPROAR 234 // SE_W253 +#define SE_M_HAIL 235 // SE_W258 +#define SE_M_COSMIC_POWER 236 // SE_W322 +#define SE_M_TEETER_DANCE 237 // SE_W298 +#define SE_M_STAT_DECREASE 238 // SE_W287B +#define SE_M_HAZE 239 // SE_W114 +#define SE_M_HYPER_BEAM2 240 // SE_W063B +// New FRLG SFX +#define SE_DOOR 241 // SE_RG_W_DOOR +#define SE_CARD_FLIP 242 // SE_RG_CARD1 +#define SE_CARD_FLIPPING 243 // SE_RG_CARD2 +#define SE_CARD_OPEN 244 // SE_RG_CARD3 +#define SE_BAG_CURSOR 245 // SE_RG_BAG1 +#define SE_BAG_POCKET 246 // SE_RG_BAG2 +#define SE_BALL_CLICK 247 // SE_RG_GETTING +#define SE_SHOP 248 // SE_RG_SHOP +#define SE_SS_ANNE_HORN 249 // SE_RG_KITEKI +#define SE_HELP_OPEN 250 // SE_RG_HELP_OP +#define SE_HELP_CLOSE 251 // SE_RG_HELP_CL +#define SE_HELP_ERROR 252 // SE_RG_HELP_NG +#define SE_DEOXYS_MOVE 253 // SE_RG_DEOMOV +#define SE_POKE_JUMP_SUCCESS 254 // SE_RG_EXCELLENT +#define SE_POKE_JUMP_FAILURE 255 // SE_RG_NAWAMISS +// Music kept from RS +#define MUS_HEAL 256 // MUS_ME_ASA +#define MUS_LEVEL_UP 257 // MUS_FANFA1 +#define MUS_OBTAIN_ITEM 258 // MUS_FANFA4 +#define MUS_EVOLVED 259 // MUS_FANFA5 +#define MUS_OBTAIN_BADGE 260 // MUS_ME_BACHI +#define MUS_OBTAIN_TMHM 261 // MUS_ME_WAZA +#define MUS_OBTAIN_BERRY 262 // MUS_ME_KINOMI +#define MUS_EVOLUTION_INTRO 263 // MUS_ME_SHINKA +#define MUS_EVOLUTION 264 // MUS_SHINKA +#define MUS_RS_VS_GYM_LEADER 265 // MUS_BATTLE32 +#define MUS_RS_VS_TRAINER 266 // MUS_BATTLE20 +#define MUS_SCHOOL 267 // MUS_P_SCHOOL +#define MUS_SLOTS_JACKPOT 268 // MUS_ME_B_BIG +#define MUS_SLOTS_WIN 269 // MUS_ME_B_SMALL +#define MUS_MOVE_DELETED 270 // MUS_ME_WASURE +#define MUS_TOO_BAD 271 // MUS_ME_ZANNEN +// New FRLG Music +#define MUS_FOLLOW_ME 272 // MUS_RG_ANNAI +#define MUS_GAME_CORNER 273 // MUS_RG_SLOT +#define MUS_ROCKET_HIDEOUT 274 // MUS_RG_AJITO +#define MUS_GYM 275 // MUS_RG_GYM +#define MUS_JIGGLYPUFF 276 // MUS_RG_PURIN +#define MUS_INTRO_FIGHT 277 // MUS_RG_DEMO +#define MUS_TITLE 278 // MUS_RG_TITLE +#define MUS_CINNABAR 279 // MUS_RG_GUREN +#define MUS_LAVENDER 280 // MUS_RG_SHION +#define MUS_HEAL_UNUSED 281 // MUS_RG_KAIHUKU +#define MUS_CYCLING 282 // MUS_RG_CYCLING +#define MUS_ENCOUNTER_ROCKET 283 // MUS_RG_ROCKET +#define MUS_ENCOUNTER_GIRL 284 // MUS_RG_SHOUJO +#define MUS_ENCOUNTER_BOY 285 // MUS_RG_SHOUNEN +#define MUS_HALL_OF_FAME 286 // MUS_RG_DENDOU +#define MUS_VIRIDIAN_FOREST 287 // MUS_RG_T_MORI +#define MUS_MT_MOON 288 // MUS_RG_OTSUKIMI +#define MUS_POKE_MANSION 289 // MUS_RG_POKEYASHI +#define MUS_CREDITS 290 // MUS_RG_ENDING +#define MUS_ROUTE1 291 // MUS_RG_LOAD01 +#define MUS_ROUTE24 292 // MUS_RG_OPENING +#define MUS_ROUTE3 293 // MUS_RG_LOAD02 +#define MUS_ROUTE11 294 // MUS_RG_LOAD03 +#define MUS_VICTORY_ROAD 295 // MUS_RG_CHAMP_R +#define MUS_VS_GYM_LEADER 296 // MUS_RG_VS_GYM +#define MUS_VS_TRAINER 297 // MUS_RG_VS_TORE +#define MUS_VS_WILD 298 // MUS_RG_VS_YASEI +#define MUS_VS_CHAMPION 299 // MUS_RG_VS_LAST +#define MUS_PALLET 300 // MUS_RG_MASARA +#define MUS_OAK_LAB 301 // MUS_RG_KENKYU +#define MUS_OAK 302 // MUS_RG_OHKIDO +#define MUS_POKE_CENTER 303 // MUS_RG_POKECEN +#define MUS_SS_ANNE 304 // MUS_RG_SANTOAN +#define MUS_SURF 305 // MUS_RG_NAMINORI +#define MUS_POKE_TOWER 306 // MUS_RG_P_TOWER +#define MUS_SILPH 307 // MUS_RG_SHIRUHU +#define MUS_FUCHSIA 308 // MUS_RG_HANADA +#define MUS_CELADON 309 // MUS_RG_TAMAMUSI +#define MUS_VICTORY_TRAINER 310 // MUS_RG_WIN_TRE +#define MUS_VICTORY_WILD 311 // MUS_RG_WIN_YASEI +#define MUS_VICTORY_GYM_LEADER 312 // MUS_RG_WIN_GYM +#define MUS_VERMILLION 313 // MUS_RG_KUCHIBA +#define MUS_PEWTER 314 // MUS_RG_NIBI +#define MUS_ENCOUNTER_RIVAL 315 // MUS_RG_RIVAL1 +#define MUS_RIVAL_EXIT 316 // MUS_RG_RIVAL2 +#define MUS_DEX_RATING 317 // MUS_RG_FAN2 +#define MUS_OBTAIN_KEY_ITEM 318 // MUS_RG_FAN5 +#define MUS_CAUGHT_INTRO 319 // MUS_RG_FAN6 +#define MUS_PHOTO 320 // MUS_ME_RG_PHOTO +#define MUS_GAME_FREAK 321 // MUS_RG_TITLEROG +#define MUS_CAUGHT 322 // MUS_RG_GET_YASEI +#define MUS_NEW_GAME_INSTRUCT 323 // MUS_RG_SOUSA +#define MUS_NEW_GAME_INTRO 324 // MUS_RG_SEKAIKAN +#define MUS_NEW_GAME_EXIT 325 // MUS_RG_SEIBETU +#define MUS_POKE_JUMP 326 // MUS_RG_JUMP +#define MUS_UNION_ROOM 327 // MUS_RG_UNION +#define MUS_NET_CENTER 328 // MUS_RG_NETWORK +#define MUS_MYSTERY_GIFT 329 // MUS_RG_OKURIMONO +#define MUS_BERRY_PICK 330 // MUS_RG_KINOMIKUI +#define MUS_SEVII_CAVE 331 // MUS_RG_NANADUNGEON +#define MUS_TEACHY_TV_SHOW 332 // MUS_RG_OSHIE_TV +#define MUS_SEVII_ROUTE 333 // MUS_RG_NANASHIMA +#define MUS_SEVII_DUNGEON 334 // MUS_RG_NANAISEKI +#define MUS_SEVII_123 335 // MUS_RG_NANA123 +#define MUS_SEVII_45 336 // MUS_RG_NANA45 +#define MUS_SEVII_67 337 // MUS_RG_NANA67 +#define MUS_POKE_FLUTE 338 // MUS_RG_POKEFUE +#define MUS_VS_DEOXYS 339 // MUS_RG_VS_DEO +#define MUS_VS_MEWTWO 340 // MUS_RG_VS_MYU2 +#define MUS_VS_LEGEND 341 // MUS_RG_VS_DEN +#define MUS_ENCOUNTER_GYM_LEADER 342 // MUS_RG_EXEYE +#define MUS_ENCOUNTER_DEOXYS 343 // MUS_RG_DEOEYE +#define MUS_TRAINER_TOWER 344 // MUS_RG_T_TOWER +#define MUS_SLOW_PALLET 345 // MUS_RG_SLOWMASARA +#define MUS_TEACHY_TV_MENU 346 // MUS_RG_TVNOIZE #endif // GUARD_CONSTANTS_SONGS_H diff --git a/include/m4a.h b/include/m4a.h index b67dd0492..fd3701e14 100644 --- a/include/m4a.h +++ b/include/m4a.h @@ -25,6 +25,6 @@ void m4aMPlayFadeOutTemporarily(struct MusicPlayerInfo *mplayInfo, u16 speed); void m4aMPlayFadeIn(struct MusicPlayerInfo *mplayInfo, u16 speed); void m4aMPlayImmInit(struct MusicPlayerInfo *mplayInfo); -extern const struct SongHeader mus_win_gym; +extern const struct SongHeader mus_victory_gym_leader; #endif //GUARD_M4A_H diff --git a/ld_script.txt b/ld_script.txt index 2626da3ff..edb87180b 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -628,352 +628,352 @@ SECTIONS { ALIGN(4) { sound/songs/midi/mus_dummy.o(.rodata); - sound/songs/midi/se_kaifuku.o(.rodata); + sound/songs/midi/se_use_item.o(.rodata); sound/songs/midi/se_pc_login.o(.rodata); sound/songs/midi/se_pc_off.o(.rodata); sound/songs/midi/se_pc_on.o(.rodata); sound/songs/midi/se_select.o(.rodata); sound/songs/se_win_open.o(.rodata); sound/songs/se_wall_hit.o(.rodata); - sound/songs/midi/se_door.o(.rodata); - sound/songs/midi/se_kaidan.o(.rodata); - sound/songs/midi/se_dansa.o(.rodata); - sound/songs/midi/se_jitensya.o(.rodata); - sound/songs/midi/se_kouka_l.o(.rodata); - sound/songs/midi/se_kouka_m.o(.rodata); - sound/songs/midi/se_kouka_h.o(.rodata); - sound/songs/midi/se_bowa2.o(.rodata); - sound/songs/midi/se_poke_dead.o(.rodata); - sound/songs/midi/se_nigeru.o(.rodata); - sound/songs/midi/se_jido_doa.o(.rodata); - sound/songs/midi/se_naminori.o(.rodata); - sound/songs/midi/se_ban.o(.rodata); + sound/songs/midi/se_rs_door.o(.rodata); + sound/songs/midi/se_exit.o(.rodata); + sound/songs/midi/se_ledge.o(.rodata); + sound/songs/midi/se_bike_bell.o(.rodata); + sound/songs/midi/se_not_effective.o(.rodata); + sound/songs/midi/se_effective.o(.rodata); + sound/songs/midi/se_super_effective.o(.rodata); + sound/songs/midi/se_ball_open.o(.rodata); + sound/songs/midi/se_faint.o(.rodata); + sound/songs/midi/se_flee.o(.rodata); + sound/songs/midi/se_sliding_door.o(.rodata); + sound/songs/midi/se_ship.o(.rodata); + sound/songs/midi/se_bang.o(.rodata); sound/songs/midi/se_pin.o(.rodata); sound/songs/midi/se_boo.o(.rodata); - sound/songs/midi/se_bowa.o(.rodata); - sound/songs/midi/se_jyuni.o(.rodata); - sound/songs/midi/se_seikai.o(.rodata); - sound/songs/midi/se_hazure.o(.rodata); + sound/songs/midi/se_ball.o(.rodata); + sound/songs/midi/se_contest_place.o(.rodata); + sound/songs/midi/se_success.o(.rodata); + sound/songs/midi/se_failure.o(.rodata); sound/songs/midi/se_exp.o(.rodata); - sound/songs/midi/se_jite_pyoko.o(.rodata); - sound/songs/midi/se_mu_pachi.o(.rodata); - sound/songs/midi/se_tk_kasya.o(.rodata); + sound/songs/midi/se_bike_hop.o(.rodata); + sound/songs/midi/se_switch.o(.rodata); + sound/songs/midi/se_click.o(.rodata); sound/songs/midi/se_fu_zaku.o(.rodata); - sound/songs/midi/se_fu_zaku2.o(.rodata); - sound/songs/midi/se_fu_zuzuzu.o(.rodata); - sound/songs/midi/se_ru_gashin.o(.rodata); - sound/songs/midi/se_ru_gasyan.o(.rodata); - sound/songs/midi/se_ru_bari.o(.rodata); - sound/songs/midi/se_ru_hyuu.o(.rodata); - sound/songs/midi/se_ki_gasyan.o(.rodata); - sound/songs/midi/se_tk_warpin.o(.rodata); - sound/songs/midi/se_tk_warpout.o(.rodata); - sound/songs/midi/se_tu_saa.o(.rodata); - sound/songs/midi/se_hi_turun.o(.rodata); - sound/songs/midi/se_track_move.o(.rodata); - sound/songs/midi/se_track_stop.o(.rodata); - sound/songs/midi/se_track_haiki.o(.rodata); - sound/songs/midi/se_track_door.o(.rodata); - sound/songs/midi/se_moter.o(.rodata); + sound/songs/midi/se_contest_condition_lose.o(.rodata); + sound/songs/midi/se_lavaridge_fall_warp.o(.rodata); + sound/songs/midi/se_ice_stairs.o(.rodata); + sound/songs/midi/se_ice_break.o(.rodata); + sound/songs/midi/se_ice_crack.o(.rodata); + sound/songs/midi/se_fall.o(.rodata); + sound/songs/midi/se_unlock.o(.rodata); + sound/songs/midi/se_warp_in.o(.rodata); + sound/songs/midi/se_warp_out.o(.rodata); + sound/songs/midi/se_repel.o(.rodata); + sound/songs/midi/se_rotating_gate.o(.rodata); + sound/songs/midi/se_truck_move.o(.rodata); + sound/songs/midi/se_truck_stop.o(.rodata); + sound/songs/midi/se_truck_unload.o(.rodata); + sound/songs/midi/se_truck_door.o(.rodata); + sound/songs/midi/se_berry_blender.o(.rodata); sound/songs/midi/se_save.o(.rodata); - sound/songs/midi/se_kon.o(.rodata); - sound/songs/midi/se_kon2.o(.rodata); - sound/songs/midi/se_kon3.o(.rodata); - sound/songs/midi/se_kon4.o(.rodata); - sound/songs/midi/se_suikomu.o(.rodata); - sound/songs/midi/se_nageru.o(.rodata); - sound/songs/midi/se_toy_c.o(.rodata); - sound/songs/midi/se_toy_d.o(.rodata); - sound/songs/midi/se_toy_e.o(.rodata); - sound/songs/midi/se_toy_f.o(.rodata); - sound/songs/midi/se_toy_g.o(.rodata); - sound/songs/midi/se_toy_a.o(.rodata); - sound/songs/midi/se_toy_b.o(.rodata); - sound/songs/midi/se_toy_c1.o(.rodata); - sound/songs/midi/se_mizu.o(.rodata); - sound/songs/midi/se_hashi.o(.rodata); - sound/songs/midi/se_daugi.o(.rodata); - sound/songs/midi/se_pinpon.o(.rodata); - sound/songs/midi/se_fuusen1.o(.rodata); - sound/songs/midi/se_fuusen2.o(.rodata); - sound/songs/midi/se_fuusen3.o(.rodata); - sound/songs/midi/se_toy_kabe.o(.rodata); - sound/songs/midi/se_toy_dango.o(.rodata); - sound/songs/midi/se_doku.o(.rodata); - sound/songs/midi/se_esuka.o(.rodata); - sound/songs/midi/se_t_ame.o(.rodata); - sound/songs/midi/se_t_ame_e.o(.rodata); - sound/songs/midi/se_t_ooame.o(.rodata); - sound/songs/midi/se_t_ooame_e.o(.rodata); - sound/songs/midi/se_t_koame.o(.rodata); - sound/songs/midi/se_t_koame_e.o(.rodata); - sound/songs/midi/se_t_kami.o(.rodata); - sound/songs/midi/se_t_kami2.o(.rodata); - sound/songs/midi/se_elebeta.o(.rodata); - sound/songs/midi/se_hinsi.o(.rodata); - sound/songs/midi/se_expmax.o(.rodata); - sound/songs/midi/se_tamakoro.o(.rodata); - sound/songs/midi/se_tamakoro_e.o(.rodata); - sound/songs/midi/se_basabasa.o(.rodata); - sound/songs/midi/se_regi.o(.rodata); - sound/songs/midi/se_c_gaji.o(.rodata); - sound/songs/midi/se_c_maku_u.o(.rodata); - sound/songs/midi/se_c_maku_d.o(.rodata); - sound/songs/midi/se_c_pasi.o(.rodata); - sound/songs/midi/se_c_syu.o(.rodata); - sound/songs/midi/se_c_pikon.o(.rodata); - sound/songs/midi/se_reapoke.o(.rodata); - sound/songs/midi/se_op_basyu.o(.rodata); - sound/songs/midi/se_bt_start.o(.rodata); - sound/songs/midi/se_dendou.o(.rodata); - sound/songs/midi/se_jihanki.o(.rodata); - sound/songs/midi/se_tama.o(.rodata); - sound/songs/se_z_scroll.o(.rodata); - sound/songs/se_z_page.o(.rodata); - sound/songs/midi/se_pn_on.o(.rodata); - sound/songs/midi/se_pn_off.o(.rodata); - sound/songs/midi/se_z_search.o(.rodata); - sound/songs/midi/se_tamago.o(.rodata); - sound/songs/midi/se_tb_start.o(.rodata); - sound/songs/midi/se_tb_kon.o(.rodata); - sound/songs/midi/se_tb_kara.o(.rodata); - sound/songs/midi/se_bidoro.o(.rodata); - sound/songs/se_w085.o(.rodata); - sound/songs/se_w085b.o(.rodata); - sound/songs/se_w231.o(.rodata); - sound/songs/se_w171.o(.rodata); - sound/songs/se_w233.o(.rodata); - sound/songs/se_w233b.o(.rodata); - sound/songs/se_w145.o(.rodata); - sound/songs/se_w145b.o(.rodata); - sound/songs/se_w145c.o(.rodata); - sound/songs/se_w240.o(.rodata); - sound/songs/midi/se_w015.o(.rodata); - sound/songs/se_w081.o(.rodata); - sound/songs/se_w081b.o(.rodata); - sound/songs/se_w088.o(.rodata); - sound/songs/midi/se_w016.o(.rodata); - sound/songs/midi/se_w016b.o(.rodata); - sound/songs/midi/se_w003.o(.rodata); - sound/songs/se_w104.o(.rodata); - sound/songs/midi/se_w013.o(.rodata); - sound/songs/se_w196.o(.rodata); - sound/songs/se_w086.o(.rodata); - sound/songs/midi/se_w004.o(.rodata); - sound/songs/midi/se_w025.o(.rodata); - sound/songs/midi/se_w025b.o(.rodata); - sound/songs/se_w152.o(.rodata); - sound/songs/midi/se_w026.o(.rodata); - sound/songs/se_w172.o(.rodata); - sound/songs/se_w172b.o(.rodata); - sound/songs/se_w053.o(.rodata); - sound/songs/midi/se_w007.o(.rodata); - sound/songs/se_w092.o(.rodata); - sound/songs/se_w221.o(.rodata); - sound/songs/se_w221b.o(.rodata); - sound/songs/se_w052.o(.rodata); - sound/songs/midi/se_w036.o(.rodata); - sound/songs/se_w059.o(.rodata); - sound/songs/se_w059b.o(.rodata); - sound/songs/midi/se_w010.o(.rodata); - sound/songs/midi/se_w011.o(.rodata); - sound/songs/midi/se_w017.o(.rodata); - sound/songs/midi/se_w019.o(.rodata); - sound/songs/midi/se_w028.o(.rodata); - sound/songs/midi/se_w013b.o(.rodata); - sound/songs/se_w044.o(.rodata); - sound/songs/midi/se_w029.o(.rodata); - sound/songs/se_w057.o(.rodata); - sound/songs/se_w056.o(.rodata); - sound/songs/se_w250.o(.rodata); - sound/songs/midi/se_w030.o(.rodata); - sound/songs/midi/se_w039.o(.rodata); - sound/songs/se_w054.o(.rodata); - sound/songs/se_w077.o(.rodata); - sound/songs/midi/se_w020.o(.rodata); - sound/songs/se_w082.o(.rodata); - sound/songs/se_w047.o(.rodata); - sound/songs/se_w195.o(.rodata); - sound/songs/midi/se_w006.o(.rodata); - sound/songs/se_w091.o(.rodata); - sound/songs/se_w146.o(.rodata); - sound/songs/se_w120.o(.rodata); - sound/songs/se_w153.o(.rodata); - sound/songs/se_w071b.o(.rodata); - sound/songs/se_w071.o(.rodata); - sound/songs/se_w103.o(.rodata); - sound/songs/se_w062.o(.rodata); - sound/songs/se_w062b.o(.rodata); - sound/songs/se_w048.o(.rodata); - sound/songs/se_w187.o(.rodata); - sound/songs/se_w118.o(.rodata); - sound/songs/se_w155.o(.rodata); - sound/songs/se_w122.o(.rodata); - sound/songs/se_w060.o(.rodata); - sound/songs/se_w185.o(.rodata); - sound/songs/midi/se_w014.o(.rodata); - sound/songs/midi/se_w043.o(.rodata); - sound/songs/se_w207.o(.rodata); - sound/songs/se_w207b.o(.rodata); - sound/songs/se_w215.o(.rodata); - sound/songs/se_w109.o(.rodata); - sound/songs/se_w173.o(.rodata); - sound/songs/se_w280.o(.rodata); - sound/songs/se_w202.o(.rodata); - sound/songs/se_w060b.o(.rodata); - sound/songs/se_w076.o(.rodata); - sound/songs/se_w080.o(.rodata); - sound/songs/se_w100.o(.rodata); - sound/songs/se_w107.o(.rodata); - sound/songs/se_w166.o(.rodata); - sound/songs/se_w129.o(.rodata); - sound/songs/se_w115.o(.rodata); - sound/songs/se_w112.o(.rodata); - sound/songs/se_w197.o(.rodata); - sound/songs/se_w199.o(.rodata); - sound/songs/se_w236.o(.rodata); - sound/songs/se_w204.o(.rodata); - sound/songs/se_w268.o(.rodata); - sound/songs/se_w070.o(.rodata); - sound/songs/se_w063.o(.rodata); - sound/songs/se_w127.o(.rodata); - sound/songs/se_w179.o(.rodata); - sound/songs/se_w151.o(.rodata); - sound/songs/se_w201.o(.rodata); - sound/songs/se_w161.o(.rodata); - sound/songs/se_w161b.o(.rodata); - sound/songs/se_w227.o(.rodata); - sound/songs/se_w227b.o(.rodata); - sound/songs/se_w226.o(.rodata); - sound/songs/se_w208.o(.rodata); - sound/songs/se_w213.o(.rodata); - sound/songs/se_w213b.o(.rodata); - sound/songs/se_w234.o(.rodata); - sound/songs/se_w260.o(.rodata); - sound/songs/se_w328.o(.rodata); - sound/songs/se_w320.o(.rodata); - sound/songs/se_w255.o(.rodata); - sound/songs/se_w291.o(.rodata); - sound/songs/se_w089.o(.rodata); - sound/songs/se_w239.o(.rodata); - sound/songs/se_w230.o(.rodata); - sound/songs/se_w281.o(.rodata); - sound/songs/se_w327.o(.rodata); - sound/songs/se_w287.o(.rodata); - sound/songs/se_w257.o(.rodata); - sound/songs/se_w253.o(.rodata); - sound/songs/se_w258.o(.rodata); - sound/songs/se_w322.o(.rodata); - sound/songs/se_w298.o(.rodata); - sound/songs/se_w287b.o(.rodata); - sound/songs/se_w114.o(.rodata); - sound/songs/se_w063b.o(.rodata); - sound/songs/midi/mus_w_door.o(.rodata); - sound/songs/se_card1.o(.rodata); - sound/songs/se_card2.o(.rodata); - sound/songs/se_card3.o(.rodata); - sound/songs/se_bag1.o(.rodata); - sound/songs/se_bag2.o(.rodata); - sound/songs/se_getting.o(.rodata); + sound/songs/midi/se_ball_bounce_1.o(.rodata); + sound/songs/midi/se_ball_bounce_2.o(.rodata); + sound/songs/midi/se_ball_bounce_3.o(.rodata); + sound/songs/midi/se_ball_bounce_4.o(.rodata); + sound/songs/midi/se_ball_trade.o(.rodata); + sound/songs/midi/se_ball_throw.o(.rodata); + sound/songs/midi/se_note_c.o(.rodata); + sound/songs/midi/se_note_d.o(.rodata); + sound/songs/midi/se_note_e.o(.rodata); + sound/songs/midi/se_note_f.o(.rodata); + sound/songs/midi/se_note_g.o(.rodata); + sound/songs/midi/se_note_a.o(.rodata); + sound/songs/midi/se_note_b.o(.rodata); + sound/songs/midi/se_note_c_high.o(.rodata); + sound/songs/midi/se_puddle.o(.rodata); + sound/songs/midi/se_bridge_walk.o(.rodata); + sound/songs/midi/se_itemfinder.o(.rodata); + sound/songs/midi/se_ding_dong.o(.rodata); + sound/songs/midi/se_balloon_red.o(.rodata); + sound/songs/midi/se_balloon_blue.o(.rodata); + sound/songs/midi/se_balloon_yellow.o(.rodata); + sound/songs/midi/se_breakable_door.o(.rodata); + sound/songs/midi/se_mud_ball.o(.rodata); + sound/songs/midi/se_field_poison.o(.rodata); + sound/songs/midi/se_escalator.o(.rodata); + sound/songs/midi/se_thunderstorm.o(.rodata); + sound/songs/midi/se_thunderstorm_stop.o(.rodata); + sound/songs/midi/se_downpour.o(.rodata); + sound/songs/midi/se_downpour_stop.o(.rodata); + sound/songs/midi/se_rain.o(.rodata); + sound/songs/midi/se_rain_stop.o(.rodata); + sound/songs/midi/se_thunder.o(.rodata); + sound/songs/midi/se_thunder2.o(.rodata); + sound/songs/midi/se_elevator.o(.rodata); + sound/songs/midi/se_low_health.o(.rodata); + sound/songs/midi/se_exp_max.o(.rodata); + sound/songs/midi/se_roulette_ball.o(.rodata); + sound/songs/midi/se_roulette_ball2.o(.rodata); + sound/songs/midi/se_taillow_wing_flap.o(.rodata); + sound/songs/midi/se_rs_shop.o(.rodata); + sound/songs/midi/se_contest_heart.o(.rodata); + sound/songs/midi/se_contest_curtain_rise.o(.rodata); + sound/songs/midi/se_contest_curtain_fall.o(.rodata); + sound/songs/midi/se_contest_icon_change.o(.rodata); + sound/songs/midi/se_contest_icon_clear.o(.rodata); + sound/songs/midi/se_contest_mons_turn.o(.rodata); + sound/songs/midi/se_shiny.o(.rodata); + sound/songs/midi/se_intro_blast.o(.rodata); + sound/songs/midi/se_mugshot.o(.rodata); + sound/songs/midi/se_applause.o(.rodata); + sound/songs/midi/se_vend.o(.rodata); + sound/songs/midi/se_orb.o(.rodata); + sound/songs/se_dex_scroll.o(.rodata); + sound/songs/se_dex_page.o(.rodata); + sound/songs/midi/se_pokenav_on.o(.rodata); + sound/songs/midi/se_pokenav_off.o(.rodata); + sound/songs/midi/se_dex_search.o(.rodata); + sound/songs/midi/se_egg_hatch.o(.rodata); + sound/songs/midi/se_ball_tray_enter.o(.rodata); + sound/songs/midi/se_ball_tray_ball.o(.rodata); + sound/songs/midi/se_ball_tray_exit.o(.rodata); + sound/songs/midi/se_glass_flute.o(.rodata); + sound/songs/se_m_thunderbolt.o(.rodata); + sound/songs/se_m_thunderbolt2.o(.rodata); + sound/songs/se_m_harden.o(.rodata); + sound/songs/se_m_nightmare.o(.rodata); + sound/songs/se_m_vital_throw.o(.rodata); + sound/songs/se_m_vital_throw2.o(.rodata); + sound/songs/se_m_bubble.o(.rodata); + sound/songs/se_m_bubble2.o(.rodata); + sound/songs/se_m_bubble3.o(.rodata); + sound/songs/se_m_rain_dance.o(.rodata); + sound/songs/midi/se_m_cut.o(.rodata); + sound/songs/se_m_string_shot.o(.rodata); + sound/songs/se_m_string_shot2.o(.rodata); + sound/songs/se_m_rock_throw.o(.rodata); + sound/songs/midi/se_m_gust.o(.rodata); + sound/songs/midi/se_m_gust2.o(.rodata); + sound/songs/midi/se_m_double_slap.o(.rodata); + sound/songs/se_m_double_team.o(.rodata); + sound/songs/midi/se_m_razor_wind.o(.rodata); + sound/songs/se_m_icy_wind.o(.rodata); + sound/songs/se_m_thunder_wave.o(.rodata); + sound/songs/midi/se_m_comet_punch.o(.rodata); + sound/songs/midi/se_m_mega_kick.o(.rodata); + sound/songs/midi/se_m_mega_kick2.o(.rodata); + sound/songs/se_m_crabhammer.o(.rodata); + sound/songs/midi/se_m_jump_kick.o(.rodata); + sound/songs/se_m_flame_wheel.o(.rodata); + sound/songs/se_m_flame_wheel2.o(.rodata); + sound/songs/se_m_flamethrower.o(.rodata); + sound/songs/midi/se_m_fire_punch.o(.rodata); + sound/songs/se_m_toxic.o(.rodata); + sound/songs/se_m_sacred_fire.o(.rodata); + sound/songs/se_m_sacred_fire2.o(.rodata); + sound/songs/se_m_ember.o(.rodata); + sound/songs/midi/se_m_take_down.o(.rodata); + sound/songs/se_m_blizzard.o(.rodata); + sound/songs/se_m_blizzard2.o(.rodata); + sound/songs/midi/se_m_scratch.o(.rodata); + sound/songs/midi/se_m_vicegrip.o(.rodata); + sound/songs/midi/se_m_wing_attack.o(.rodata); + sound/songs/midi/se_m_fly.o(.rodata); + sound/songs/midi/se_m_sand_attack.o(.rodata); + sound/songs/midi/se_m_razor_wind2.o(.rodata); + sound/songs/se_m_bite.o(.rodata); + sound/songs/midi/se_m_headbutt.o(.rodata); + sound/songs/se_m_surf.o(.rodata); + sound/songs/se_m_hydro_pump.o(.rodata); + sound/songs/se_m_whirlpool.o(.rodata); + sound/songs/midi/se_m_horn_attack.o(.rodata); + sound/songs/midi/se_m_tail_whip.o(.rodata); + sound/songs/se_m_mist.o(.rodata); + sound/songs/se_m_poison_powder.o(.rodata); + sound/songs/midi/se_m_bind.o(.rodata); + sound/songs/se_m_dragon_rage.o(.rodata); + sound/songs/se_m_sing.o(.rodata); + sound/songs/se_m_perish_song.o(.rodata); + sound/songs/midi/se_m_pay_day.o(.rodata); + sound/songs/se_m_dig.o(.rodata); + sound/songs/se_m_dizzy_punch.o(.rodata); + sound/songs/se_m_self_destruct.o(.rodata); + sound/songs/se_m_explosion.o(.rodata); + sound/songs/se_m_absorb_2.o(.rodata); + sound/songs/se_m_absorb.o(.rodata); + sound/songs/se_m_screech.o(.rodata); + sound/songs/se_m_bubble_beam.o(.rodata); + sound/songs/se_m_bubble_beam2.o(.rodata); + sound/songs/se_m_supersonic.o(.rodata); + sound/songs/se_m_belly_drum.o(.rodata); + sound/songs/se_m_metronome.o(.rodata); + sound/songs/se_m_bonemerang.o(.rodata); + sound/songs/se_m_lick.o(.rodata); + sound/songs/se_m_psybeam.o(.rodata); + sound/songs/se_m_faint_attack.o(.rodata); + sound/songs/midi/se_m_swords_dance.o(.rodata); + sound/songs/midi/se_m_leer.o(.rodata); + sound/songs/se_m_swagger.o(.rodata); + sound/songs/se_m_swagger2.o(.rodata); + sound/songs/se_m_heal_bell.o(.rodata); + sound/songs/se_m_confuse_ray.o(.rodata); + sound/songs/se_m_snore.o(.rodata); + sound/songs/se_m_brick_break.o(.rodata); + sound/songs/se_m_giga_drain.o(.rodata); + sound/songs/se_m_psybeam2.o(.rodata); + sound/songs/se_m_solar_beam.o(.rodata); + sound/songs/se_m_petal_dance.o(.rodata); + sound/songs/se_m_teleport.o(.rodata); + sound/songs/se_m_minimize.o(.rodata); + sound/songs/se_m_sketch.o(.rodata); + sound/songs/se_m_swift.o(.rodata); + sound/songs/se_m_reflect.o(.rodata); + sound/songs/se_m_barrier.o(.rodata); + sound/songs/se_m_detect.o(.rodata); + sound/songs/se_m_lock_on.o(.rodata); + sound/songs/se_m_moonlight.o(.rodata); + sound/songs/se_m_charm.o(.rodata); + sound/songs/se_m_charge.o(.rodata); + sound/songs/se_m_strength.o(.rodata); + sound/songs/se_m_hyper_beam.o(.rodata); + sound/songs/se_m_waterfall.o(.rodata); + sound/songs/se_m_reversal.o(.rodata); + sound/songs/se_m_acid_armor.o(.rodata); + sound/songs/se_m_sandstorm.o(.rodata); + sound/songs/se_m_tri_attack.o(.rodata); + sound/songs/se_m_tri_attack2.o(.rodata); + sound/songs/se_m_encore.o(.rodata); + sound/songs/se_m_encore2.o(.rodata); + sound/songs/se_m_baton_pass.o(.rodata); + sound/songs/se_m_milk_drink.o(.rodata); + sound/songs/se_m_attract.o(.rodata); + sound/songs/se_m_attract2.o(.rodata); + sound/songs/se_m_morning_sun.o(.rodata); + sound/songs/se_m_flatter.o(.rodata); + sound/songs/se_m_sand_tomb.o(.rodata); + sound/songs/se_m_grasswhistle.o(.rodata); + sound/songs/se_m_spit_up.o(.rodata); + sound/songs/se_m_dive.o(.rodata); + sound/songs/se_m_earthquake.o(.rodata); + sound/songs/se_m_twister.o(.rodata); + sound/songs/se_m_sweet_scent.o(.rodata); + sound/songs/se_m_yawn.o(.rodata); + sound/songs/se_m_sky_uppercut.o(.rodata); + sound/songs/se_m_stat_increase.o(.rodata); + sound/songs/se_m_heat_wave.o(.rodata); + sound/songs/se_m_uproar.o(.rodata); + sound/songs/se_m_hail.o(.rodata); + sound/songs/se_m_cosmic_power.o(.rodata); + sound/songs/se_m_teeter_dance.o(.rodata); + sound/songs/se_m_stat_decrease.o(.rodata); + sound/songs/se_m_haze.o(.rodata); + sound/songs/se_m_hyper_beam2.o(.rodata); + sound/songs/midi/se_door.o(.rodata); + sound/songs/se_card_flip.o(.rodata); + sound/songs/se_card_flipping.o(.rodata); + sound/songs/se_card_open.o(.rodata); + sound/songs/se_bag_cursor.o(.rodata); + sound/songs/se_bag_pocket.o(.rodata); + sound/songs/se_ball_click.o(.rodata); sound/songs/se_shop.o(.rodata); - sound/songs/se_kiteki.o(.rodata); - sound/songs/se_help_op.o(.rodata); - sound/songs/se_help_cl.o(.rodata); - sound/songs/se_help_ng.o(.rodata); - sound/songs/se_deomov.o(.rodata); - sound/songs/se_excellent.o(.rodata); - sound/songs/se_nawamiss.o(.rodata); - sound/songs/midi/mus_me_asa.o(.rodata); - sound/songs/midi/mus_fanfa1.o(.rodata); - sound/songs/midi/mus_fanfa4.o(.rodata); - sound/songs/midi/mus_fanfa5.o(.rodata); - sound/songs/midi/mus_me_bachi.o(.rodata); - sound/songs/midi/mus_me_waza.o(.rodata); - sound/songs/midi/mus_me_kinomi.o(.rodata); - sound/songs/midi/mus_me_shinka.o(.rodata); - sound/songs/midi/mus_shinka.o(.rodata); - sound/songs/midi/mus_battle32.o(.rodata); - sound/songs/midi/mus_battle20.o(.rodata); - sound/songs/midi/mus_p_school.o(.rodata); - sound/songs/midi/mus_me_b_big.o(.rodata); - sound/songs/midi/mus_me_b_small.o(.rodata); - sound/songs/midi/mus_me_wasure.o(.rodata); - sound/songs/midi/mus_me_zannen.o(.rodata); - sound/songs/midi/mus_annai.o(.rodata); - sound/songs/midi/mus_slot.o(.rodata); - sound/songs/midi/mus_ajito.o(.rodata); + sound/songs/se_ss_anne_horn.o(.rodata); + sound/songs/se_help_open.o(.rodata); + sound/songs/se_help_close.o(.rodata); + sound/songs/se_help_error.o(.rodata); + sound/songs/se_deoxys_move.o(.rodata); + sound/songs/se_poke_jump_success.o(.rodata); + sound/songs/se_poke_jump_failure.o(.rodata); + sound/songs/midi/mus_heal.o(.rodata); + sound/songs/midi/mus_level_up.o(.rodata); + sound/songs/midi/mus_obtain_item.o(.rodata); + sound/songs/midi/mus_evolved.o(.rodata); + sound/songs/midi/mus_obtain_badge.o(.rodata); + sound/songs/midi/mus_obtain_tmhm.o(.rodata); + sound/songs/midi/mus_obtain_berry.o(.rodata); + sound/songs/midi/mus_evolution_intro.o(.rodata); + sound/songs/midi/mus_evolution.o(.rodata); + sound/songs/midi/mus_rs_vs_gym_leader.o(.rodata); + sound/songs/midi/mus_rs_vs_trainer.o(.rodata); + sound/songs/midi/mus_school.o(.rodata); + sound/songs/midi/mus_slots_jackpot.o(.rodata); + sound/songs/midi/mus_slots_win.o(.rodata); + sound/songs/midi/mus_move_deleted.o(.rodata); + sound/songs/midi/mus_too_bad.o(.rodata); + sound/songs/midi/mus_follow_me.o(.rodata); + sound/songs/midi/mus_game_corner.o(.rodata); + sound/songs/midi/mus_rocket_hideout.o(.rodata); sound/songs/midi/mus_gym.o(.rodata); - sound/songs/midi/mus_purin.o(.rodata); - sound/songs/midi/mus_demo.o(.rodata); + sound/songs/midi/mus_jigglypuff.o(.rodata); + sound/songs/midi/mus_intro_fight.o(.rodata); sound/songs/midi/mus_title.o(.rodata); - sound/songs/midi/mus_guren.o(.rodata); - sound/songs/midi/mus_shion.o(.rodata); - sound/songs/midi/mus_kaihuku.o(.rodata); + sound/songs/midi/mus_cinnabar.o(.rodata); + sound/songs/midi/mus_lavender.o(.rodata); + sound/songs/midi/mus_heal_unused.o(.rodata); sound/songs/midi/mus_cycling.o(.rodata); - sound/songs/midi/mus_rocket.o(.rodata); - sound/songs/midi/mus_shoujo.o(.rodata); - sound/songs/midi/mus_shounen.o(.rodata); - sound/songs/midi/mus_dendou.o(.rodata); - sound/songs/midi/mus_t_mori.o(.rodata); - sound/songs/midi/mus_otsukimi.o(.rodata); - sound/songs/midi/mus_pokeyashi.o(.rodata); - sound/songs/midi/mus_ending.o(.rodata); - sound/songs/midi/mus_load01.o(.rodata); - sound/songs/midi/mus_opening.o(.rodata); - sound/songs/midi/mus_load02.o(.rodata); - sound/songs/midi/mus_load03.o(.rodata); - sound/songs/midi/mus_champ_r.o(.rodata); - sound/songs/midi/mus_vs_gym.o(.rodata); - sound/songs/midi/mus_vs_tore.o(.rodata); - sound/songs/midi/mus_vs_yasei.o(.rodata); - sound/songs/midi/mus_vs_last.o(.rodata); - sound/songs/midi/mus_masara.o(.rodata); - sound/songs/midi/mus_kenkyu.o(.rodata); - sound/songs/midi/mus_ohkido.o(.rodata); - sound/songs/midi/mus_pokecen.o(.rodata); - sound/songs/midi/mus_santoan.o(.rodata); - sound/songs/midi/mus_naminori.o(.rodata); - sound/songs/midi/mus_p_tower.o(.rodata); - sound/songs/midi/mus_shiruhu.o(.rodata); - sound/songs/midi/mus_hanada.o(.rodata); - sound/songs/midi/mus_tamamusi.o(.rodata); - sound/songs/midi/mus_win_tre.o(.rodata); - sound/songs/midi/mus_win_yasei.o(.rodata); - sound/songs/midi/mus_win_gym.o(.rodata); - sound/songs/midi/mus_kuchiba.o(.rodata); - sound/songs/midi/mus_nibi.o(.rodata); - sound/songs/midi/mus_rival1.o(.rodata); - sound/songs/midi/mus_rival2.o(.rodata); - sound/songs/midi/mus_fan2.o(.rodata); - sound/songs/midi/mus_fan5.o(.rodata); - sound/songs/midi/mus_fan6.o(.rodata); - sound/songs/midi/mus_me_photo.o(.rodata); - sound/songs/midi/mus_titlerog.o(.rodata); - sound/songs/midi/mus_get_yasei.o(.rodata); - sound/songs/midi/mus_sousa.o(.rodata); - sound/songs/midi/mus_sekaikan.o(.rodata); - sound/songs/midi/mus_seibetu.o(.rodata); - sound/songs/midi/mus_jump.o(.rodata); - sound/songs/midi/mus_union.o(.rodata); - sound/songs/midi/mus_network.o(.rodata); - sound/songs/midi/mus_okurimono.o(.rodata); - sound/songs/midi/mus_kinomikui.o(.rodata); - sound/songs/midi/mus_nanadungeon.o(.rodata); - sound/songs/midi/mus_oshie_tv.o(.rodata); - sound/songs/midi/mus_nanashima.o(.rodata); - sound/songs/midi/mus_nanaiseki.o(.rodata); - sound/songs/midi/mus_nana123.o(.rodata); - sound/songs/midi/mus_nana45.o(.rodata); - sound/songs/midi/mus_nana67.o(.rodata); - sound/songs/midi/mus_pokefue.o(.rodata); - sound/songs/midi/mus_vs_deo.o(.rodata); - sound/songs/midi/mus_vs_myu2.o(.rodata); - sound/songs/midi/mus_vs_den.o(.rodata); - sound/songs/midi/mus_exeye.o(.rodata); - sound/songs/midi/mus_deoeye.o(.rodata); - sound/songs/midi/mus_t_tower.o(.rodata); - sound/songs/midi/mus_slowmasara.o(.rodata); - sound/songs/midi/mus_tvnoize.o(.rodata); + sound/songs/midi/mus_encounter_rocket.o(.rodata); + sound/songs/midi/mus_encounter_girl.o(.rodata); + sound/songs/midi/mus_encounter_boy.o(.rodata); + sound/songs/midi/mus_hall_of_fame.o(.rodata); + sound/songs/midi/mus_viridian_forest.o(.rodata); + sound/songs/midi/mus_mt_moon.o(.rodata); + sound/songs/midi/mus_poke_mansion.o(.rodata); + sound/songs/midi/mus_credits.o(.rodata); + sound/songs/midi/mus_route1.o(.rodata); + sound/songs/midi/mus_route24.o(.rodata); + sound/songs/midi/mus_route3.o(.rodata); + sound/songs/midi/mus_route11.o(.rodata); + sound/songs/midi/mus_victory_road.o(.rodata); + sound/songs/midi/mus_vs_gym_leader.o(.rodata); + sound/songs/midi/mus_vs_trainer.o(.rodata); + sound/songs/midi/mus_vs_wild.o(.rodata); + sound/songs/midi/mus_vs_champion.o(.rodata); + sound/songs/midi/mus_pallet.o(.rodata); + sound/songs/midi/mus_oak_lab.o(.rodata); + sound/songs/midi/mus_oak.o(.rodata); + sound/songs/midi/mus_poke_center.o(.rodata); + sound/songs/midi/mus_ss_anne.o(.rodata); + sound/songs/midi/mus_surf.o(.rodata); + sound/songs/midi/mus_poke_tower.o(.rodata); + sound/songs/midi/mus_silph.o(.rodata); + sound/songs/midi/mus_fuchsia.o(.rodata); + sound/songs/midi/mus_celadon.o(.rodata); + sound/songs/midi/mus_victory_trainer.o(.rodata); + sound/songs/midi/mus_victory_wild.o(.rodata); + sound/songs/midi/mus_victory_gym_leader.o(.rodata); + sound/songs/midi/mus_vermillion.o(.rodata); + sound/songs/midi/mus_pewter.o(.rodata); + sound/songs/midi/mus_encounter_rival.o(.rodata); + sound/songs/midi/mus_rival_exit.o(.rodata); + sound/songs/midi/mus_dex_rating.o(.rodata); + sound/songs/midi/mus_obtain_key_item.o(.rodata); + sound/songs/midi/mus_caught_intro.o(.rodata); + sound/songs/midi/mus_photo.o(.rodata); + sound/songs/midi/mus_game_freak.o(.rodata); + sound/songs/midi/mus_caught.o(.rodata); + sound/songs/midi/mus_new_game_instruct.o(.rodata); + sound/songs/midi/mus_new_game_intro.o(.rodata); + sound/songs/midi/mus_new_game_exit.o(.rodata); + sound/songs/midi/mus_poke_jump.o(.rodata); + sound/songs/midi/mus_union_room.o(.rodata); + sound/songs/midi/mus_net_center.o(.rodata); + sound/songs/midi/mus_mystery_gift.o(.rodata); + sound/songs/midi/mus_berry_pick.o(.rodata); + sound/songs/midi/mus_sevii_cave.o(.rodata); + sound/songs/midi/mus_teachy_tv_show.o(.rodata); + sound/songs/midi/mus_sevii_route.o(.rodata); + sound/songs/midi/mus_sevii_dungeon.o(.rodata); + sound/songs/midi/mus_sevii_123.o(.rodata); + sound/songs/midi/mus_sevii_45.o(.rodata); + sound/songs/midi/mus_sevii_67.o(.rodata); + sound/songs/midi/mus_poke_flute.o(.rodata); + sound/songs/midi/mus_vs_deoxys.o(.rodata); + sound/songs/midi/mus_vs_mewtwo.o(.rodata); + sound/songs/midi/mus_vs_legend.o(.rodata); + sound/songs/midi/mus_encounter_gym_leader.o(.rodata); + sound/songs/midi/mus_encounter_deoxys.o(.rodata); + sound/songs/midi/mus_trainer_tower.o(.rodata); + sound/songs/midi/mus_slow_pallet.o(.rodata); + sound/songs/midi/mus_teachy_tv_menu.o(.rodata); } lib_rodata : @@ -3,283 +3,283 @@ STD_REVERB = 50 $(MID_BUILDDIR)/%.o: $(MID_SUBDIR)/%.s $(AS) $(ASFLAGS) -I sound -o $@ $< -$(MID_SUBDIR)/mus_ajito.s: %.s: %.mid +$(MID_SUBDIR)/mus_rocket_hideout.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G133 -V090 -$(MID_SUBDIR)/mus_annai.s: %.s: %.mid +$(MID_SUBDIR)/mus_follow_me.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G131 -V068 -$(MID_SUBDIR)/mus_battle20.s: %.s: %.mid +$(MID_SUBDIR)/mus_rs_vs_trainer.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G011 -V080 -P1 -$(MID_SUBDIR)/mus_battle32.s: %.s: %.mid +$(MID_SUBDIR)/mus_rs_vs_gym_leader.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G010 -V080 -$(MID_SUBDIR)/mus_champ_r.s: %.s: %.mid +$(MID_SUBDIR)/mus_victory_road.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G154 -V090 $(MID_SUBDIR)/mus_cycling.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G141 -V090 -$(MID_SUBDIR)/mus_demo.s: %.s: %.mid +$(MID_SUBDIR)/mus_intro_fight.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G136 -V090 -$(MID_SUBDIR)/mus_dendou.s: %.s: %.mid +$(MID_SUBDIR)/mus_hall_of_fame.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G145 -V079 -$(MID_SUBDIR)/mus_deoeye.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_deoxys.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G184 -V079 $(MID_SUBDIR)/mus_dummy.s: %.s: %.mid $(MID) $< $@ -E -R40 -$(MID_SUBDIR)/mus_ending.s: %.s: %.mid +$(MID_SUBDIR)/mus_credits.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G149 -V090 -$(MID_SUBDIR)/mus_exeye.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_gym_leader.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G144 -V090 -$(MID_SUBDIR)/mus_fan2.s: %.s: %.mid +$(MID_SUBDIR)/mus_dex_rating.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G175 -V070 -P5 -$(MID_SUBDIR)/mus_fan5.s: %.s: %.mid +$(MID_SUBDIR)/mus_obtain_key_item.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G178 -V077 -P5 -$(MID_SUBDIR)/mus_fan6.s: %.s: %.mid +$(MID_SUBDIR)/mus_caught_intro.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G179 -V094 -P5 -$(MID_SUBDIR)/mus_fanfa1.s: %.s: %.mid +$(MID_SUBDIR)/mus_level_up.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5 -$(MID_SUBDIR)/mus_fanfa4.s: %.s: %.mid +$(MID_SUBDIR)/mus_obtain_item.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5 -$(MID_SUBDIR)/mus_fanfa5.s: %.s: %.mid +$(MID_SUBDIR)/mus_evolved.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5 -$(MID_SUBDIR)/mus_get_yasei.s: %.s: %.mid +$(MID_SUBDIR)/mus_caught.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G170 -V100 -$(MID_SUBDIR)/mus_guren.s: %.s: %.mid +$(MID_SUBDIR)/mus_cinnabar.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G138 -V090 $(MID_SUBDIR)/mus_gym.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G134 -V090 -$(MID_SUBDIR)/mus_hanada.s: %.s: %.mid +$(MID_SUBDIR)/mus_fuchsia.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G167 -V090 -$(MID_SUBDIR)/mus_jump.s: %.s: %.mid +$(MID_SUBDIR)/mus_poke_jump.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090 -$(MID_SUBDIR)/mus_kaihuku.s: %.s: %.mid +$(MID_SUBDIR)/mus_heal_unused.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G140 -V090 -$(MID_SUBDIR)/mus_kenkyu.s: %.s: %.mid +$(MID_SUBDIR)/mus_oak_lab.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G160 -V075 -$(MID_SUBDIR)/mus_kinomikui.s: %.s: %.mid +$(MID_SUBDIR)/mus_berry_pick.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090 -$(MID_SUBDIR)/mus_kuchiba.s: %.s: %.mid +$(MID_SUBDIR)/mus_vermillion.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G172 -V090 -$(MID_SUBDIR)/mus_load01.s: %.s: %.mid +$(MID_SUBDIR)/mus_route1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G150 -V079 -$(MID_SUBDIR)/mus_load02.s: %.s: %.mid +$(MID_SUBDIR)/mus_route3.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G152 -V083 -$(MID_SUBDIR)/mus_load03.s: %.s: %.mid +$(MID_SUBDIR)/mus_route11.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G153 -V090 -$(MID_SUBDIR)/mus_masara.s: %.s: %.mid +$(MID_SUBDIR)/mus_pallet.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G159 -V100 -$(MID_SUBDIR)/mus_me_asa.s: %.s: %.mid +$(MID_SUBDIR)/mus_heal.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5 -$(MID_SUBDIR)/mus_me_b_big.s: %.s: %.mid +$(MID_SUBDIR)/mus_slots_jackpot.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G008 -V100 -P5 -$(MID_SUBDIR)/mus_me_b_small.s: %.s: %.mid +$(MID_SUBDIR)/mus_slots_win.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G008 -V100 -P5 -$(MID_SUBDIR)/mus_me_bachi.s: %.s: %.mid +$(MID_SUBDIR)/mus_obtain_badge.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5 -$(MID_SUBDIR)/mus_me_kinomi.s: %.s: %.mid +$(MID_SUBDIR)/mus_obtain_berry.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5 -$(MID_SUBDIR)/mus_me_photo.s: %.s: %.mid +$(MID_SUBDIR)/mus_photo.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G180 -V100 -P5 -$(MID_SUBDIR)/mus_me_shinka.s: %.s: %.mid +$(MID_SUBDIR)/mus_evolution_intro.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G009 -V080 -P1 -$(MID_SUBDIR)/mus_me_wasure.s: %.s: %.mid +$(MID_SUBDIR)/mus_move_deleted.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5 -$(MID_SUBDIR)/mus_me_waza.s: %.s: %.mid +$(MID_SUBDIR)/mus_obtain_tmhm.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5 -$(MID_SUBDIR)/mus_me_zannen.s: %.s: %.mid +$(MID_SUBDIR)/mus_too_bad.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G008 -V090 -P5 -$(MID_SUBDIR)/mus_naminori.s: %.s: %.mid +$(MID_SUBDIR)/mus_surf.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G164 -V071 -$(MID_SUBDIR)/mus_nana123.s: %.s: %.mid +$(MID_SUBDIR)/mus_sevii_123.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G173 -V084 -$(MID_SUBDIR)/mus_nana45.s: %.s: %.mid +$(MID_SUBDIR)/mus_sevii_45.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G188 -V084 -$(MID_SUBDIR)/mus_nana67.s: %.s: %.mid +$(MID_SUBDIR)/mus_sevii_67.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G189 -V084 -$(MID_SUBDIR)/mus_nanadungeon.s: %.s: %.mid +$(MID_SUBDIR)/mus_sevii_cave.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G147 -V090 -$(MID_SUBDIR)/mus_nanaiseki.s: %.s: %.mid +$(MID_SUBDIR)/mus_sevii_dungeon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G146 -V090 -$(MID_SUBDIR)/mus_nanashima.s: %.s: %.mid +$(MID_SUBDIR)/mus_sevii_route.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G187 -V080 -$(MID_SUBDIR)/mus_network.s: %.s: %.mid +$(MID_SUBDIR)/mus_net_center.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G162 -V096 -$(MID_SUBDIR)/mus_nibi.s: %.s: %.mid +$(MID_SUBDIR)/mus_pewter.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G173 -V084 -$(MID_SUBDIR)/mus_ohkido.s: %.s: %.mid +$(MID_SUBDIR)/mus_oak.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G161 -V086 -$(MID_SUBDIR)/mus_okurimono.s: %.s: %.mid +$(MID_SUBDIR)/mus_mystery_gift.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G183 -V100 -$(MID_SUBDIR)/mus_opening.s: %.s: %.mid +$(MID_SUBDIR)/mus_route24.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G151 -V086 -$(MID_SUBDIR)/mus_oshie_tv.s: %.s: %.mid +$(MID_SUBDIR)/mus_teachy_tv_show.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G131 -V068 -$(MID_SUBDIR)/mus_otsukimi.s: %.s: %.mid +$(MID_SUBDIR)/mus_mt_moon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G147 -V090 -$(MID_SUBDIR)/mus_p_school.s: %.s: %.mid +$(MID_SUBDIR)/mus_school.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G012 -V100 -P1 -$(MID_SUBDIR)/mus_p_tower.s: %.s: %.mid +$(MID_SUBDIR)/mus_poke_tower.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G165 -V090 -$(MID_SUBDIR)/mus_pokecen.s: %.s: %.mid +$(MID_SUBDIR)/mus_poke_center.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G162 -V096 -$(MID_SUBDIR)/mus_pokefue.s: %.s: %.mid +$(MID_SUBDIR)/mus_poke_flute.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G165 -V048 -P5 -$(MID_SUBDIR)/mus_pokeyashi.s: %.s: %.mid +$(MID_SUBDIR)/mus_poke_mansion.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G148 -V090 -$(MID_SUBDIR)/mus_purin.s: %.s: %.mid +$(MID_SUBDIR)/mus_jigglypuff.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G135 -V068 -P5 -$(MID_SUBDIR)/mus_rival1.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_rival.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G174 -V079 -$(MID_SUBDIR)/mus_rival2.s: %.s: %.mid +$(MID_SUBDIR)/mus_rival_exit.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G174 -V079 -$(MID_SUBDIR)/mus_rocket.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_rocket.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G142 -V096 -$(MID_SUBDIR)/mus_santoan.s: %.s: %.mid +$(MID_SUBDIR)/mus_ss_anne.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G163 -V090 -$(MID_SUBDIR)/mus_seibetu.s: %.s: %.mid +$(MID_SUBDIR)/mus_new_game_exit.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G182 -V088 -$(MID_SUBDIR)/mus_sekaikan.s: %.s: %.mid +$(MID_SUBDIR)/mus_new_game_intro.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G182 -V088 -$(MID_SUBDIR)/mus_shinka.s: %.s: %.mid +$(MID_SUBDIR)/mus_evolution.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G009 -V080 -P1 -$(MID_SUBDIR)/mus_shion.s: %.s: %.mid +$(MID_SUBDIR)/mus_lavender.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G139 -V090 -$(MID_SUBDIR)/mus_shiruhu.s: %.s: %.mid +$(MID_SUBDIR)/mus_silph.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G166 -V076 -$(MID_SUBDIR)/mus_shoujo.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_girl.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G143 -V051 -$(MID_SUBDIR)/mus_shounen.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_boy.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G144 -V090 -$(MID_SUBDIR)/mus_slot.s: %.s: %.mid +$(MID_SUBDIR)/mus_game_corner.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090 -$(MID_SUBDIR)/mus_slowmasara.s: %.s: %.mid +$(MID_SUBDIR)/mus_slow_pallet.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G159 -V092 -$(MID_SUBDIR)/mus_sousa.s: %.s: %.mid +$(MID_SUBDIR)/mus_new_game_instruct.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G182 -V085 -$(MID_SUBDIR)/mus_t_mori.s: %.s: %.mid +$(MID_SUBDIR)/mus_viridian_forest.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G146 -V090 -$(MID_SUBDIR)/mus_t_tower.s: %.s: %.mid +$(MID_SUBDIR)/mus_trainer_tower.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G134 -V090 -$(MID_SUBDIR)/mus_tamamusi.s: %.s: %.mid +$(MID_SUBDIR)/mus_celadon.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G168 -V070 $(MID_SUBDIR)/mus_title.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G137 -V090 -$(MID_SUBDIR)/mus_titlerog.s: %.s: %.mid +$(MID_SUBDIR)/mus_game_freak.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G181 -V075 -$(MID_SUBDIR)/mus_tvnoize.s: %.s: %.mid +$(MID_SUBDIR)/mus_teachy_tv_menu.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G186 -V059 -$(MID_SUBDIR)/mus_union.s: %.s: %.mid +$(MID_SUBDIR)/mus_union_room.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G132 -V090 -$(MID_SUBDIR)/mus_vs_den.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_legend.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090 -$(MID_SUBDIR)/mus_vs_deo.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_deoxys.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G185 -V080 -$(MID_SUBDIR)/mus_vs_gym.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_gym_leader.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G155 -V090 -$(MID_SUBDIR)/mus_vs_last.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_champion.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G158 -V090 -$(MID_SUBDIR)/mus_vs_myu2.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_mewtwo.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090 -$(MID_SUBDIR)/mus_vs_tore.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_trainer.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G156 -V090 -$(MID_SUBDIR)/mus_vs_yasei.s: %.s: %.mid +$(MID_SUBDIR)/mus_vs_wild.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G157 -V090 -$(MID_SUBDIR)/mus_w_door.s: %.s: %.mid +$(MID_SUBDIR)/se_door.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5 -$(MID_SUBDIR)/mus_win_gym.s: %.s: %.mid +$(MID_SUBDIR)/mus_victory_gym_leader.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G171 -V090 -$(MID_SUBDIR)/mus_win_tre.s: %.s: %.mid +$(MID_SUBDIR)/mus_victory_trainer.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G169 -V089 -$(MID_SUBDIR)/mus_win_yasei.s: %.s: %.mid +$(MID_SUBDIR)/mus_victory_wild.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G170 -V090 $(MID_SUBDIR)/ph_choice_blend.s: %.s: %.mid @@ -435,196 +435,169 @@ $(MID_SUBDIR)/ph_trap_held.s: %.s: %.mid $(MID_SUBDIR)/ph_trap_solo.s: %.s: %.mid $(MID) $< $@ -E -G130 -P4 -$(MID_SUBDIR)/se_a.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 - -$(MID_SUBDIR)/se_ban.s: %.s: %.mid +$(MID_SUBDIR)/se_bang.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_basabasa.s: %.s: %.mid +$(MID_SUBDIR)/se_taillow_wing_flap.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5 -$(MID_SUBDIR)/se_bidoro.s: %.s: %.mid +$(MID_SUBDIR)/se_glass_flute.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P5 $(MID_SUBDIR)/se_boo.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 -$(MID_SUBDIR)/se_bowa.s: %.s: %.mid +$(MID_SUBDIR)/se_ball.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V070 -P4 -$(MID_SUBDIR)/se_bowa2.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_open.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 -$(MID_SUBDIR)/se_bt_start.s: %.s: %.mid +$(MID_SUBDIR)/se_mugshot.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 -$(MID_SUBDIR)/se_c_gaji.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_heart.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 -$(MID_SUBDIR)/se_c_maku_d.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_curtain_fall.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5 -$(MID_SUBDIR)/se_c_maku_u.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_curtain_rise.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V070 -P5 -$(MID_SUBDIR)/se_c_pasi.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_icon_change.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 -$(MID_SUBDIR)/se_c_pikon.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_mons_turn.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 -$(MID_SUBDIR)/se_c_syu.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_icon_clear.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P5 $(MID_SUBDIR)/se_card.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4 -$(MID_SUBDIR)/se_curtain.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 - -$(MID_SUBDIR)/se_curtain1.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 - -$(MID_SUBDIR)/se_dansa.s: %.s: %.mid +$(MID_SUBDIR)/se_ledge.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4 -$(MID_SUBDIR)/se_daugi.s: %.s: %.mid +$(MID_SUBDIR)/se_itemfinder.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 -$(MID_SUBDIR)/se_dendou.s: %.s: %.mid +$(MID_SUBDIR)/se_applause.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5 -$(MID_SUBDIR)/se_doku.s: %.s: %.mid +$(MID_SUBDIR)/se_field_poison.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 -$(MID_SUBDIR)/se_door.s: %.s: %.mid +$(MID_SUBDIR)/se_rs_door.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5 -$(MID_SUBDIR)/se_e.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 - -$(MID_SUBDIR)/se_elebeta.s: %.s: %.mid +$(MID_SUBDIR)/se_elevator.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_esuka.s: %.s: %.mid +$(MID_SUBDIR)/se_escalator.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 $(MID_SUBDIR)/se_exp.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P5 -$(MID_SUBDIR)/se_expmax.s: %.s: %.mid +$(MID_SUBDIR)/se_exp_max.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V094 -P5 $(MID_SUBDIR)/se_fu_zaku.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4 -$(MID_SUBDIR)/se_fu_zaku2.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_condition_lose.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 -$(MID_SUBDIR)/se_fu_zuzuzu.s: %.s: %.mid +$(MID_SUBDIR)/se_lavaridge_fall_warp.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4 -$(MID_SUBDIR)/se_fuusen1.s: %.s: %.mid +$(MID_SUBDIR)/se_balloon_red.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 -$(MID_SUBDIR)/se_fuusen2.s: %.s: %.mid +$(MID_SUBDIR)/se_balloon_blue.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 -$(MID_SUBDIR)/se_fuusen3.s: %.s: %.mid +$(MID_SUBDIR)/se_balloon_yellow.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 -$(MID_SUBDIR)/se_hantei1.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 - -$(MID_SUBDIR)/se_hantei2.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 - -$(MID_SUBDIR)/se_hashi.s: %.s: %.mid +$(MID_SUBDIR)/se_bridge_walk.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 -$(MID_SUBDIR)/se_hazure.s: %.s: %.mid +$(MID_SUBDIR)/se_failure.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P4 -$(MID_SUBDIR)/se_hi_turun.s: %.s: %.mid +$(MID_SUBDIR)/se_rotating_gate.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 -$(MID_SUBDIR)/se_hinsi.s: %.s: %.mid +$(MID_SUBDIR)/se_low_health.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P3 -$(MID_SUBDIR)/se_i.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 - -$(MID_SUBDIR)/se_jido_doa.s: %.s: %.mid +$(MID_SUBDIR)/se_sliding_door.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 -$(MID_SUBDIR)/se_jihanki.s: %.s: %.mid +$(MID_SUBDIR)/se_vend.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_jite_pyoko.s: %.s: %.mid +$(MID_SUBDIR)/se_bike_hop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 -$(MID_SUBDIR)/se_jitensya.s: %.s: %.mid +$(MID_SUBDIR)/se_bike_bell.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 -$(MID_SUBDIR)/se_jyuni.s: %.s: %.mid +$(MID_SUBDIR)/se_contest_place.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 -$(MID_SUBDIR)/se_kaidan.s: %.s: %.mid +$(MID_SUBDIR)/se_exit.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V120 -P5 -$(MID_SUBDIR)/se_kaifuku.s: %.s: %.mid +$(MID_SUBDIR)/se_use_item.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 -$(MID_SUBDIR)/se_ki_gasyan.s: %.s: %.mid +$(MID_SUBDIR)/se_unlock.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_kon.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_bounce_1.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_kon2.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_bounce_2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_kon3.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_bounce_3.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_kon4.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_bounce_4.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_kouka_h.s: %.s: %.mid +$(MID_SUBDIR)/se_super_effective.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 -$(MID_SUBDIR)/se_kouka_l.s: %.s: %.mid +$(MID_SUBDIR)/se_not_effective.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 -$(MID_SUBDIR)/se_kouka_m.s: %.s: %.mid +$(MID_SUBDIR)/se_effective.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 -$(MID_SUBDIR)/se_mizu.s: %.s: %.mid +$(MID_SUBDIR)/se_puddle.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V020 -P4 -$(MID_SUBDIR)/se_moter.s: %.s: %.mid +$(MID_SUBDIR)/se_berry_blender.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 -$(MID_SUBDIR)/se_mu_pachi.s: %.s: %.mid +$(MID_SUBDIR)/se_switch.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4 -$(MID_SUBDIR)/se_n.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 - -$(MID_SUBDIR)/se_nageru.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_throw.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5 -$(MID_SUBDIR)/se_naminori.s: %.s: %.mid +$(MID_SUBDIR)/se_ship.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V075 -P4 -$(MID_SUBDIR)/se_nigeru.s: %.s: %.mid +$(MID_SUBDIR)/se_flee.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 -$(MID_SUBDIR)/se_o.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 - -$(MID_SUBDIR)/se_op_basyu.s: %.s: %.mid +$(MID_SUBDIR)/se_intro_blast.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 $(MID_SUBDIR)/se_pc_login.s: %.s: %.mid @@ -639,275 +612,218 @@ $(MID_SUBDIR)/se_pc_on.s: %.s: %.mid $(MID_SUBDIR)/se_pin.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V060 -P4 -$(MID_SUBDIR)/se_pinpon.s: %.s: %.mid +$(MID_SUBDIR)/se_ding_dong.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 -$(MID_SUBDIR)/se_pn_off.s: %.s: %.mid +$(MID_SUBDIR)/se_pokenav_off.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 -$(MID_SUBDIR)/se_pn_on.s: %.s: %.mid +$(MID_SUBDIR)/se_pokenav_on.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 -$(MID_SUBDIR)/se_poke_dead.s: %.s: %.mid +$(MID_SUBDIR)/se_faint.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P5 -$(MID_SUBDIR)/se_reapoke.s: %.s: %.mid +$(MID_SUBDIR)/se_shiny.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P5 -$(MID_SUBDIR)/se_regi.s: %.s: %.mid +$(MID_SUBDIR)/se_rs_shop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P5 -$(MID_SUBDIR)/se_rg_bag1.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 - -$(MID_SUBDIR)/se_rg_bag2.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 - -$(MID_SUBDIR)/se_rg_card1.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 - -$(MID_SUBDIR)/se_rg_card2.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -P5 - -$(MID_SUBDIR)/se_rg_card3.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V112 -P5 - -$(MID_SUBDIR)/se_rg_deomov.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5 - -$(MID_SUBDIR)/se_rg_excellent.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 - -$(MID_SUBDIR)/se_rg_getting.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5 - -$(MID_SUBDIR)/se_rg_help_cl.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V095 -P5 - -$(MID_SUBDIR)/se_rg_help_ng.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V125 -P5 - -$(MID_SUBDIR)/se_rg_help_op.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5 - -$(MID_SUBDIR)/se_rg_kiteki.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V096 -P5 - -$(MID_SUBDIR)/se_rg_nawamiss.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P5 - -$(MID_SUBDIR)/se_rg_shop.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V080 -P5 - -$(MID_SUBDIR)/se_rg_w_door.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V100 -P5 - -$(MID_SUBDIR)/se_ru_bari.s: %.s: %.mid +$(MID_SUBDIR)/se_ice_crack.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P4 -$(MID_SUBDIR)/se_ru_gashin.s: %.s: %.mid +$(MID_SUBDIR)/se_ice_stairs.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 -$(MID_SUBDIR)/se_ru_gasyan.s: %.s: %.mid +$(MID_SUBDIR)/se_ice_break.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_ru_hyuu.s: %.s: %.mid +$(MID_SUBDIR)/se_fall.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 $(MID_SUBDIR)/se_save.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P5 -$(MID_SUBDIR)/se_seikai.s: %.s: %.mid +$(MID_SUBDIR)/se_success.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P4 $(MID_SUBDIR)/se_select.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V080 -P5 -$(MID_SUBDIR)/se_suikomu.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_trade.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 -$(MID_SUBDIR)/se_t_ame.s: %.s: %.mid +$(MID_SUBDIR)/se_thunderstorm.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 -$(MID_SUBDIR)/se_t_ame_e.s: %.s: %.mid +$(MID_SUBDIR)/se_thunderstorm_stop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 -$(MID_SUBDIR)/se_t_kami.s: %.s: %.mid +$(MID_SUBDIR)/se_thunder.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3 -$(MID_SUBDIR)/se_t_kami2.s: %.s: %.mid +$(MID_SUBDIR)/se_thunder2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P3 -$(MID_SUBDIR)/se_t_koame.s: %.s: %.mid +$(MID_SUBDIR)/se_rain.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 -$(MID_SUBDIR)/se_t_koame_e.s: %.s: %.mid +$(MID_SUBDIR)/se_rain_stop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V080 -P2 -$(MID_SUBDIR)/se_t_ooame.s: %.s: %.mid +$(MID_SUBDIR)/se_downpour.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2 -$(MID_SUBDIR)/se_t_ooame_e.s: %.s: %.mid +$(MID_SUBDIR)/se_downpour_stop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P2 -$(MID_SUBDIR)/se_tama.s: %.s: %.mid +$(MID_SUBDIR)/se_orb.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P5 -$(MID_SUBDIR)/se_tamago.s: %.s: %.mid +$(MID_SUBDIR)/se_egg_hatch.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P5 -$(MID_SUBDIR)/se_tamakoro.s: %.s: %.mid +$(MID_SUBDIR)/se_roulette_ball.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2 -$(MID_SUBDIR)/se_tamakoro_e.s: %.s: %.mid +$(MID_SUBDIR)/se_roulette_ball2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P2 -$(MID_SUBDIR)/se_tb_kara.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_tray_exit.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V100 -P5 -$(MID_SUBDIR)/se_tb_kon.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_tray_ball.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 -$(MID_SUBDIR)/se_tb_start.s: %.s: %.mid +$(MID_SUBDIR)/se_ball_tray_enter.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P5 -$(MID_SUBDIR)/se_tk_kasya.s: %.s: %.mid +$(MID_SUBDIR)/se_click.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V110 -P4 -$(MID_SUBDIR)/se_tk_warpin.s: %.s: %.mid +$(MID_SUBDIR)/se_warp_in.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 -$(MID_SUBDIR)/se_tk_warpout.s: %.s: %.mid +$(MID_SUBDIR)/se_warp_out.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 -$(MID_SUBDIR)/se_toreeye.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V120 -P5 - -$(MID_SUBDIR)/se_toreoff.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V110 -P5 - -$(MID_SUBDIR)/se_toy_a.s: %.s: %.mid +$(MID_SUBDIR)/se_note_a.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_b.s: %.s: %.mid +$(MID_SUBDIR)/se_note_b.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_c.s: %.s: %.mid +$(MID_SUBDIR)/se_note_c.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_c1.s: %.s: %.mid +$(MID_SUBDIR)/se_note_c_high.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_d.s: %.s: %.mid +$(MID_SUBDIR)/se_note_d.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_dango.s: %.s: %.mid +$(MID_SUBDIR)/se_mud_ball.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_e.s: %.s: %.mid +$(MID_SUBDIR)/se_note_e.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_f.s: %.s: %.mid +$(MID_SUBDIR)/se_note_f.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_g.s: %.s: %.mid +$(MID_SUBDIR)/se_note_g.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_toy_kabe.s: %.s: %.mid +$(MID_SUBDIR)/se_breakable_door.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_track_door.s: %.s: %.mid +$(MID_SUBDIR)/se_truck_door.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_track_haiki.s: %.s: %.mid +$(MID_SUBDIR)/se_truck_unload.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -P4 -$(MID_SUBDIR)/se_track_move.s: %.s: %.mid +$(MID_SUBDIR)/se_truck_move.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 -$(MID_SUBDIR)/se_track_stop.s: %.s: %.mid +$(MID_SUBDIR)/se_truck_stop.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 -$(MID_SUBDIR)/se_tu_saa.s: %.s: %.mid +$(MID_SUBDIR)/se_repel.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -V090 -P4 -$(MID_SUBDIR)/se_u.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G128 -P4 - -$(MID_SUBDIR)/se_ussoki.s: %.s: %.mid - $(MID) $< $@ -E -R$(STD_REVERB) -G129 -V077 -P5 - -$(MID_SUBDIR)/se_w003.s: %.s: %.mid +$(MID_SUBDIR)/se_m_double_slap.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w004.s: %.s: %.mid +$(MID_SUBDIR)/se_m_comet_punch.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 -$(MID_SUBDIR)/se_w006.s: %.s: %.mid +$(MID_SUBDIR)/se_m_pay_day.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V095 -P4 -$(MID_SUBDIR)/se_w007.s: %.s: %.mid +$(MID_SUBDIR)/se_m_fire_punch.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w010.s: %.s: %.mid +$(MID_SUBDIR)/se_m_scratch.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w011.s: %.s: %.mid +$(MID_SUBDIR)/se_m_vicegrip.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w013.s: %.s: %.mid +$(MID_SUBDIR)/se_m_razor_wind.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w013b.s: %.s: %.mid +$(MID_SUBDIR)/se_m_razor_wind2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 -$(MID_SUBDIR)/se_w014.s: %.s: %.mid +$(MID_SUBDIR)/se_m_swords_dance.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_w015.s: %.s: %.mid +$(MID_SUBDIR)/se_m_cut.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V120 -P4 -$(MID_SUBDIR)/se_w016.s: %.s: %.mid +$(MID_SUBDIR)/se_m_gust.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w016b.s: %.s: %.mid +$(MID_SUBDIR)/se_m_gust2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w017.s: %.s: %.mid +$(MID_SUBDIR)/se_m_wing_attack.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 -$(MID_SUBDIR)/se_w019.s: %.s: %.mid +$(MID_SUBDIR)/se_m_fly.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w020.s: %.s: %.mid +$(MID_SUBDIR)/se_m_bind.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V100 -P4 -$(MID_SUBDIR)/se_w025.s: %.s: %.mid +$(MID_SUBDIR)/se_m_mega_kick.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V090 -P4 -$(MID_SUBDIR)/se_w025b.s: %.s: %.mid +$(MID_SUBDIR)/se_m_mega_kick2.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w026.s: %.s: %.mid +$(MID_SUBDIR)/se_m_jump_kick.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w028.s: %.s: %.mid +$(MID_SUBDIR)/se_m_sand_attack.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w029.s: %.s: %.mid +$(MID_SUBDIR)/se_m_headbutt.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w030.s: %.s: %.mid +$(MID_SUBDIR)/se_m_horn_attack.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w036.s: %.s: %.mid +$(MID_SUBDIR)/se_m_take_down.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V105 -P4 -$(MID_SUBDIR)/se_w039.s: %.s: %.mid +$(MID_SUBDIR)/se_m_tail_whip.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_w043.s: %.s: %.mid +$(MID_SUBDIR)/se_m_leer.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G128 -V110 -P4 -$(MID_SUBDIR)/se_z_search.s: %.s: %.mid +$(MID_SUBDIR)/se_dex_search.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G127 -v100 -P5 diff --git a/sound/song_table.inc b/sound/song_table.inc index 8ed17dcc9..8c2642414 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -1,351 +1,351 @@ gSongTable:: @ 84A32CC song mus_dummy, 0, 0 - song se_kaifuku, 1, 1 + song se_use_item, 1, 1 song se_pc_login, 1, 1 song se_pc_off, 1, 1 song se_pc_on, 1, 1 song se_select, 2, 2 song se_win_open, 1, 1 song se_wall_hit, 2, 2 - song se_door, 1, 1 - song se_kaidan, 1, 1 - song se_dansa, 1, 1 - song se_jitensya, 1, 1 - song se_kouka_l, 1, 1 - song se_kouka_m, 1, 1 - song se_kouka_h, 1, 1 - song se_bowa2, 1, 1 - song se_poke_dead, 1, 1 - song se_nigeru, 1, 1 - song se_jido_doa, 1, 1 - song se_naminori, 1, 1 - song se_ban, 1, 1 + song se_rs_door, 1, 1 + song se_exit, 1, 1 + song se_ledge, 1, 1 + song se_bike_bell, 1, 1 + song se_not_effective, 1, 1 + song se_effective, 1, 1 + song se_super_effective, 1, 1 + song se_ball_open, 1, 1 + song se_faint, 1, 1 + song se_flee, 1, 1 + song se_sliding_door, 1, 1 + song se_ship, 1, 1 + song se_bang, 1, 1 song se_pin, 1, 1 song se_boo, 1, 1 - song se_bowa, 1, 1 - song se_jyuni, 2, 2 - song se_seikai, 1, 1 - song se_hazure, 1, 1 + song se_ball, 1, 1 + song se_contest_place, 2, 2 + song se_success, 1, 1 + song se_failure, 1, 1 song se_exp, 1, 1 - song se_jite_pyoko, 1, 1 - song se_mu_pachi, 1, 1 - song se_tk_kasya, 1, 1 + song se_bike_hop, 1, 1 + song se_switch, 1, 1 + song se_click, 1, 1 song se_fu_zaku, 1, 1 - song se_fu_zaku2, 1, 1 - song se_fu_zuzuzu, 1, 1 - song se_ru_gashin, 1, 1 - song se_ru_gasyan, 1, 1 - song se_ru_bari, 1, 1 - song se_ru_hyuu, 1, 1 - song se_ki_gasyan, 2, 2 - song se_tk_warpin, 1, 1 - song se_tk_warpout, 1, 1 - song se_tu_saa, 1, 1 - song se_hi_turun, 1, 1 - song se_track_move, 1, 1 - song se_track_stop, 1, 1 - song se_track_haiki, 2, 2 - song se_track_door, 1, 1 - song se_moter, 2, 2 + song se_contest_condition_lose, 1, 1 + song se_lavaridge_fall_warp, 1, 1 + song se_ice_stairs, 1, 1 + song se_ice_break, 1, 1 + song se_ice_crack, 1, 1 + song se_fall, 1, 1 + song se_unlock, 2, 2 + song se_warp_in, 1, 1 + song se_warp_out, 1, 1 + song se_repel, 1, 1 + song se_rotating_gate, 1, 1 + song se_truck_move, 1, 1 + song se_truck_stop, 1, 1 + song se_truck_unload, 2, 2 + song se_truck_door, 1, 1 + song se_berry_blender, 2, 2 song se_save, 1, 1 - song se_kon, 1, 1 - song se_kon2, 1, 1 - song se_kon3, 1, 1 - song se_kon4, 1, 1 - song se_suikomu, 2, 2 - song se_nageru, 1, 1 - song se_toy_c, 2, 2 - song se_toy_d, 2, 2 - song se_toy_e, 2, 2 - song se_toy_f, 2, 2 - song se_toy_g, 2, 2 - song se_toy_a, 2, 2 - song se_toy_b, 2, 2 - song se_toy_c1, 2, 2 - song se_mizu, 2, 2 - song se_hashi, 2, 2 - song se_daugi, 1, 1 - song se_pinpon, 1, 1 - song se_fuusen1, 2, 2 - song se_fuusen2, 2, 2 - song se_fuusen3, 2, 2 - song se_toy_kabe, 2, 2 - song se_toy_dango, 2, 2 - song se_doku, 1, 1 - song se_esuka, 1, 1 - song se_t_ame, 3, 3 - song se_t_ame_e, 3, 3 - song se_t_ooame, 3, 3 - song se_t_ooame_e, 3, 3 - song se_t_koame, 3, 3 - song se_t_koame_e, 3, 3 - song se_t_kami, 1, 1 - song se_t_kami2, 1, 1 - song se_elebeta, 1, 1 - song se_hinsi, 3, 3 - song se_expmax, 1, 1 - song se_tamakoro, 2, 2 - song se_tamakoro_e, 2, 2 - song se_basabasa, 1, 1 - song se_regi, 1, 1 - song se_c_gaji, 1, 1 - song se_c_maku_u, 1, 1 - song se_c_maku_d, 1, 1 - song se_c_pasi, 1, 1 - song se_c_syu, 1, 1 - song se_c_pikon, 1, 1 - song se_reapoke, 1, 1 - song se_op_basyu, 1, 1 - song se_bt_start, 1, 1 - song se_dendou, 1, 1 - song se_jihanki, 1, 1 - song se_tama, 1, 1 - song se_z_scroll, 1, 1 - song se_z_page, 1, 1 - song se_pn_on, 1, 1 - song se_pn_off, 1, 1 - song se_z_search, 1, 1 - song se_tamago, 1, 1 - song se_tb_start, 1, 1 - song se_tb_kon, 1, 1 - song se_tb_kara, 2, 2 - song se_bidoro, 1, 1 - song se_w085, 2, 2 - song se_w085b, 1, 1 - song se_w231, 1, 1 - song se_w171, 1, 1 - song se_w233, 1, 1 - song se_w233b, 1, 1 - song se_w145, 1, 1 - song se_w145b, 1, 1 - song se_w145c, 1, 1 - song se_w240, 1, 1 - song se_w015, 1, 1 - song se_w081, 1, 1 - song se_w081b, 1, 1 - song se_w088, 1, 1 - song se_w016, 2, 2 - song se_w016b, 2, 2 - song se_w003, 1, 1 - song se_w104, 1, 1 - song se_w013, 1, 1 - song se_w196, 1, 1 - song se_w086, 1, 1 - song se_w004, 1, 1 - song se_w025, 1, 1 - song se_w025b, 1, 1 - song se_w152, 1, 1 - song se_w026, 1, 1 - song se_w172, 1, 1 - song se_w172b, 1, 1 - song se_w053, 1, 1 - song se_w007, 1, 1 - song se_w092, 1, 1 - song se_w221, 1, 1 - song se_w221b, 2, 2 - song se_w052, 1, 1 - song se_w036, 2, 2 - song se_w059, 1, 1 - song se_w059b, 1, 1 - song se_w010, 1, 1 - song se_w011, 1, 1 - song se_w017, 1, 1 - song se_w019, 1, 1 - song se_w028, 1, 1 - song se_w013b, 1, 1 - song se_w044, 1, 1 - song se_w029, 1, 1 - song se_w057, 1, 1 - song se_w056, 1, 1 - song se_w250, 1, 1 - song se_w030, 1, 1 - song se_w039, 2, 2 - song se_w054, 1, 1 - song se_w077, 1, 1 - song se_w020, 2, 2 - song se_w082, 1, 1 - song se_w047, 1, 1 - song se_w195, 1, 1 - song se_w006, 1, 1 - song se_w091, 1, 1 - song se_w146, 1, 1 - song se_w120, 1, 1 - song se_w153, 1, 1 - song se_w071b, 1, 1 - song se_w071, 1, 1 - song se_w103, 1, 1 - song se_w062, 1, 1 - song se_w062b, 1, 1 - song se_w048, 1, 1 - song se_w187, 1, 1 - song se_w118, 1, 1 - song se_w155, 1, 1 - song se_w122, 1, 1 - song se_w060, 1, 1 - song se_w185, 1, 1 - song se_w014, 1, 1 - song se_w043, 1, 1 - song se_w207, 1, 1 - song se_w207b, 1, 1 - song se_w215, 1, 1 - song se_w109, 1, 1 - song se_w173, 1, 1 - song se_w280, 1, 1 - song se_w202, 1, 1 - song se_w060b, 1, 1 - song se_w076, 2, 2 - song se_w080, 1, 1 - song se_w100, 1, 1 - song se_w107, 1, 1 - song se_w166, 1, 1 - song se_w129, 1, 1 - song se_w115, 1, 1 - song se_w112, 1, 1 - song se_w197, 2, 2 - song se_w199, 1, 1 - song se_w236, 1, 1 - song se_w204, 1, 1 - song se_w268, 1, 1 - song se_w070, 1, 1 - song se_w063, 1, 1 - song se_w127, 1, 1 - song se_w179, 1, 1 - song se_w151, 1, 1 - song se_w201, 1, 1 - song se_w161, 1, 1 - song se_w161b, 1, 1 - song se_w227, 1, 1 - song se_w227b, 2, 2 - song se_w226, 1, 1 - song se_w208, 1, 1 - song se_w213, 1, 1 - song se_w213b, 1, 1 - song se_w234, 1, 1 - song se_w260, 1, 1 - song se_w328, 1, 1 - song se_w320, 1, 1 - song se_w255, 1, 1 - song se_w291, 1, 1 - song se_w089, 2, 2 - song se_w239, 2, 2 - song se_w230, 1, 1 - song se_w281, 1, 1 - song se_w327, 2, 2 - song se_w287, 1, 1 - song se_w257, 1, 1 - song se_w253, 1, 1 - song se_w258, 1, 1 - song se_w322, 2, 2 - song se_w298, 1, 1 - song se_w287b, 1, 1 - song se_w114, 1, 1 - song se_w063b, 1, 1 - song mus_w_door, 1, 1 - song se_card1, 1, 1 - song se_card2, 1, 1 - song se_card3, 1, 1 - song se_bag1, 1, 1 - song se_bag2, 1, 1 - song se_getting, 1, 1 + song se_ball_bounce_1, 1, 1 + song se_ball_bounce_2, 1, 1 + song se_ball_bounce_3, 1, 1 + song se_ball_bounce_4, 1, 1 + song se_ball_trade, 2, 2 + song se_ball_throw, 1, 1 + song se_note_c, 2, 2 + song se_note_d, 2, 2 + song se_note_e, 2, 2 + song se_note_f, 2, 2 + song se_note_g, 2, 2 + song se_note_a, 2, 2 + song se_note_b, 2, 2 + song se_note_c_high, 2, 2 + song se_puddle, 2, 2 + song se_bridge_walk, 2, 2 + song se_itemfinder, 1, 1 + song se_ding_dong, 1, 1 + song se_balloon_red, 2, 2 + song se_balloon_blue, 2, 2 + song se_balloon_yellow, 2, 2 + song se_breakable_door, 2, 2 + song se_mud_ball, 2, 2 + song se_field_poison, 1, 1 + song se_escalator, 1, 1 + song se_thunderstorm, 3, 3 + song se_thunderstorm_stop, 3, 3 + song se_downpour, 3, 3 + song se_downpour_stop, 3, 3 + song se_rain, 3, 3 + song se_rain_stop, 3, 3 + song se_thunder, 1, 1 + song se_thunder2, 1, 1 + song se_elevator, 1, 1 + song se_low_health, 3, 3 + song se_exp_max, 1, 1 + song se_roulette_ball, 2, 2 + song se_roulette_ball2, 2, 2 + song se_taillow_wing_flap, 1, 1 + song se_rs_shop, 1, 1 + song se_contest_heart, 1, 1 + song se_contest_curtain_rise, 1, 1 + song se_contest_curtain_fall, 1, 1 + song se_contest_icon_change, 1, 1 + song se_contest_icon_clear, 1, 1 + song se_contest_mons_turn, 1, 1 + song se_shiny, 1, 1 + song se_intro_blast, 1, 1 + song se_mugshot, 1, 1 + song se_applause, 1, 1 + song se_vend, 1, 1 + song se_orb, 1, 1 + song se_dex_scroll, 1, 1 + song se_dex_page, 1, 1 + song se_pokenav_on, 1, 1 + song se_pokenav_off, 1, 1 + song se_dex_search, 1, 1 + song se_egg_hatch, 1, 1 + song se_ball_tray_enter, 1, 1 + song se_ball_tray_ball, 1, 1 + song se_ball_tray_exit, 2, 2 + song se_glass_flute, 1, 1 + song se_m_thunderbolt, 2, 2 + song se_m_thunderbolt2, 1, 1 + song se_m_harden, 1, 1 + song se_m_nightmare, 1, 1 + song se_m_vital_throw, 1, 1 + song se_m_vital_throw2, 1, 1 + song se_m_bubble, 1, 1 + song se_m_bubble2, 1, 1 + song se_m_bubble3, 1, 1 + song se_m_rain_dance, 1, 1 + song se_m_cut, 1, 1 + song se_m_string_shot, 1, 1 + song se_m_string_shot2, 1, 1 + song se_m_rock_throw, 1, 1 + song se_m_gust, 2, 2 + song se_m_gust2, 2, 2 + song se_m_double_slap, 1, 1 + song se_m_double_team, 1, 1 + song se_m_razor_wind, 1, 1 + song se_m_icy_wind, 1, 1 + song se_m_thunder_wave, 1, 1 + song se_m_comet_punch, 1, 1 + song se_m_mega_kick, 1, 1 + song se_m_mega_kick2, 1, 1 + song se_m_crabhammer, 1, 1 + song se_m_jump_kick, 1, 1 + song se_m_flame_wheel, 1, 1 + song se_m_flame_wheel2, 1, 1 + song se_m_flamethrower, 1, 1 + song se_m_fire_punch, 1, 1 + song se_m_toxic, 1, 1 + song se_m_sacred_fire, 1, 1 + song se_m_sacred_fire2, 2, 2 + song se_m_ember, 1, 1 + song se_m_take_down, 2, 2 + song se_m_blizzard, 1, 1 + song se_m_blizzard2, 1, 1 + song se_m_scratch, 1, 1 + song se_m_vicegrip, 1, 1 + song se_m_wing_attack, 1, 1 + song se_m_fly, 1, 1 + song se_m_sand_attack, 1, 1 + song se_m_razor_wind2, 1, 1 + song se_m_bite, 1, 1 + song se_m_headbutt, 1, 1 + song se_m_surf, 1, 1 + song se_m_hydro_pump, 1, 1 + song se_m_whirlpool, 1, 1 + song se_m_horn_attack, 1, 1 + song se_m_tail_whip, 2, 2 + song se_m_mist, 1, 1 + song se_m_poison_powder, 1, 1 + song se_m_bind, 2, 2 + song se_m_dragon_rage, 1, 1 + song se_m_sing, 1, 1 + song se_m_perish_song, 1, 1 + song se_m_pay_day, 1, 1 + song se_m_dig, 1, 1 + song se_m_dizzy_punch, 1, 1 + song se_m_self_destruct, 1, 1 + song se_m_explosion, 1, 1 + song se_m_absorb_2, 1, 1 + song se_m_absorb, 1, 1 + song se_m_screech, 1, 1 + song se_m_bubble_beam, 1, 1 + song se_m_bubble_beam2, 1, 1 + song se_m_supersonic, 1, 1 + song se_m_belly_drum, 1, 1 + song se_m_metronome, 1, 1 + song se_m_bonemerang, 1, 1 + song se_m_lick, 1, 1 + song se_m_psybeam, 1, 1 + song se_m_faint_attack, 1, 1 + song se_m_swords_dance, 1, 1 + song se_m_leer, 1, 1 + song se_m_swagger, 1, 1 + song se_m_swagger2, 1, 1 + song se_m_heal_bell, 1, 1 + song se_m_confuse_ray, 1, 1 + song se_m_snore, 1, 1 + song se_m_brick_break, 1, 1 + song se_m_giga_drain, 1, 1 + song se_m_psybeam2, 1, 1 + song se_m_solar_beam, 2, 2 + song se_m_petal_dance, 1, 1 + song se_m_teleport, 1, 1 + song se_m_minimize, 1, 1 + song se_m_sketch, 1, 1 + song se_m_swift, 1, 1 + song se_m_reflect, 1, 1 + song se_m_barrier, 1, 1 + song se_m_detect, 2, 2 + song se_m_lock_on, 1, 1 + song se_m_moonlight, 1, 1 + song se_m_charm, 1, 1 + song se_m_charge, 1, 1 + song se_m_strength, 1, 1 + song se_m_hyper_beam, 1, 1 + song se_m_waterfall, 1, 1 + song se_m_reversal, 1, 1 + song se_m_acid_armor, 1, 1 + song se_m_sandstorm, 1, 1 + song se_m_tri_attack, 1, 1 + song se_m_tri_attack2, 1, 1 + song se_m_encore, 1, 1 + song se_m_encore2, 2, 2 + song se_m_baton_pass, 1, 1 + song se_m_milk_drink, 1, 1 + song se_m_attract, 1, 1 + song se_m_attract2, 1, 1 + song se_m_morning_sun, 1, 1 + song se_m_flatter, 1, 1 + song se_m_sand_tomb, 1, 1 + song se_m_grasswhistle, 1, 1 + song se_m_spit_up, 1, 1 + song se_m_dive, 1, 1 + song se_m_earthquake, 2, 2 + song se_m_twister, 2, 2 + song se_m_sweet_scent, 1, 1 + song se_m_yawn, 1, 1 + song se_m_sky_uppercut, 2, 2 + song se_m_stat_increase, 1, 1 + song se_m_heat_wave, 1, 1 + song se_m_uproar, 1, 1 + song se_m_hail, 1, 1 + song se_m_cosmic_power, 2, 2 + song se_m_teeter_dance, 1, 1 + song se_m_stat_decrease, 1, 1 + song se_m_haze, 1, 1 + song se_m_hyper_beam2, 1, 1 + song se_door, 1, 1 + song se_card_flip, 1, 1 + song se_card_flipping, 1, 1 + song se_card_open, 1, 1 + song se_bag_cursor, 1, 1 + song se_bag_pocket, 1, 1 + song se_ball_click, 1, 1 song se_shop, 1, 1 - song se_kiteki, 1, 1 - song se_help_op, 1, 1 - song se_help_cl, 1, 1 - song se_help_ng, 1, 1 - song se_deomov, 1, 1 - song se_excellent, 1, 1 - song se_nawamiss, 1, 1 - song mus_me_asa, 2, 2 - song mus_fanfa1, 2, 2 - song mus_fanfa4, 2, 2 - song mus_fanfa5, 2, 2 - song mus_me_bachi, 2, 2 - song mus_me_waza, 2, 2 - song mus_me_kinomi, 2, 2 - song mus_me_shinka, 2, 2 - song mus_shinka, 0, 0 - song mus_battle32, 0, 0 - song mus_battle20, 0, 0 - song mus_p_school, 0, 0 - song mus_me_b_big, 2, 2 - song mus_me_b_small, 2, 2 - song mus_me_wasure, 2, 2 - song mus_me_zannen, 2, 2 - song mus_annai, 0, 0 - song mus_slot, 0, 0 - song mus_ajito, 0, 0 + song se_ss_anne_horn, 1, 1 + song se_help_open, 1, 1 + song se_help_close, 1, 1 + song se_help_error, 1, 1 + song se_deoxys_move, 1, 1 + song se_poke_jump_success, 1, 1 + song se_poke_jump_failure, 1, 1 + song mus_heal, 2, 2 + song mus_level_up, 2, 2 + song mus_obtain_item, 2, 2 + song mus_evolved, 2, 2 + song mus_obtain_badge, 2, 2 + song mus_obtain_tmhm, 2, 2 + song mus_obtain_berry, 2, 2 + song mus_evolution_intro, 2, 2 + song mus_evolution, 0, 0 + song mus_rs_vs_gym_leader, 0, 0 + song mus_rs_vs_trainer, 0, 0 + song mus_school, 0, 0 + song mus_slots_jackpot, 2, 2 + song mus_slots_win, 2, 2 + song mus_move_deleted, 2, 2 + song mus_too_bad, 2, 2 + song mus_follow_me, 0, 0 + song mus_game_corner, 0, 0 + song mus_rocket_hideout, 0, 0 song mus_gym, 0, 0 - song mus_purin, 2, 2 - song mus_demo, 0, 0 + song mus_jigglypuff, 2, 2 + song mus_intro_fight, 0, 0 song mus_title, 0, 0 - song mus_guren, 0, 0 - song mus_shion, 0, 0 - song mus_kaihuku, 0, 0 + song mus_cinnabar, 0, 0 + song mus_lavender, 0, 0 + song mus_heal_unused, 0, 0 song mus_cycling, 0, 0 - song mus_rocket, 0, 0 - song mus_shoujo, 0, 0 - song mus_shounen, 0, 0 - song mus_dendou, 0, 0 - song mus_t_mori, 0, 0 - song mus_otsukimi, 0, 0 - song mus_pokeyashi, 0, 0 - song mus_ending, 0, 0 - song mus_load01, 0, 0 - song mus_opening, 0, 0 - song mus_load02, 0, 0 - song mus_load03, 0, 0 - song mus_champ_r, 0, 0 - song mus_vs_gym, 0, 0 - song mus_vs_tore, 0, 0 - song mus_vs_yasei, 0, 0 - song mus_vs_last, 0, 0 - song mus_masara, 0, 0 - song mus_kenkyu, 0, 0 - song mus_ohkido, 0, 0 - song mus_pokecen, 0, 0 - song mus_santoan, 0, 0 - song mus_naminori, 0, 0 - song mus_p_tower, 0, 0 - song mus_shiruhu, 0, 0 - song mus_hanada, 0, 0 - song mus_tamamusi, 0, 0 - song mus_win_tre, 0, 0 - song mus_win_yasei, 0, 0 - song mus_win_gym, 0, 0 - song mus_kuchiba, 0, 0 - song mus_nibi, 0, 0 - song mus_rival1, 0, 0 - song mus_rival2, 0, 0 - song mus_fan2, 2, 2 - song mus_fan5, 2, 2 - song mus_fan6, 2, 2 - song mus_me_photo, 2, 2 - song mus_titlerog, 0, 0 - song mus_get_yasei, 0, 0 - song mus_sousa, 0, 0 - song mus_sekaikan, 0, 0 - song mus_seibetu, 0, 0 - song mus_jump, 0, 0 - song mus_union, 0, 0 - song mus_network, 0, 0 - song mus_okurimono, 0, 0 - song mus_kinomikui, 0, 0 - song mus_nanadungeon, 0, 0 - song mus_oshie_tv, 0, 0 - song mus_nanashima, 0, 0 - song mus_nanaiseki, 0, 0 - song mus_nana123, 0, 0 - song mus_nana45, 0, 0 - song mus_nana67, 0, 0 - song mus_pokefue, 2, 2 - song mus_vs_deo, 0, 0 - song mus_vs_myu2, 0, 0 - song mus_vs_den, 0, 0 - song mus_exeye, 0, 0 - song mus_deoeye, 0, 0 - song mus_t_tower, 0, 0 - song mus_slowmasara, 0, 0 - song mus_tvnoize, 0, 0 + song mus_encounter_rocket, 0, 0 + song mus_encounter_girl, 0, 0 + song mus_encounter_boy, 0, 0 + song mus_hall_of_fame, 0, 0 + song mus_viridian_forest, 0, 0 + song mus_mt_moon, 0, 0 + song mus_poke_mansion, 0, 0 + song mus_credits, 0, 0 + song mus_route1, 0, 0 + song mus_route24, 0, 0 + song mus_route3, 0, 0 + song mus_route11, 0, 0 + song mus_victory_road, 0, 0 + song mus_vs_gym_leader, 0, 0 + song mus_vs_trainer, 0, 0 + song mus_vs_wild, 0, 0 + song mus_vs_champion, 0, 0 + song mus_pallet, 0, 0 + song mus_oak_lab, 0, 0 + song mus_oak, 0, 0 + song mus_poke_center, 0, 0 + song mus_ss_anne, 0, 0 + song mus_surf, 0, 0 + song mus_poke_tower, 0, 0 + song mus_silph, 0, 0 + song mus_fuchsia, 0, 0 + song mus_celadon, 0, 0 + song mus_victory_trainer, 0, 0 + song mus_victory_wild, 0, 0 + song mus_victory_gym_leader, 0, 0 + song mus_vermillion, 0, 0 + song mus_pewter, 0, 0 + song mus_encounter_rival, 0, 0 + song mus_rival_exit, 0, 0 + song mus_dex_rating, 2, 2 + song mus_obtain_key_item, 2, 2 + song mus_caught_intro, 2, 2 + song mus_photo, 2, 2 + song mus_game_freak, 0, 0 + song mus_caught, 0, 0 + song mus_new_game_instruct, 0, 0 + song mus_new_game_intro, 0, 0 + song mus_new_game_exit, 0, 0 + song mus_poke_jump, 0, 0 + song mus_union_room, 0, 0 + song mus_net_center, 0, 0 + song mus_mystery_gift, 0, 0 + song mus_berry_pick, 0, 0 + song mus_sevii_cave, 0, 0 + song mus_teachy_tv_show, 0, 0 + song mus_sevii_route, 0, 0 + song mus_sevii_dungeon, 0, 0 + song mus_sevii_123, 0, 0 + song mus_sevii_45, 0, 0 + song mus_sevii_67, 0, 0 + song mus_poke_flute, 2, 2 + song mus_vs_deoxys, 0, 0 + song mus_vs_mewtwo, 0, 0 + song mus_vs_legend, 0, 0 + song mus_encounter_gym_leader, 0, 0 + song mus_encounter_deoxys, 0, 0 + song mus_trainer_tower, 0, 0 + song mus_slow_pallet, 0, 0 + song mus_teachy_tv_menu, 0, 0 dummy_song_header: @ 84A3DA4 .byte 0, 0, 0, 0 diff --git a/sound/songs/midi/mus_kinomikui.mid b/sound/songs/midi/mus_berry_pick.mid Binary files differindex 5e16a57cd..5e16a57cd 100644 --- a/sound/songs/midi/mus_kinomikui.mid +++ b/sound/songs/midi/mus_berry_pick.mid diff --git a/sound/songs/midi/mus_get_yasei.mid b/sound/songs/midi/mus_caught.mid Binary files differindex 6599ca6b0..6599ca6b0 100644 --- a/sound/songs/midi/mus_get_yasei.mid +++ b/sound/songs/midi/mus_caught.mid diff --git a/sound/songs/midi/mus_fan6.mid b/sound/songs/midi/mus_caught_intro.mid Binary files differindex d2bc1feb3..d2bc1feb3 100644 --- a/sound/songs/midi/mus_fan6.mid +++ b/sound/songs/midi/mus_caught_intro.mid diff --git a/sound/songs/midi/mus_tamamusi.mid b/sound/songs/midi/mus_celadon.mid Binary files differindex fa0d655eb..fa0d655eb 100644 --- a/sound/songs/midi/mus_tamamusi.mid +++ b/sound/songs/midi/mus_celadon.mid diff --git a/sound/songs/midi/mus_guren.mid b/sound/songs/midi/mus_cinnabar.mid Binary files differindex a5748ac48..a5748ac48 100644 --- a/sound/songs/midi/mus_guren.mid +++ b/sound/songs/midi/mus_cinnabar.mid diff --git a/sound/songs/midi/mus_ending.mid b/sound/songs/midi/mus_credits.mid Binary files differindex 1f5790542..1f5790542 100644 --- a/sound/songs/midi/mus_ending.mid +++ b/sound/songs/midi/mus_credits.mid diff --git a/sound/songs/midi/mus_fan2.mid b/sound/songs/midi/mus_dex_rating.mid Binary files differindex 98300bce1..98300bce1 100644 --- a/sound/songs/midi/mus_fan2.mid +++ b/sound/songs/midi/mus_dex_rating.mid diff --git a/sound/songs/midi/mus_shounen.mid b/sound/songs/midi/mus_encounter_boy.mid Binary files differindex 0820f00ca..0820f00ca 100644 --- a/sound/songs/midi/mus_shounen.mid +++ b/sound/songs/midi/mus_encounter_boy.mid diff --git a/sound/songs/midi/mus_deoeye.mid b/sound/songs/midi/mus_encounter_deoxys.mid Binary files differindex d322b9a1a..d322b9a1a 100644 --- a/sound/songs/midi/mus_deoeye.mid +++ b/sound/songs/midi/mus_encounter_deoxys.mid diff --git a/sound/songs/midi/mus_shoujo.mid b/sound/songs/midi/mus_encounter_girl.mid Binary files differindex 48ede9b4c..48ede9b4c 100644 --- a/sound/songs/midi/mus_shoujo.mid +++ b/sound/songs/midi/mus_encounter_girl.mid diff --git a/sound/songs/midi/mus_exeye.mid b/sound/songs/midi/mus_encounter_gym_leader.mid Binary files differindex cb5fef487..cb5fef487 100644 --- a/sound/songs/midi/mus_exeye.mid +++ b/sound/songs/midi/mus_encounter_gym_leader.mid diff --git a/sound/songs/midi/mus_rival1.mid b/sound/songs/midi/mus_encounter_rival.mid Binary files differindex 41fe40e94..41fe40e94 100644 --- a/sound/songs/midi/mus_rival1.mid +++ b/sound/songs/midi/mus_encounter_rival.mid diff --git a/sound/songs/midi/mus_rocket.mid b/sound/songs/midi/mus_encounter_rocket.mid Binary files differindex 966e56962..966e56962 100644 --- a/sound/songs/midi/mus_rocket.mid +++ b/sound/songs/midi/mus_encounter_rocket.mid diff --git a/sound/songs/midi/mus_shinka.mid b/sound/songs/midi/mus_evolution.mid Binary files differindex 375e6d5db..375e6d5db 100644 --- a/sound/songs/midi/mus_shinka.mid +++ b/sound/songs/midi/mus_evolution.mid diff --git a/sound/songs/midi/mus_me_shinka.mid b/sound/songs/midi/mus_evolution_intro.mid Binary files differindex 231f25533..231f25533 100644 --- a/sound/songs/midi/mus_me_shinka.mid +++ b/sound/songs/midi/mus_evolution_intro.mid diff --git a/sound/songs/midi/mus_fanfa5.mid b/sound/songs/midi/mus_evolved.mid Binary files differindex 519ebf29a..519ebf29a 100644 --- a/sound/songs/midi/mus_fanfa5.mid +++ b/sound/songs/midi/mus_evolved.mid diff --git a/sound/songs/midi/mus_annai.mid b/sound/songs/midi/mus_follow_me.mid Binary files differindex efea75d49..efea75d49 100644 --- a/sound/songs/midi/mus_annai.mid +++ b/sound/songs/midi/mus_follow_me.mid diff --git a/sound/songs/midi/mus_hanada.mid b/sound/songs/midi/mus_fuchsia.mid Binary files differindex 4831631fc..4831631fc 100644 --- a/sound/songs/midi/mus_hanada.mid +++ b/sound/songs/midi/mus_fuchsia.mid diff --git a/sound/songs/midi/mus_slot.mid b/sound/songs/midi/mus_game_corner.mid Binary files differindex 24668ec68..24668ec68 100644 --- a/sound/songs/midi/mus_slot.mid +++ b/sound/songs/midi/mus_game_corner.mid diff --git a/sound/songs/midi/mus_titlerog.mid b/sound/songs/midi/mus_game_freak.mid Binary files differindex baef8d1d4..baef8d1d4 100644 --- a/sound/songs/midi/mus_titlerog.mid +++ b/sound/songs/midi/mus_game_freak.mid diff --git a/sound/songs/midi/mus_dendou.mid b/sound/songs/midi/mus_hall_of_fame.mid Binary files differindex 9d7647ccd..9d7647ccd 100644 --- a/sound/songs/midi/mus_dendou.mid +++ b/sound/songs/midi/mus_hall_of_fame.mid diff --git a/sound/songs/midi/mus_me_asa.mid b/sound/songs/midi/mus_heal.mid Binary files differindex 0606aafa6..0606aafa6 100644 --- a/sound/songs/midi/mus_me_asa.mid +++ b/sound/songs/midi/mus_heal.mid diff --git a/sound/songs/midi/mus_kaihuku.mid b/sound/songs/midi/mus_heal_unused.mid Binary files differindex 50c96d7c6..50c96d7c6 100644 --- a/sound/songs/midi/mus_kaihuku.mid +++ b/sound/songs/midi/mus_heal_unused.mid diff --git a/sound/songs/midi/mus_demo.mid b/sound/songs/midi/mus_intro_fight.mid Binary files differindex f5320a273..f5320a273 100644 --- a/sound/songs/midi/mus_demo.mid +++ b/sound/songs/midi/mus_intro_fight.mid diff --git a/sound/songs/midi/mus_purin.mid b/sound/songs/midi/mus_jigglypuff.mid Binary files differindex cc3405f3c..cc3405f3c 100644 --- a/sound/songs/midi/mus_purin.mid +++ b/sound/songs/midi/mus_jigglypuff.mid diff --git a/sound/songs/midi/mus_shion.mid b/sound/songs/midi/mus_lavender.mid Binary files differindex b31831dfa..b31831dfa 100644 --- a/sound/songs/midi/mus_shion.mid +++ b/sound/songs/midi/mus_lavender.mid diff --git a/sound/songs/midi/mus_fanfa1.mid b/sound/songs/midi/mus_level_up.mid Binary files differindex edf9c6e28..edf9c6e28 100644 --- a/sound/songs/midi/mus_fanfa1.mid +++ b/sound/songs/midi/mus_level_up.mid diff --git a/sound/songs/midi/mus_me_wasure.mid b/sound/songs/midi/mus_move_deleted.mid Binary files differindex 16fe3e1a0..16fe3e1a0 100644 --- a/sound/songs/midi/mus_me_wasure.mid +++ b/sound/songs/midi/mus_move_deleted.mid diff --git a/sound/songs/midi/mus_otsukimi.mid b/sound/songs/midi/mus_mt_moon.mid Binary files differindex c7da3b036..c7da3b036 100644 --- a/sound/songs/midi/mus_otsukimi.mid +++ b/sound/songs/midi/mus_mt_moon.mid diff --git a/sound/songs/midi/mus_okurimono.mid b/sound/songs/midi/mus_mystery_gift.mid Binary files differindex bfde1f175..bfde1f175 100644 --- a/sound/songs/midi/mus_okurimono.mid +++ b/sound/songs/midi/mus_mystery_gift.mid diff --git a/sound/songs/midi/mus_network.mid b/sound/songs/midi/mus_net_center.mid Binary files differindex 292dad852..292dad852 100644 --- a/sound/songs/midi/mus_network.mid +++ b/sound/songs/midi/mus_net_center.mid diff --git a/sound/songs/midi/mus_seibetu.mid b/sound/songs/midi/mus_new_game_exit.mid Binary files differindex 8c0a1d7ea..8c0a1d7ea 100644 --- a/sound/songs/midi/mus_seibetu.mid +++ b/sound/songs/midi/mus_new_game_exit.mid diff --git a/sound/songs/midi/mus_sousa.mid b/sound/songs/midi/mus_new_game_instruct.mid Binary files differindex 0c936e8f6..0c936e8f6 100644 --- a/sound/songs/midi/mus_sousa.mid +++ b/sound/songs/midi/mus_new_game_instruct.mid diff --git a/sound/songs/midi/mus_sekaikan.mid b/sound/songs/midi/mus_new_game_intro.mid Binary files differindex aec6a0240..aec6a0240 100644 --- a/sound/songs/midi/mus_sekaikan.mid +++ b/sound/songs/midi/mus_new_game_intro.mid diff --git a/sound/songs/midi/mus_ohkido.mid b/sound/songs/midi/mus_oak.mid Binary files differindex fa4710a23..fa4710a23 100644 --- a/sound/songs/midi/mus_ohkido.mid +++ b/sound/songs/midi/mus_oak.mid diff --git a/sound/songs/midi/mus_kenkyu.mid b/sound/songs/midi/mus_oak_lab.mid Binary files differindex 471a1baab..471a1baab 100644 --- a/sound/songs/midi/mus_kenkyu.mid +++ b/sound/songs/midi/mus_oak_lab.mid diff --git a/sound/songs/midi/mus_me_bachi.mid b/sound/songs/midi/mus_obtain_badge.mid Binary files differindex 05fe1516a..05fe1516a 100644 --- a/sound/songs/midi/mus_me_bachi.mid +++ b/sound/songs/midi/mus_obtain_badge.mid diff --git a/sound/songs/midi/mus_me_kinomi.mid b/sound/songs/midi/mus_obtain_berry.mid Binary files differindex e7eb4afd1..e7eb4afd1 100644 --- a/sound/songs/midi/mus_me_kinomi.mid +++ b/sound/songs/midi/mus_obtain_berry.mid diff --git a/sound/songs/midi/mus_fanfa4.mid b/sound/songs/midi/mus_obtain_item.mid Binary files differindex 58cab9350..58cab9350 100644 --- a/sound/songs/midi/mus_fanfa4.mid +++ b/sound/songs/midi/mus_obtain_item.mid diff --git a/sound/songs/midi/mus_fan5.mid b/sound/songs/midi/mus_obtain_key_item.mid Binary files differindex e9c01b132..e9c01b132 100644 --- a/sound/songs/midi/mus_fan5.mid +++ b/sound/songs/midi/mus_obtain_key_item.mid diff --git a/sound/songs/midi/mus_me_waza.mid b/sound/songs/midi/mus_obtain_tmhm.mid Binary files differindex 40f9c2ed8..40f9c2ed8 100644 --- a/sound/songs/midi/mus_me_waza.mid +++ b/sound/songs/midi/mus_obtain_tmhm.mid diff --git a/sound/songs/midi/mus_masara.mid b/sound/songs/midi/mus_pallet.mid Binary files differindex fa5917387..fa5917387 100644 --- a/sound/songs/midi/mus_masara.mid +++ b/sound/songs/midi/mus_pallet.mid diff --git a/sound/songs/midi/mus_nana123.mid b/sound/songs/midi/mus_pewter.mid Binary files differindex dd88863d4..dd88863d4 100644 --- a/sound/songs/midi/mus_nana123.mid +++ b/sound/songs/midi/mus_pewter.mid diff --git a/sound/songs/midi/mus_me_photo.mid b/sound/songs/midi/mus_photo.mid Binary files differindex 76fce4af3..76fce4af3 100644 --- a/sound/songs/midi/mus_me_photo.mid +++ b/sound/songs/midi/mus_photo.mid diff --git a/sound/songs/midi/mus_pokecen.mid b/sound/songs/midi/mus_poke_center.mid Binary files differindex cd905db38..cd905db38 100644 --- a/sound/songs/midi/mus_pokecen.mid +++ b/sound/songs/midi/mus_poke_center.mid diff --git a/sound/songs/midi/mus_pokefue.mid b/sound/songs/midi/mus_poke_flute.mid Binary files differindex 02686a30b..02686a30b 100644 --- a/sound/songs/midi/mus_pokefue.mid +++ b/sound/songs/midi/mus_poke_flute.mid diff --git a/sound/songs/midi/mus_jump.mid b/sound/songs/midi/mus_poke_jump.mid Binary files differindex 6e656a1f0..6e656a1f0 100644 --- a/sound/songs/midi/mus_jump.mid +++ b/sound/songs/midi/mus_poke_jump.mid diff --git a/sound/songs/midi/mus_pokeyashi.mid b/sound/songs/midi/mus_poke_mansion.mid Binary files differindex e5ee78eb0..e5ee78eb0 100644 --- a/sound/songs/midi/mus_pokeyashi.mid +++ b/sound/songs/midi/mus_poke_mansion.mid diff --git a/sound/songs/midi/mus_p_tower.mid b/sound/songs/midi/mus_poke_tower.mid Binary files differindex 0a537d191..0a537d191 100644 --- a/sound/songs/midi/mus_p_tower.mid +++ b/sound/songs/midi/mus_poke_tower.mid diff --git a/sound/songs/midi/mus_rival2.mid b/sound/songs/midi/mus_rival_exit.mid Binary files differindex cae821245..cae821245 100644 --- a/sound/songs/midi/mus_rival2.mid +++ b/sound/songs/midi/mus_rival_exit.mid diff --git a/sound/songs/midi/mus_ajito.mid b/sound/songs/midi/mus_rocket_hideout.mid Binary files differindex 1e1fff0f6..1e1fff0f6 100644 --- a/sound/songs/midi/mus_ajito.mid +++ b/sound/songs/midi/mus_rocket_hideout.mid diff --git a/sound/songs/midi/mus_load01.mid b/sound/songs/midi/mus_route1.mid Binary files differindex 9d0ebcde6..9d0ebcde6 100644 --- a/sound/songs/midi/mus_load01.mid +++ b/sound/songs/midi/mus_route1.mid diff --git a/sound/songs/midi/mus_load03.mid b/sound/songs/midi/mus_route11.mid Binary files differindex 3fe21c381..3fe21c381 100644 --- a/sound/songs/midi/mus_load03.mid +++ b/sound/songs/midi/mus_route11.mid diff --git a/sound/songs/midi/mus_opening.mid b/sound/songs/midi/mus_route24.mid Binary files differindex c15773fff..c15773fff 100644 --- a/sound/songs/midi/mus_opening.mid +++ b/sound/songs/midi/mus_route24.mid diff --git a/sound/songs/midi/mus_load02.mid b/sound/songs/midi/mus_route3.mid Binary files differindex 2af80a5a8..2af80a5a8 100644 --- a/sound/songs/midi/mus_load02.mid +++ b/sound/songs/midi/mus_route3.mid diff --git a/sound/songs/midi/mus_battle32.mid b/sound/songs/midi/mus_rs_vs_gym_leader.mid Binary files differindex 0b7c49bd7..0b7c49bd7 100644 --- a/sound/songs/midi/mus_battle32.mid +++ b/sound/songs/midi/mus_rs_vs_gym_leader.mid diff --git a/sound/songs/midi/mus_battle20.mid b/sound/songs/midi/mus_rs_vs_trainer.mid Binary files differindex 531b5fba1..531b5fba1 100644 --- a/sound/songs/midi/mus_battle20.mid +++ b/sound/songs/midi/mus_rs_vs_trainer.mid diff --git a/sound/songs/midi/mus_p_school.mid b/sound/songs/midi/mus_school.mid Binary files differindex 4e6fd3340..4e6fd3340 100644 --- a/sound/songs/midi/mus_p_school.mid +++ b/sound/songs/midi/mus_school.mid diff --git a/sound/songs/midi/mus_nibi.mid b/sound/songs/midi/mus_sevii_123.mid Binary files differindex dd88863d4..dd88863d4 100644 --- a/sound/songs/midi/mus_nibi.mid +++ b/sound/songs/midi/mus_sevii_123.mid diff --git a/sound/songs/midi/mus_nana45.mid b/sound/songs/midi/mus_sevii_45.mid Binary files differindex 98b581132..98b581132 100644 --- a/sound/songs/midi/mus_nana45.mid +++ b/sound/songs/midi/mus_sevii_45.mid diff --git a/sound/songs/midi/mus_nana67.mid b/sound/songs/midi/mus_sevii_67.mid Binary files differindex 537e59a71..537e59a71 100644 --- a/sound/songs/midi/mus_nana67.mid +++ b/sound/songs/midi/mus_sevii_67.mid diff --git a/sound/songs/midi/mus_nanadungeon.mid b/sound/songs/midi/mus_sevii_cave.mid Binary files differindex 7f32963c9..7f32963c9 100644 --- a/sound/songs/midi/mus_nanadungeon.mid +++ b/sound/songs/midi/mus_sevii_cave.mid diff --git a/sound/songs/midi/mus_nanaiseki.mid b/sound/songs/midi/mus_sevii_dungeon.mid Binary files differindex 76d73039e..76d73039e 100644 --- a/sound/songs/midi/mus_nanaiseki.mid +++ b/sound/songs/midi/mus_sevii_dungeon.mid diff --git a/sound/songs/midi/mus_nanashima.mid b/sound/songs/midi/mus_sevii_route.mid Binary files differindex d215f0122..d215f0122 100644 --- a/sound/songs/midi/mus_nanashima.mid +++ b/sound/songs/midi/mus_sevii_route.mid diff --git a/sound/songs/midi/mus_shiruhu.mid b/sound/songs/midi/mus_silph.mid Binary files differindex 8f66ea874..8f66ea874 100644 --- a/sound/songs/midi/mus_shiruhu.mid +++ b/sound/songs/midi/mus_silph.mid diff --git a/sound/songs/midi/mus_me_b_big.mid b/sound/songs/midi/mus_slots_jackpot.mid Binary files differindex 150a669b4..150a669b4 100644 --- a/sound/songs/midi/mus_me_b_big.mid +++ b/sound/songs/midi/mus_slots_jackpot.mid diff --git a/sound/songs/midi/mus_me_b_small.mid b/sound/songs/midi/mus_slots_win.mid Binary files differindex bf7aa33be..bf7aa33be 100644 --- a/sound/songs/midi/mus_me_b_small.mid +++ b/sound/songs/midi/mus_slots_win.mid diff --git a/sound/songs/midi/mus_slowmasara.mid b/sound/songs/midi/mus_slow_pallet.mid Binary files differindex 441fb6348..441fb6348 100644 --- a/sound/songs/midi/mus_slowmasara.mid +++ b/sound/songs/midi/mus_slow_pallet.mid diff --git a/sound/songs/midi/mus_santoan.mid b/sound/songs/midi/mus_ss_anne.mid Binary files differindex b843ca364..b843ca364 100644 --- a/sound/songs/midi/mus_santoan.mid +++ b/sound/songs/midi/mus_ss_anne.mid diff --git a/sound/songs/midi/mus_naminori.mid b/sound/songs/midi/mus_surf.mid Binary files differindex 3ac684ac2..3ac684ac2 100644 --- a/sound/songs/midi/mus_naminori.mid +++ b/sound/songs/midi/mus_surf.mid diff --git a/sound/songs/midi/mus_tvnoize.mid b/sound/songs/midi/mus_teachy_tv_menu.mid Binary files differindex b5d446098..b5d446098 100644 --- a/sound/songs/midi/mus_tvnoize.mid +++ b/sound/songs/midi/mus_teachy_tv_menu.mid diff --git a/sound/songs/midi/mus_oshie_tv.mid b/sound/songs/midi/mus_teachy_tv_show.mid Binary files differindex efea75d49..efea75d49 100644 --- a/sound/songs/midi/mus_oshie_tv.mid +++ b/sound/songs/midi/mus_teachy_tv_show.mid diff --git a/sound/songs/midi/mus_me_zannen.mid b/sound/songs/midi/mus_too_bad.mid Binary files differindex 2d071d524..2d071d524 100644 --- a/sound/songs/midi/mus_me_zannen.mid +++ b/sound/songs/midi/mus_too_bad.mid diff --git a/sound/songs/midi/mus_t_tower.mid b/sound/songs/midi/mus_trainer_tower.mid Binary files differindex 81db02876..81db02876 100644 --- a/sound/songs/midi/mus_t_tower.mid +++ b/sound/songs/midi/mus_trainer_tower.mid diff --git a/sound/songs/midi/mus_union.mid b/sound/songs/midi/mus_union_room.mid Binary files differindex b484050fa..b484050fa 100644 --- a/sound/songs/midi/mus_union.mid +++ b/sound/songs/midi/mus_union_room.mid diff --git a/sound/songs/midi/mus_kuchiba.mid b/sound/songs/midi/mus_vermillion.mid Binary files differindex 11cb67d1a..11cb67d1a 100644 --- a/sound/songs/midi/mus_kuchiba.mid +++ b/sound/songs/midi/mus_vermillion.mid diff --git a/sound/songs/midi/mus_win_gym.mid b/sound/songs/midi/mus_victory_gym_leader.mid Binary files differindex 1ce5dd13c..1ce5dd13c 100644 --- a/sound/songs/midi/mus_win_gym.mid +++ b/sound/songs/midi/mus_victory_gym_leader.mid diff --git a/sound/songs/midi/mus_champ_r.mid b/sound/songs/midi/mus_victory_road.mid Binary files differindex 6552b65bd..6552b65bd 100644 --- a/sound/songs/midi/mus_champ_r.mid +++ b/sound/songs/midi/mus_victory_road.mid diff --git a/sound/songs/midi/mus_win_tre.mid b/sound/songs/midi/mus_victory_trainer.mid Binary files differindex 26fe06bf0..26fe06bf0 100644 --- a/sound/songs/midi/mus_win_tre.mid +++ b/sound/songs/midi/mus_victory_trainer.mid diff --git a/sound/songs/midi/mus_win_yasei.mid b/sound/songs/midi/mus_victory_wild.mid Binary files differindex 51fad46fc..51fad46fc 100644 --- a/sound/songs/midi/mus_win_yasei.mid +++ b/sound/songs/midi/mus_victory_wild.mid diff --git a/sound/songs/midi/mus_t_mori.mid b/sound/songs/midi/mus_viridian_forest.mid Binary files differindex 76d73039e..76d73039e 100644 --- a/sound/songs/midi/mus_t_mori.mid +++ b/sound/songs/midi/mus_viridian_forest.mid diff --git a/sound/songs/midi/mus_vs_last.mid b/sound/songs/midi/mus_vs_champion.mid Binary files differindex e63d2eb45..e63d2eb45 100644 --- a/sound/songs/midi/mus_vs_last.mid +++ b/sound/songs/midi/mus_vs_champion.mid diff --git a/sound/songs/midi/mus_vs_deo.mid b/sound/songs/midi/mus_vs_deoxys.mid Binary files differindex 1f9c00bb1..1f9c00bb1 100644 --- a/sound/songs/midi/mus_vs_deo.mid +++ b/sound/songs/midi/mus_vs_deoxys.mid diff --git a/sound/songs/midi/mus_vs_gym.mid b/sound/songs/midi/mus_vs_gym_leader.mid Binary files differindex aa2da087f..aa2da087f 100644 --- a/sound/songs/midi/mus_vs_gym.mid +++ b/sound/songs/midi/mus_vs_gym_leader.mid diff --git a/sound/songs/midi/mus_vs_den.mid b/sound/songs/midi/mus_vs_legend.mid Binary files differindex 93d3785be..93d3785be 100644 --- a/sound/songs/midi/mus_vs_den.mid +++ b/sound/songs/midi/mus_vs_legend.mid diff --git a/sound/songs/midi/mus_vs_myu2.mid b/sound/songs/midi/mus_vs_mewtwo.mid Binary files differindex e6a578320..e6a578320 100644 --- a/sound/songs/midi/mus_vs_myu2.mid +++ b/sound/songs/midi/mus_vs_mewtwo.mid diff --git a/sound/songs/midi/mus_vs_tore.mid b/sound/songs/midi/mus_vs_trainer.mid Binary files differindex 95172f63e..95172f63e 100644 --- a/sound/songs/midi/mus_vs_tore.mid +++ b/sound/songs/midi/mus_vs_trainer.mid diff --git a/sound/songs/midi/mus_vs_yasei.mid b/sound/songs/midi/mus_vs_wild.mid Binary files differindex 835aff19b..835aff19b 100644 --- a/sound/songs/midi/mus_vs_yasei.mid +++ b/sound/songs/midi/mus_vs_wild.mid diff --git a/sound/songs/midi/mus_w_door.mid b/sound/songs/midi/mus_w_door.mid Binary files differdeleted file mode 100644 index 82ffd2ebe..000000000 --- a/sound/songs/midi/mus_w_door.mid +++ /dev/null diff --git a/sound/songs/midi/se_dendou.mid b/sound/songs/midi/se_applause.mid Binary files differindex 4ab2a2212..4ab2a2212 100644 --- a/sound/songs/midi/se_dendou.mid +++ b/sound/songs/midi/se_applause.mid diff --git a/sound/songs/midi/se_bowa.mid b/sound/songs/midi/se_ball.mid Binary files differindex 684ea618c..684ea618c 100644 --- a/sound/songs/midi/se_bowa.mid +++ b/sound/songs/midi/se_ball.mid diff --git a/sound/songs/midi/se_kon.mid b/sound/songs/midi/se_ball_bounce_1.mid Binary files differindex 438d4b047..438d4b047 100644 --- a/sound/songs/midi/se_kon.mid +++ b/sound/songs/midi/se_ball_bounce_1.mid diff --git a/sound/songs/midi/se_kon2.mid b/sound/songs/midi/se_ball_bounce_2.mid Binary files differindex 961d82642..961d82642 100644 --- a/sound/songs/midi/se_kon2.mid +++ b/sound/songs/midi/se_ball_bounce_2.mid diff --git a/sound/songs/midi/se_kon3.mid b/sound/songs/midi/se_ball_bounce_3.mid Binary files differindex fc35f1931..fc35f1931 100644 --- a/sound/songs/midi/se_kon3.mid +++ b/sound/songs/midi/se_ball_bounce_3.mid diff --git a/sound/songs/midi/se_kon4.mid b/sound/songs/midi/se_ball_bounce_4.mid Binary files differindex b0f5561b9..b0f5561b9 100644 --- a/sound/songs/midi/se_kon4.mid +++ b/sound/songs/midi/se_ball_bounce_4.mid diff --git a/sound/songs/midi/se_bowa2.mid b/sound/songs/midi/se_ball_open.mid Binary files differindex 669bed700..669bed700 100644 --- a/sound/songs/midi/se_bowa2.mid +++ b/sound/songs/midi/se_ball_open.mid diff --git a/sound/songs/midi/se_nageru.mid b/sound/songs/midi/se_ball_throw.mid Binary files differindex 171f45a5a..171f45a5a 100644 --- a/sound/songs/midi/se_nageru.mid +++ b/sound/songs/midi/se_ball_throw.mid diff --git a/sound/songs/midi/se_suikomu.mid b/sound/songs/midi/se_ball_trade.mid Binary files differindex 871c8e5d3..871c8e5d3 100644 --- a/sound/songs/midi/se_suikomu.mid +++ b/sound/songs/midi/se_ball_trade.mid diff --git a/sound/songs/midi/se_tb_kon.mid b/sound/songs/midi/se_ball_tray_ball.mid Binary files differindex 8526da9c6..8526da9c6 100644 --- a/sound/songs/midi/se_tb_kon.mid +++ b/sound/songs/midi/se_ball_tray_ball.mid diff --git a/sound/songs/midi/se_tb_start.mid b/sound/songs/midi/se_ball_tray_enter.mid Binary files differindex c88e2a8ea..c88e2a8ea 100644 --- a/sound/songs/midi/se_tb_start.mid +++ b/sound/songs/midi/se_ball_tray_enter.mid diff --git a/sound/songs/midi/se_tb_kara.mid b/sound/songs/midi/se_ball_tray_exit.mid Binary files differindex a4c2a51d7..a4c2a51d7 100644 --- a/sound/songs/midi/se_tb_kara.mid +++ b/sound/songs/midi/se_ball_tray_exit.mid diff --git a/sound/songs/midi/se_fuusen2.mid b/sound/songs/midi/se_balloon_blue.mid Binary files differindex 4efc1a525..4efc1a525 100644 --- a/sound/songs/midi/se_fuusen2.mid +++ b/sound/songs/midi/se_balloon_blue.mid diff --git a/sound/songs/midi/se_fuusen1.mid b/sound/songs/midi/se_balloon_red.mid Binary files differindex d22679a86..d22679a86 100644 --- a/sound/songs/midi/se_fuusen1.mid +++ b/sound/songs/midi/se_balloon_red.mid diff --git a/sound/songs/midi/se_fuusen3.mid b/sound/songs/midi/se_balloon_yellow.mid Binary files differindex ae40e0008..ae40e0008 100644 --- a/sound/songs/midi/se_fuusen3.mid +++ b/sound/songs/midi/se_balloon_yellow.mid diff --git a/sound/songs/midi/se_ban.mid b/sound/songs/midi/se_bang.mid Binary files differindex 0722a1c36..0722a1c36 100644 --- a/sound/songs/midi/se_ban.mid +++ b/sound/songs/midi/se_bang.mid diff --git a/sound/songs/midi/se_moter.mid b/sound/songs/midi/se_berry_blender.mid Binary files differindex 8203333e5..8203333e5 100644 --- a/sound/songs/midi/se_moter.mid +++ b/sound/songs/midi/se_berry_blender.mid diff --git a/sound/songs/midi/se_jitensya.mid b/sound/songs/midi/se_bike_bell.mid Binary files differindex 9d5de6cbd..9d5de6cbd 100644 --- a/sound/songs/midi/se_jitensya.mid +++ b/sound/songs/midi/se_bike_bell.mid diff --git a/sound/songs/midi/se_jite_pyoko.mid b/sound/songs/midi/se_bike_hop.mid Binary files differindex 013be8590..013be8590 100644 --- a/sound/songs/midi/se_jite_pyoko.mid +++ b/sound/songs/midi/se_bike_hop.mid diff --git a/sound/songs/midi/se_toy_kabe.mid b/sound/songs/midi/se_breakable_door.mid Binary files differindex c35be0c0d..c35be0c0d 100644 --- a/sound/songs/midi/se_toy_kabe.mid +++ b/sound/songs/midi/se_breakable_door.mid diff --git a/sound/songs/midi/se_hashi.mid b/sound/songs/midi/se_bridge_walk.mid Binary files differindex fdd772c18..fdd772c18 100644 --- a/sound/songs/midi/se_hashi.mid +++ b/sound/songs/midi/se_bridge_walk.mid diff --git a/sound/songs/midi/se_tk_kasya.mid b/sound/songs/midi/se_click.mid Binary files differindex baa73e0c6..baa73e0c6 100644 --- a/sound/songs/midi/se_tk_kasya.mid +++ b/sound/songs/midi/se_click.mid diff --git a/sound/songs/midi/se_fu_zaku2.mid b/sound/songs/midi/se_contest_condition_lose.mid Binary files differindex 3fc903844..3fc903844 100644 --- a/sound/songs/midi/se_fu_zaku2.mid +++ b/sound/songs/midi/se_contest_condition_lose.mid diff --git a/sound/songs/midi/se_c_maku_d.mid b/sound/songs/midi/se_contest_curtain_fall.mid Binary files differindex 04e2bfb11..04e2bfb11 100644 --- a/sound/songs/midi/se_c_maku_d.mid +++ b/sound/songs/midi/se_contest_curtain_fall.mid diff --git a/sound/songs/midi/se_c_maku_u.mid b/sound/songs/midi/se_contest_curtain_rise.mid Binary files differindex 109f92322..109f92322 100644 --- a/sound/songs/midi/se_c_maku_u.mid +++ b/sound/songs/midi/se_contest_curtain_rise.mid diff --git a/sound/songs/midi/se_c_gaji.mid b/sound/songs/midi/se_contest_heart.mid Binary files differindex 94b6389b7..94b6389b7 100644 --- a/sound/songs/midi/se_c_gaji.mid +++ b/sound/songs/midi/se_contest_heart.mid diff --git a/sound/songs/midi/se_c_pasi.mid b/sound/songs/midi/se_contest_icon_change.mid Binary files differindex eea9c5707..eea9c5707 100644 --- a/sound/songs/midi/se_c_pasi.mid +++ b/sound/songs/midi/se_contest_icon_change.mid diff --git a/sound/songs/midi/se_c_syu.mid b/sound/songs/midi/se_contest_icon_clear.mid Binary files differindex 3766d5f51..3766d5f51 100644 --- a/sound/songs/midi/se_c_syu.mid +++ b/sound/songs/midi/se_contest_icon_clear.mid diff --git a/sound/songs/midi/se_c_pikon.mid b/sound/songs/midi/se_contest_mons_turn.mid Binary files differindex 718a61443..718a61443 100644 --- a/sound/songs/midi/se_c_pikon.mid +++ b/sound/songs/midi/se_contest_mons_turn.mid diff --git a/sound/songs/midi/se_jyuni.mid b/sound/songs/midi/se_contest_place.mid Binary files differindex f68a31e46..f68a31e46 100644 --- a/sound/songs/midi/se_jyuni.mid +++ b/sound/songs/midi/se_contest_place.mid diff --git a/sound/songs/midi/se_z_search.mid b/sound/songs/midi/se_dex_search.mid Binary files differindex 1869374af..1869374af 100644 --- a/sound/songs/midi/se_z_search.mid +++ b/sound/songs/midi/se_dex_search.mid diff --git a/sound/songs/midi/se_pinpon.mid b/sound/songs/midi/se_ding_dong.mid Binary files differindex 924dafda5..924dafda5 100644 --- a/sound/songs/midi/se_pinpon.mid +++ b/sound/songs/midi/se_ding_dong.mid diff --git a/sound/songs/midi/se_door.mid b/sound/songs/midi/se_door.mid Binary files differindex 004889e93..82ffd2ebe 100644 --- a/sound/songs/midi/se_door.mid +++ b/sound/songs/midi/se_door.mid diff --git a/sound/songs/midi/se_t_ooame.mid b/sound/songs/midi/se_downpour.mid Binary files differindex 3aedd4404..3aedd4404 100644 --- a/sound/songs/midi/se_t_ooame.mid +++ b/sound/songs/midi/se_downpour.mid diff --git a/sound/songs/midi/se_t_ooame_e.mid b/sound/songs/midi/se_downpour_stop.mid Binary files differindex b73010142..b73010142 100644 --- a/sound/songs/midi/se_t_ooame_e.mid +++ b/sound/songs/midi/se_downpour_stop.mid diff --git a/sound/songs/midi/se_kouka_m.mid b/sound/songs/midi/se_effective.mid Binary files differindex d98bd0027..d98bd0027 100644 --- a/sound/songs/midi/se_kouka_m.mid +++ b/sound/songs/midi/se_effective.mid diff --git a/sound/songs/midi/se_tamago.mid b/sound/songs/midi/se_egg_hatch.mid Binary files differindex 67d3959eb..67d3959eb 100644 --- a/sound/songs/midi/se_tamago.mid +++ b/sound/songs/midi/se_egg_hatch.mid diff --git a/sound/songs/midi/se_elebeta.mid b/sound/songs/midi/se_elevator.mid Binary files differindex 66ee5fd1f..66ee5fd1f 100644 --- a/sound/songs/midi/se_elebeta.mid +++ b/sound/songs/midi/se_elevator.mid diff --git a/sound/songs/midi/se_esuka.mid b/sound/songs/midi/se_escalator.mid Binary files differindex 6a9e22a5b..6a9e22a5b 100644 --- a/sound/songs/midi/se_esuka.mid +++ b/sound/songs/midi/se_escalator.mid diff --git a/sound/songs/midi/se_kaidan.mid b/sound/songs/midi/se_exit.mid Binary files differindex 575307d86..575307d86 100644 --- a/sound/songs/midi/se_kaidan.mid +++ b/sound/songs/midi/se_exit.mid diff --git a/sound/songs/midi/se_expmax.mid b/sound/songs/midi/se_exp_max.mid Binary files differindex 8772e915e..8772e915e 100644 --- a/sound/songs/midi/se_expmax.mid +++ b/sound/songs/midi/se_exp_max.mid diff --git a/sound/songs/midi/se_hazure.mid b/sound/songs/midi/se_failure.mid Binary files differindex c3c52f88f..c3c52f88f 100644 --- a/sound/songs/midi/se_hazure.mid +++ b/sound/songs/midi/se_failure.mid diff --git a/sound/songs/midi/se_poke_dead.mid b/sound/songs/midi/se_faint.mid Binary files differindex b6a0df4c8..b6a0df4c8 100644 --- a/sound/songs/midi/se_poke_dead.mid +++ b/sound/songs/midi/se_faint.mid diff --git a/sound/songs/midi/se_ru_hyuu.mid b/sound/songs/midi/se_fall.mid Binary files differindex 1adfc9268..1adfc9268 100644 --- a/sound/songs/midi/se_ru_hyuu.mid +++ b/sound/songs/midi/se_fall.mid diff --git a/sound/songs/midi/se_doku.mid b/sound/songs/midi/se_field_poison.mid Binary files differindex 83841203a..83841203a 100644 --- a/sound/songs/midi/se_doku.mid +++ b/sound/songs/midi/se_field_poison.mid diff --git a/sound/songs/midi/se_nigeru.mid b/sound/songs/midi/se_flee.mid Binary files differindex faf37d529..faf37d529 100644 --- a/sound/songs/midi/se_nigeru.mid +++ b/sound/songs/midi/se_flee.mid diff --git a/sound/songs/midi/se_bidoro.mid b/sound/songs/midi/se_glass_flute.mid Binary files differindex a0b639ba4..a0b639ba4 100644 --- a/sound/songs/midi/se_bidoro.mid +++ b/sound/songs/midi/se_glass_flute.mid diff --git a/sound/songs/midi/se_ru_gasyan.mid b/sound/songs/midi/se_ice_break.mid Binary files differindex 486eabb9b..486eabb9b 100644 --- a/sound/songs/midi/se_ru_gasyan.mid +++ b/sound/songs/midi/se_ice_break.mid diff --git a/sound/songs/midi/se_ru_bari.mid b/sound/songs/midi/se_ice_crack.mid Binary files differindex 14b1991e6..14b1991e6 100644 --- a/sound/songs/midi/se_ru_bari.mid +++ b/sound/songs/midi/se_ice_crack.mid diff --git a/sound/songs/midi/se_ru_gashin.mid b/sound/songs/midi/se_ice_stairs.mid Binary files differindex ae29a385b..ae29a385b 100644 --- a/sound/songs/midi/se_ru_gashin.mid +++ b/sound/songs/midi/se_ice_stairs.mid diff --git a/sound/songs/midi/se_op_basyu.mid b/sound/songs/midi/se_intro_blast.mid Binary files differindex 4648741c2..4648741c2 100644 --- a/sound/songs/midi/se_op_basyu.mid +++ b/sound/songs/midi/se_intro_blast.mid diff --git a/sound/songs/midi/se_daugi.mid b/sound/songs/midi/se_itemfinder.mid Binary files differindex 9b6538a70..9b6538a70 100644 --- a/sound/songs/midi/se_daugi.mid +++ b/sound/songs/midi/se_itemfinder.mid diff --git a/sound/songs/midi/se_fu_zuzuzu.mid b/sound/songs/midi/se_lavaridge_fall_warp.mid Binary files differindex 962113ad3..962113ad3 100644 --- a/sound/songs/midi/se_fu_zuzuzu.mid +++ b/sound/songs/midi/se_lavaridge_fall_warp.mid diff --git a/sound/songs/midi/se_dansa.mid b/sound/songs/midi/se_ledge.mid Binary files differindex 61eae0318..61eae0318 100644 --- a/sound/songs/midi/se_dansa.mid +++ b/sound/songs/midi/se_ledge.mid diff --git a/sound/songs/midi/se_hinsi.mid b/sound/songs/midi/se_low_health.mid Binary files differindex 3676a4a04..3676a4a04 100644 --- a/sound/songs/midi/se_hinsi.mid +++ b/sound/songs/midi/se_low_health.mid diff --git a/sound/songs/midi/se_w020.mid b/sound/songs/midi/se_m_bind.mid Binary files differindex eec8ccae9..eec8ccae9 100644 --- a/sound/songs/midi/se_w020.mid +++ b/sound/songs/midi/se_m_bind.mid diff --git a/sound/songs/midi/se_w004.mid b/sound/songs/midi/se_m_comet_punch.mid Binary files differindex a27538d81..a27538d81 100644 --- a/sound/songs/midi/se_w004.mid +++ b/sound/songs/midi/se_m_comet_punch.mid diff --git a/sound/songs/midi/se_w015.mid b/sound/songs/midi/se_m_cut.mid Binary files differindex 2f1b4e059..2f1b4e059 100644 --- a/sound/songs/midi/se_w015.mid +++ b/sound/songs/midi/se_m_cut.mid diff --git a/sound/songs/midi/se_w003.mid b/sound/songs/midi/se_m_double_slap.mid Binary files differindex 80e7a52a7..80e7a52a7 100644 --- a/sound/songs/midi/se_w003.mid +++ b/sound/songs/midi/se_m_double_slap.mid diff --git a/sound/songs/midi/se_w007.mid b/sound/songs/midi/se_m_fire_punch.mid Binary files differindex 2f75754f3..2f75754f3 100644 --- a/sound/songs/midi/se_w007.mid +++ b/sound/songs/midi/se_m_fire_punch.mid diff --git a/sound/songs/midi/se_w019.mid b/sound/songs/midi/se_m_fly.mid Binary files differindex 6e63f48cc..6e63f48cc 100644 --- a/sound/songs/midi/se_w019.mid +++ b/sound/songs/midi/se_m_fly.mid diff --git a/sound/songs/midi/se_w016.mid b/sound/songs/midi/se_m_gust.mid Binary files differindex 8bf167109..8bf167109 100644 --- a/sound/songs/midi/se_w016.mid +++ b/sound/songs/midi/se_m_gust.mid diff --git a/sound/songs/midi/se_w016b.mid b/sound/songs/midi/se_m_gust2.mid Binary files differindex 6dd7020f9..6dd7020f9 100644 --- a/sound/songs/midi/se_w016b.mid +++ b/sound/songs/midi/se_m_gust2.mid diff --git a/sound/songs/midi/se_w029.mid b/sound/songs/midi/se_m_headbutt.mid Binary files differindex 4cde4e2d5..4cde4e2d5 100644 --- a/sound/songs/midi/se_w029.mid +++ b/sound/songs/midi/se_m_headbutt.mid diff --git a/sound/songs/midi/se_w030.mid b/sound/songs/midi/se_m_horn_attack.mid Binary files differindex 426cdfea4..426cdfea4 100644 --- a/sound/songs/midi/se_w030.mid +++ b/sound/songs/midi/se_m_horn_attack.mid diff --git a/sound/songs/midi/se_w026.mid b/sound/songs/midi/se_m_jump_kick.mid Binary files differindex d43366801..d43366801 100644 --- a/sound/songs/midi/se_w026.mid +++ b/sound/songs/midi/se_m_jump_kick.mid diff --git a/sound/songs/midi/se_w043.mid b/sound/songs/midi/se_m_leer.mid Binary files differindex b44876722..b44876722 100644 --- a/sound/songs/midi/se_w043.mid +++ b/sound/songs/midi/se_m_leer.mid diff --git a/sound/songs/midi/se_w025.mid b/sound/songs/midi/se_m_mega_kick.mid Binary files differindex bcc9590b4..bcc9590b4 100644 --- a/sound/songs/midi/se_w025.mid +++ b/sound/songs/midi/se_m_mega_kick.mid diff --git a/sound/songs/midi/se_w025b.mid b/sound/songs/midi/se_m_mega_kick2.mid Binary files differindex ac165424b..ac165424b 100644 --- a/sound/songs/midi/se_w025b.mid +++ b/sound/songs/midi/se_m_mega_kick2.mid diff --git a/sound/songs/midi/se_w006.mid b/sound/songs/midi/se_m_pay_day.mid Binary files differindex 5f59591be..5f59591be 100644 --- a/sound/songs/midi/se_w006.mid +++ b/sound/songs/midi/se_m_pay_day.mid diff --git a/sound/songs/midi/se_w013.mid b/sound/songs/midi/se_m_razor_wind.mid Binary files differindex ae94dafa2..ae94dafa2 100644 --- a/sound/songs/midi/se_w013.mid +++ b/sound/songs/midi/se_m_razor_wind.mid diff --git a/sound/songs/midi/se_w013b.mid b/sound/songs/midi/se_m_razor_wind2.mid Binary files differindex 09e8d4c5d..09e8d4c5d 100644 --- a/sound/songs/midi/se_w013b.mid +++ b/sound/songs/midi/se_m_razor_wind2.mid diff --git a/sound/songs/midi/se_w028.mid b/sound/songs/midi/se_m_sand_attack.mid Binary files differindex 7a053f799..7a053f799 100644 --- a/sound/songs/midi/se_w028.mid +++ b/sound/songs/midi/se_m_sand_attack.mid diff --git a/sound/songs/midi/se_w010.mid b/sound/songs/midi/se_m_scratch.mid Binary files differindex 4b3c1cfcf..4b3c1cfcf 100644 --- a/sound/songs/midi/se_w010.mid +++ b/sound/songs/midi/se_m_scratch.mid diff --git a/sound/songs/midi/se_w014.mid b/sound/songs/midi/se_m_swords_dance.mid Binary files differindex 8b17c79a9..8b17c79a9 100644 --- a/sound/songs/midi/se_w014.mid +++ b/sound/songs/midi/se_m_swords_dance.mid diff --git a/sound/songs/midi/se_w039.mid b/sound/songs/midi/se_m_tail_whip.mid Binary files differindex 771581ce0..771581ce0 100644 --- a/sound/songs/midi/se_w039.mid +++ b/sound/songs/midi/se_m_tail_whip.mid diff --git a/sound/songs/midi/se_w036.mid b/sound/songs/midi/se_m_take_down.mid Binary files differindex e5427c8df..e5427c8df 100644 --- a/sound/songs/midi/se_w036.mid +++ b/sound/songs/midi/se_m_take_down.mid diff --git a/sound/songs/midi/se_w011.mid b/sound/songs/midi/se_m_vicegrip.mid Binary files differindex 703ae492b..703ae492b 100644 --- a/sound/songs/midi/se_w011.mid +++ b/sound/songs/midi/se_m_vicegrip.mid diff --git a/sound/songs/midi/se_w017.mid b/sound/songs/midi/se_m_wing_attack.mid Binary files differindex 459e72406..459e72406 100644 --- a/sound/songs/midi/se_w017.mid +++ b/sound/songs/midi/se_m_wing_attack.mid diff --git a/sound/songs/midi/se_toy_dango.mid b/sound/songs/midi/se_mud_ball.mid Binary files differindex baa1ed24e..baa1ed24e 100644 --- a/sound/songs/midi/se_toy_dango.mid +++ b/sound/songs/midi/se_mud_ball.mid diff --git a/sound/songs/midi/se_bt_start.mid b/sound/songs/midi/se_mugshot.mid Binary files differindex 8c13783e9..8c13783e9 100644 --- a/sound/songs/midi/se_bt_start.mid +++ b/sound/songs/midi/se_mugshot.mid diff --git a/sound/songs/midi/se_kouka_l.mid b/sound/songs/midi/se_not_effective.mid Binary files differindex 34aafbb18..34aafbb18 100644 --- a/sound/songs/midi/se_kouka_l.mid +++ b/sound/songs/midi/se_not_effective.mid diff --git a/sound/songs/midi/se_toy_a.mid b/sound/songs/midi/se_note_a.mid Binary files differindex b6d5b6159..b6d5b6159 100644 --- a/sound/songs/midi/se_toy_a.mid +++ b/sound/songs/midi/se_note_a.mid diff --git a/sound/songs/midi/se_toy_b.mid b/sound/songs/midi/se_note_b.mid Binary files differindex 9e27e72e7..9e27e72e7 100644 --- a/sound/songs/midi/se_toy_b.mid +++ b/sound/songs/midi/se_note_b.mid diff --git a/sound/songs/midi/se_toy_c.mid b/sound/songs/midi/se_note_c.mid Binary files differindex 3d10dc6cb..3d10dc6cb 100644 --- a/sound/songs/midi/se_toy_c.mid +++ b/sound/songs/midi/se_note_c.mid diff --git a/sound/songs/midi/se_toy_c1.mid b/sound/songs/midi/se_note_c_high.mid Binary files differindex 345925255..345925255 100644 --- a/sound/songs/midi/se_toy_c1.mid +++ b/sound/songs/midi/se_note_c_high.mid diff --git a/sound/songs/midi/se_toy_d.mid b/sound/songs/midi/se_note_d.mid Binary files differindex 0de257ee5..0de257ee5 100644 --- a/sound/songs/midi/se_toy_d.mid +++ b/sound/songs/midi/se_note_d.mid diff --git a/sound/songs/midi/se_toy_e.mid b/sound/songs/midi/se_note_e.mid Binary files differindex 214b32bca..214b32bca 100644 --- a/sound/songs/midi/se_toy_e.mid +++ b/sound/songs/midi/se_note_e.mid diff --git a/sound/songs/midi/se_toy_f.mid b/sound/songs/midi/se_note_f.mid Binary files differindex 780e162e0..780e162e0 100644 --- a/sound/songs/midi/se_toy_f.mid +++ b/sound/songs/midi/se_note_f.mid diff --git a/sound/songs/midi/se_toy_g.mid b/sound/songs/midi/se_note_g.mid Binary files differindex 73dae55a5..73dae55a5 100644 --- a/sound/songs/midi/se_toy_g.mid +++ b/sound/songs/midi/se_note_g.mid diff --git a/sound/songs/midi/se_tama.mid b/sound/songs/midi/se_orb.mid Binary files differindex aa9fc7889..aa9fc7889 100644 --- a/sound/songs/midi/se_tama.mid +++ b/sound/songs/midi/se_orb.mid diff --git a/sound/songs/midi/se_pn_off.mid b/sound/songs/midi/se_pokenav_off.mid Binary files differindex 2fba0d159..2fba0d159 100644 --- a/sound/songs/midi/se_pn_off.mid +++ b/sound/songs/midi/se_pokenav_off.mid diff --git a/sound/songs/midi/se_pn_on.mid b/sound/songs/midi/se_pokenav_on.mid Binary files differindex dfe850794..dfe850794 100644 --- a/sound/songs/midi/se_pn_on.mid +++ b/sound/songs/midi/se_pokenav_on.mid diff --git a/sound/songs/midi/se_mizu.mid b/sound/songs/midi/se_puddle.mid Binary files differindex dfdc85619..dfdc85619 100644 --- a/sound/songs/midi/se_mizu.mid +++ b/sound/songs/midi/se_puddle.mid diff --git a/sound/songs/midi/se_t_koame.mid b/sound/songs/midi/se_rain.mid Binary files differindex d8491b293..d8491b293 100644 --- a/sound/songs/midi/se_t_koame.mid +++ b/sound/songs/midi/se_rain.mid diff --git a/sound/songs/midi/se_t_koame_e.mid b/sound/songs/midi/se_rain_stop.mid Binary files differindex 4a04f73f9..4a04f73f9 100644 --- a/sound/songs/midi/se_t_koame_e.mid +++ b/sound/songs/midi/se_rain_stop.mid diff --git a/sound/songs/midi/se_tu_saa.mid b/sound/songs/midi/se_repel.mid Binary files differindex c84b176cb..c84b176cb 100644 --- a/sound/songs/midi/se_tu_saa.mid +++ b/sound/songs/midi/se_repel.mid diff --git a/sound/songs/midi/se_hi_turun.mid b/sound/songs/midi/se_rotating_gate.mid Binary files differindex 2a09f6c55..2a09f6c55 100644 --- a/sound/songs/midi/se_hi_turun.mid +++ b/sound/songs/midi/se_rotating_gate.mid diff --git a/sound/songs/midi/se_tamakoro.mid b/sound/songs/midi/se_roulette_ball.mid Binary files differindex c6dce2865..c6dce2865 100644 --- a/sound/songs/midi/se_tamakoro.mid +++ b/sound/songs/midi/se_roulette_ball.mid diff --git a/sound/songs/midi/se_tamakoro_e.mid b/sound/songs/midi/se_roulette_ball2.mid Binary files differindex 13675c690..13675c690 100644 --- a/sound/songs/midi/se_tamakoro_e.mid +++ b/sound/songs/midi/se_roulette_ball2.mid diff --git a/sound/songs/midi/se_rs_door.mid b/sound/songs/midi/se_rs_door.mid Binary files differnew file mode 100644 index 000000000..004889e93 --- /dev/null +++ b/sound/songs/midi/se_rs_door.mid diff --git a/sound/songs/midi/se_regi.mid b/sound/songs/midi/se_rs_shop.mid Binary files differindex 28b727cb5..28b727cb5 100644 --- a/sound/songs/midi/se_regi.mid +++ b/sound/songs/midi/se_rs_shop.mid diff --git a/sound/songs/midi/se_reapoke.mid b/sound/songs/midi/se_shiny.mid Binary files differindex b9a4fe810..b9a4fe810 100644 --- a/sound/songs/midi/se_reapoke.mid +++ b/sound/songs/midi/se_shiny.mid diff --git a/sound/songs/midi/se_naminori.mid b/sound/songs/midi/se_ship.mid Binary files differindex ba2aa4931..ba2aa4931 100644 --- a/sound/songs/midi/se_naminori.mid +++ b/sound/songs/midi/se_ship.mid diff --git a/sound/songs/midi/se_jido_doa.mid b/sound/songs/midi/se_sliding_door.mid Binary files differindex 62fa8c911..62fa8c911 100644 --- a/sound/songs/midi/se_jido_doa.mid +++ b/sound/songs/midi/se_sliding_door.mid diff --git a/sound/songs/midi/se_seikai.mid b/sound/songs/midi/se_success.mid Binary files differindex 32bfa07a8..32bfa07a8 100644 --- a/sound/songs/midi/se_seikai.mid +++ b/sound/songs/midi/se_success.mid diff --git a/sound/songs/midi/se_kouka_h.mid b/sound/songs/midi/se_super_effective.mid Binary files differindex e70b12901..e70b12901 100644 --- a/sound/songs/midi/se_kouka_h.mid +++ b/sound/songs/midi/se_super_effective.mid diff --git a/sound/songs/midi/se_mu_pachi.mid b/sound/songs/midi/se_switch.mid Binary files differindex 3d909dadb..3d909dadb 100644 --- a/sound/songs/midi/se_mu_pachi.mid +++ b/sound/songs/midi/se_switch.mid diff --git a/sound/songs/midi/se_basabasa.mid b/sound/songs/midi/se_taillow_wing_flap.mid Binary files differindex 7a965abf5..7a965abf5 100644 --- a/sound/songs/midi/se_basabasa.mid +++ b/sound/songs/midi/se_taillow_wing_flap.mid diff --git a/sound/songs/midi/se_t_kami.mid b/sound/songs/midi/se_thunder.mid Binary files differindex 71d8163bd..71d8163bd 100644 --- a/sound/songs/midi/se_t_kami.mid +++ b/sound/songs/midi/se_thunder.mid diff --git a/sound/songs/midi/se_t_kami2.mid b/sound/songs/midi/se_thunder2.mid Binary files differindex c47731b94..c47731b94 100644 --- a/sound/songs/midi/se_t_kami2.mid +++ b/sound/songs/midi/se_thunder2.mid diff --git a/sound/songs/midi/se_t_ame.mid b/sound/songs/midi/se_thunderstorm.mid Binary files differindex 9e15434cd..9e15434cd 100644 --- a/sound/songs/midi/se_t_ame.mid +++ b/sound/songs/midi/se_thunderstorm.mid diff --git a/sound/songs/midi/se_t_ame_e.mid b/sound/songs/midi/se_thunderstorm_stop.mid Binary files differindex 2397eea64..2397eea64 100644 --- a/sound/songs/midi/se_t_ame_e.mid +++ b/sound/songs/midi/se_thunderstorm_stop.mid diff --git a/sound/songs/midi/se_track_door.mid b/sound/songs/midi/se_truck_door.mid Binary files differindex 5cc1dbad8..5cc1dbad8 100644 --- a/sound/songs/midi/se_track_door.mid +++ b/sound/songs/midi/se_truck_door.mid diff --git a/sound/songs/midi/se_track_move.mid b/sound/songs/midi/se_truck_move.mid Binary files differindex ced96f83a..ced96f83a 100644 --- a/sound/songs/midi/se_track_move.mid +++ b/sound/songs/midi/se_truck_move.mid diff --git a/sound/songs/midi/se_track_stop.mid b/sound/songs/midi/se_truck_stop.mid Binary files differindex 509b2dd8e..509b2dd8e 100644 --- a/sound/songs/midi/se_track_stop.mid +++ b/sound/songs/midi/se_truck_stop.mid diff --git a/sound/songs/midi/se_track_haiki.mid b/sound/songs/midi/se_truck_unload.mid Binary files differindex 42db7fd0e..42db7fd0e 100644 --- a/sound/songs/midi/se_track_haiki.mid +++ b/sound/songs/midi/se_truck_unload.mid diff --git a/sound/songs/midi/se_ki_gasyan.mid b/sound/songs/midi/se_unlock.mid Binary files differindex 8a57132d9..8a57132d9 100644 --- a/sound/songs/midi/se_ki_gasyan.mid +++ b/sound/songs/midi/se_unlock.mid diff --git a/sound/songs/midi/se_kaifuku.mid b/sound/songs/midi/se_use_item.mid Binary files differindex 4375a705d..4375a705d 100644 --- a/sound/songs/midi/se_kaifuku.mid +++ b/sound/songs/midi/se_use_item.mid diff --git a/sound/songs/midi/se_jihanki.mid b/sound/songs/midi/se_vend.mid Binary files differindex ac6436d72..ac6436d72 100644 --- a/sound/songs/midi/se_jihanki.mid +++ b/sound/songs/midi/se_vend.mid diff --git a/sound/songs/midi/se_tk_warpin.mid b/sound/songs/midi/se_warp_in.mid Binary files differindex e47d3df4d..e47d3df4d 100644 --- a/sound/songs/midi/se_tk_warpin.mid +++ b/sound/songs/midi/se_warp_in.mid diff --git a/sound/songs/midi/se_tk_warpout.mid b/sound/songs/midi/se_warp_out.mid Binary files differindex 5072e6448..5072e6448 100644 --- a/sound/songs/midi/se_tk_warpout.mid +++ b/sound/songs/midi/se_warp_out.mid diff --git a/sound/songs/se_bag1.s b/sound/songs/se_bag_cursor.s index bbf98fea7..36a9b5e76 100644 --- a/sound/songs/se_bag1.s +++ b/sound/songs/se_bag_cursor.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_bag1 + .global se_bag_cursor .align 2 - .equ se_bag1_grp, voicegroup129 - .equ se_bag1_pri, 5 - .equ se_bag1_rev, reverb_set+50 + .equ se_bag_cursor_grp, voicegroup129 + .equ se_bag_cursor_pri, 5 + .equ se_bag_cursor_rev, reverb_set+50 -se_bag1_1: @ 86BC774 +se_bag_cursor_1: @ 86BC774 .byte KEYSH, 0x00 .byte TEMPO, 0x9B .byte VOICE, 0x0A @@ -24,7 +24,7 @@ se_bag1_1: @ 86BC774 .byte W03 .byte FINE -se_bag1_2: @ 86BC78A +se_bag_cursor_2: @ 86BC78A .byte VOL, 0x7F .byte KEYSH, 0x00 .byte VOICE, 0x7C @@ -41,12 +41,12 @@ se_bag1_2: @ 86BC78A @ *************************************** .align 2 -se_bag1: @ 86BC79C +se_bag_cursor: @ 86BC79C .byte 2 .byte 0 - .byte se_bag1_pri - .byte se_bag1_rev - .word se_bag1_grp + .byte se_bag_cursor_pri + .byte se_bag_cursor_rev + .word se_bag_cursor_grp - .word se_bag1_1 - .word se_bag1_2 + .word se_bag_cursor_1 + .word se_bag_cursor_2 diff --git a/sound/songs/se_bag2.s b/sound/songs/se_bag_pocket.s index efd893fee..40f00a49b 100644 --- a/sound/songs/se_bag2.s +++ b/sound/songs/se_bag_pocket.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_bag2 + .global se_bag_pocket .align 2 - .equ se_bag2_grp, voicegroup129 - .equ se_bag2_pri, 5 - .equ se_bag2_rev, reverb_set+50 + .equ se_bag_pocket_grp, voicegroup129 + .equ se_bag_pocket_pri, 5 + .equ se_bag_pocket_rev, reverb_set+50 -se_bag2_1: @ 86BC7AC +se_bag_pocket_1: @ 86BC7AC .byte KEYSH, 0x00 .byte TEMPO, 0xD3 .byte VOICE, 0x50 @@ -25,7 +25,7 @@ se_bag2_1: @ 86BC7AC .byte W03 .byte FINE -se_bag2_2: @ 86BC7C4 +se_bag_pocket_2: @ 86BC7C4 .byte KEYSH, 0x00 .byte VOICE, 0x02 .byte XCMD, 0x08 @@ -48,12 +48,12 @@ se_bag2_2: @ 86BC7C4 @ *************************************** .align 2 -se_bag2: @ 86BC7E0 +se_bag_pocket: @ 86BC7E0 .byte 2 .byte 0 - .byte se_bag2_pri - .byte se_bag2_rev - .word se_bag2_grp + .byte se_bag_pocket_pri + .byte se_bag_pocket_rev + .word se_bag_pocket_grp - .word se_bag2_1 - .word se_bag2_2 + .word se_bag_pocket_1 + .word se_bag_pocket_2 diff --git a/sound/songs/se_getting.s b/sound/songs/se_ball_click.s index e9df1ab51..77543a974 100644 --- a/sound/songs/se_getting.s +++ b/sound/songs/se_ball_click.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_getting + .global se_ball_click .align 2 - .equ se_getting_grp, voicegroup129 - .equ se_getting_pri, 5 - .equ se_getting_rev, reverb_set+50 + .equ se_ball_click_grp, voicegroup129 + .equ se_ball_click_pri, 5 + .equ se_ball_click_rev, reverb_set+50 -se_getting_1: @ 86BC7F0 +se_ball_click_1: @ 86BC7F0 .byte KEYSH, 0x00 .byte TEMPO, 0x9B .byte VOICE, 0x03 @@ -31,7 +31,7 @@ se_getting_1: @ 86BC7F0 .byte W03 .byte FINE -se_getting_2: @ 86BC80D +se_ball_click_2: @ 86BC80D .byte KEYSH, 0x00 .byte VOICE, 0x7E .byte VOL, 0x64 @@ -50,12 +50,12 @@ se_getting_2: @ 86BC80D @ *************************************** .align 2 -se_getting: @ 86BC820 +se_ball_click: @ 86BC820 .byte 2 .byte 0 - .byte se_getting_pri - .byte se_getting_rev - .word se_getting_grp + .byte se_ball_click_pri + .byte se_ball_click_rev + .word se_ball_click_grp - .word se_getting_1 - .word se_getting_2 + .word se_ball_click_1 + .word se_ball_click_2 diff --git a/sound/songs/se_card1.s b/sound/songs/se_card_flip.s index 65f26bcce..4c51aca35 100644 --- a/sound/songs/se_card1.s +++ b/sound/songs/se_card_flip.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_card1 + .global se_card_flip .align 2 - .equ se_card1_grp, voicegroup129 - .equ se_card1_pri, 5 - .equ se_card1_rev, reverb_set+50 + .equ se_card_flip_grp, voicegroup129 + .equ se_card_flip_pri, 5 + .equ se_card_flip_rev, reverb_set+50 -se_card1_1: @ 86BC680 +se_card_flip_1: @ 86BC680 .byte KEYSH, 0x00 .byte TEMPO, 0x5B .byte VOICE, 0x7D @@ -31,11 +31,11 @@ se_card1_1: @ 86BC680 @ *************************************** .align 2 -se_card1: @ 86BC6A0 +se_card_flip: @ 86BC6A0 .byte 1 .byte 0 - .byte se_card1_pri - .byte se_card1_rev - .word se_card1_grp + .byte se_card_flip_pri + .byte se_card_flip_rev + .word se_card_flip_grp - .word se_card1_1 + .word se_card_flip_1 diff --git a/sound/songs/se_card2.s b/sound/songs/se_card_flipping.s index 757ff4fc8..e73e1b65f 100644 --- a/sound/songs/se_card2.s +++ b/sound/songs/se_card_flipping.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_card2 + .global se_card_flipping .align 2 - .equ se_card2_grp, voicegroup129 - .equ se_card2_pri, 5 - .equ se_card2_rev, reverb_set+50 + .equ se_card_flipping_grp, voicegroup129 + .equ se_card_flipping_pri, 5 + .equ se_card_flipping_rev, reverb_set+50 -se_card2_1: @ 86BC6AC +se_card_flipping_1: @ 86BC6AC .byte KEYSH, 0x00 .byte TEMPO, 0x5B .byte VOICE, 0x7D @@ -43,11 +43,11 @@ se_card2_1: @ 86BC6AC @ *************************************** .align 2 -se_card2: @ 86BC6D8 +se_card_flipping: @ 86BC6D8 .byte 1 .byte 0 - .byte se_card2_pri - .byte se_card2_rev - .word se_card2_grp + .byte se_card_flipping_pri + .byte se_card_flipping_rev + .word se_card_flipping_grp - .word se_card2_1 + .word se_card_flipping_1 diff --git a/sound/songs/se_card3.s b/sound/songs/se_card_open.s index 031e1ff15..4f453687c 100644 --- a/sound/songs/se_card3.s +++ b/sound/songs/se_card_open.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_card3 + .global se_card_open .align 2 - .equ se_card3_grp, voicegroup129 - .equ se_card3_pri, 5 - .equ se_card3_rev, reverb_set+50 + .equ se_card_open_grp, voicegroup129 + .equ se_card_open_pri, 5 + .equ se_card_open_rev, reverb_set+50 -se_card3_1: @ 86BC6E4 +se_card_open_1: @ 86BC6E4 .byte KEYSH, 0x00 .byte TEMPO, 0x57 .byte VOICE, 0x2E @@ -85,7 +85,7 @@ se_card3_1: @ 86BC6E4 .byte W24 .byte FINE -se_card3_2: @ 86BC74D +se_card_open_2: @ 86BC74D .byte KEYSH, 0x00 .byte VOICE, 0x7C .byte PAN, 0x40 @@ -105,12 +105,12 @@ se_card3_2: @ 86BC74D @ *************************************** .align 2 -se_card3: @ 86BC764 +se_card_open: @ 86BC764 .byte 2 .byte 0 - .byte se_card3_pri - .byte se_card3_rev - .word se_card3_grp + .byte se_card_open_pri + .byte se_card_open_rev + .word se_card_open_grp - .word se_card3_1 - .word se_card3_2 + .word se_card_open_1 + .word se_card_open_2 diff --git a/sound/songs/se_deomov.s b/sound/songs/se_deoxys_move.s index 1ff76141b..a9cdd9744 100644 --- a/sound/songs/se_deomov.s +++ b/sound/songs/se_deoxys_move.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_deomov + .global se_deoxys_move .align 2 - .equ se_deomov_grp, voicegroup129 - .equ se_deomov_pri, 5 - .equ se_deomov_rev, reverb_set+50 + .equ se_deoxys_move_grp, voicegroup129 + .equ se_deoxys_move_pri, 5 + .equ se_deoxys_move_rev, reverb_set+50 -se_deomov_1: @ 86BCA34 +se_deoxys_move_1: @ 86BCA34 .byte KEYSH, 0x00 .byte TEMPO, 0x83 .byte VOICE, 0x7B @@ -33,7 +33,7 @@ se_deomov_1: @ 86BCA34 .byte W24 .byte FINE -se_deomov_2: @ 86BCA54 +se_deoxys_move_2: @ 86BCA54 .byte KEYSH, 0x00 .byte VOICE, 0x1F .byte LFOS, 0x2C @@ -109,7 +109,7 @@ se_deomov_2: @ 86BCA54 .byte EOT .byte FINE -se_deomov_3: @ 86BCAA7 +se_deoxys_move_3: @ 86BCAA7 .byte KEYSH, 0x00 .byte VOICE, 0x32 .byte VOL, 0x45 @@ -195,13 +195,13 @@ se_deomov_3: @ 86BCAA7 @ *************************************** .align 2 -se_deomov: @ 86BCB08 +se_deoxys_move: @ 86BCB08 .byte 3 .byte 0 - .byte se_deomov_pri - .byte se_deomov_rev - .word se_deomov_grp + .byte se_deoxys_move_pri + .byte se_deoxys_move_rev + .word se_deoxys_move_grp - .word se_deomov_1 - .word se_deomov_2 - .word se_deomov_3 + .word se_deoxys_move_1 + .word se_deoxys_move_2 + .word se_deoxys_move_3 diff --git a/sound/songs/se_z_page.s b/sound/songs/se_dex_page.s index a767bf5ad..884f0d12a 100644 --- a/sound/songs/se_z_page.s +++ b/sound/songs/se_dex_page.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ se_z_page_grp, voicegroup127 - .equ se_z_page_pri, 5 - .equ se_z_page_rev, reverb_set+50 - .equ se_z_page_mvl, 127 - .equ se_z_page_key, 0 - .equ se_z_page_tbs, 1 - .equ se_z_page_exg, 0 - .equ se_z_page_cmp, 1 + .equ se_dex_page_grp, voicegroup127 + .equ se_dex_page_pri, 5 + .equ se_dex_page_rev, reverb_set+50 + .equ se_dex_page_mvl, 127 + .equ se_dex_page_key, 0 + .equ se_dex_page_tbs, 1 + .equ se_dex_page_exg, 0 + .equ se_dex_page_cmp, 1 .section .rodata - .global se_z_page + .global se_dex_page .align 2 @********************** Track 1 **********************@ -se_z_page_1: - .byte KEYSH , se_z_page_key+0 - .byte TEMPO , 100*se_z_page_tbs/2 +se_dex_page_1: + .byte KEYSH , se_dex_page_key+0 + .byte TEMPO , 100*se_dex_page_tbs/2 .byte VOICE , 4 .byte BENDR , 12 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 90*se_z_page_mvl/mxv + .byte VOL , 90*se_dex_page_mvl/mxv .byte BEND , c_v+4 .byte N01 , Cn5 , v064 .byte W01 @@ -41,14 +41,14 @@ se_z_page_1: @******************************************************@ .align 2 -se_z_page: +se_dex_page: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_z_page_pri @ Priority - .byte se_z_page_rev @ Reverb. + .byte se_dex_page_pri @ Priority + .byte se_dex_page_rev @ Reverb. - .word se_z_page_grp + .word se_dex_page_grp - .word se_z_page_1 + .word se_dex_page_1 .end diff --git a/sound/songs/se_dex_scroll.s b/sound/songs/se_dex_scroll.s new file mode 100644 index 000000000..6c7ad7746 --- /dev/null +++ b/sound/songs/se_dex_scroll.s @@ -0,0 +1,46 @@ + .include "MPlayDef.s" + + .equ se_dex_scroll_grp, voicegroup127 + .equ se_dex_scroll_pri, 5 + .equ se_dex_scroll_rev, reverb_set+50 + .equ se_dex_scroll_mvl, 127 + .equ se_dex_scroll_key, 0 + .equ se_dex_scroll_tbs, 1 + .equ se_dex_scroll_exg, 0 + .equ se_dex_scroll_cmp, 1 + + .section .rodata + .global se_dex_scroll + .align 2 + +@********************** Track 1 **********************@ + +se_dex_scroll_1: + .byte KEYSH , se_dex_scroll_key+0 + .byte TEMPO , 100*se_dex_scroll_tbs/2 + .byte VOICE , 4 + .byte BENDR , 12 + .byte XCMD , xIECV , 10 + .byte xIECL , 8 + .byte VOL , 40*se_dex_scroll_mvl/mxv + .byte BEND , c_v+4 + .byte N01 , Gn4 , v127 + .byte W01 + .byte Gn4 , v020 + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_dex_scroll: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_dex_scroll_pri @ Priority + .byte se_dex_scroll_rev @ Reverb. + + .word se_dex_scroll_grp + + .word se_dex_scroll_1 + + .end diff --git a/sound/songs/se_help_cl.s b/sound/songs/se_help_close.s index 6392a7b13..81692e622 100644 --- a/sound/songs/se_help_cl.s +++ b/sound/songs/se_help_close.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_help_cl + .global se_help_close .align 2 - .equ se_help_cl_grp, voicegroup129 - .equ se_help_cl_pri, 5 - .equ se_help_cl_rev, reverb_set+50 + .equ se_help_close_grp, voicegroup129 + .equ se_help_close_pri, 5 + .equ se_help_close_rev, reverb_set+50 -se_help_cl_1: @ 86BC980 +se_help_close_1: @ 86BC980 .byte KEYSH, 0x00 .byte TEMPO, 0xD2 .byte VOICE, 0x18 @@ -85,11 +85,11 @@ se_help_cl_1: @ 86BC980 @ *************************************** .align 2 -se_help_cl: @ 86BC9E0 +se_help_close: @ 86BC9E0 .byte 1 .byte 0 - .byte se_help_cl_pri - .byte se_help_cl_rev - .word se_help_cl_grp + .byte se_help_close_pri + .byte se_help_close_rev + .word se_help_close_grp - .word se_help_cl_1 + .word se_help_close_1 diff --git a/sound/songs/se_help_ng.s b/sound/songs/se_help_error.s index a4f52f455..c3a78dbea 100644 --- a/sound/songs/se_help_ng.s +++ b/sound/songs/se_help_error.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_help_ng + .global se_help_error .align 2 - .equ se_help_ng_grp, voicegroup129 - .equ se_help_ng_pri, 5 - .equ se_help_ng_rev, reverb_set+50 + .equ se_help_error_grp, voicegroup129 + .equ se_help_error_pri, 5 + .equ se_help_error_rev, reverb_set+50 -se_help_ng_1: @ 86BC9EC +se_help_error_1: @ 86BC9EC .byte KEYSH, 0x00 .byte TEMPO, 0xD2 .byte VOICE, 0x18 @@ -54,11 +54,11 @@ se_help_ng_1: @ 86BC9EC @ *************************************** .align 2 -se_help_ng: @ 86BCA28 +se_help_error: @ 86BCA28 .byte 1 .byte 0 - .byte se_help_ng_pri - .byte se_help_ng_rev - .word se_help_ng_grp + .byte se_help_error_pri + .byte se_help_error_rev + .word se_help_error_grp - .word se_help_ng_1 + .word se_help_error_1 diff --git a/sound/songs/se_help_op.s b/sound/songs/se_help_open.s index d5b255a79..a3a6b91af 100644 --- a/sound/songs/se_help_op.s +++ b/sound/songs/se_help_open.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_help_op + .global se_help_open .align 2 - .equ se_help_op_grp, voicegroup129 - .equ se_help_op_pri, 5 - .equ se_help_op_rev, reverb_set+50 + .equ se_help_open_grp, voicegroup129 + .equ se_help_open_pri, 5 + .equ se_help_open_rev, reverb_set+50 -se_help_op_1: @ 86BC910 +se_help_open_1: @ 86BC910 .byte KEYSH, 0x00 .byte TEMPO, 0xD2 .byte VOICE, 0x18 @@ -87,11 +87,11 @@ se_help_op_1: @ 86BC910 @ *************************************** .align 2 -se_help_op: @ 86BC974 +se_help_open: @ 86BC974 .byte 1 .byte 0 - .byte se_help_op_pri - .byte se_help_op_rev - .word se_help_op_grp + .byte se_help_open_pri + .byte se_help_open_rev + .word se_help_open_grp - .word se_help_op_1 + .word se_help_open_1 diff --git a/sound/songs/se_w071.s b/sound/songs/se_m_absorb.s index 3f1e008b9..35213fdaa 100644 --- a/sound/songs/se_w071.s +++ b/sound/songs/se_m_absorb.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w071_grp, voicegroup128 - .equ se_w071_pri, 4 - .equ se_w071_rev, reverb_set+50 - .equ se_w071_mvl, 127 - .equ se_w071_key, 0 - .equ se_w071_tbs, 1 - .equ se_w071_exg, 0 - .equ se_w071_cmp, 1 + .equ se_m_absorb_grp, voicegroup128 + .equ se_m_absorb_pri, 4 + .equ se_m_absorb_rev, reverb_set+50 + .equ se_m_absorb_mvl, 127 + .equ se_m_absorb_key, 0 + .equ se_m_absorb_tbs, 1 + .equ se_m_absorb_exg, 0 + .equ se_m_absorb_cmp, 1 .section .rodata - .global se_w071 + .global se_m_absorb .align 2 @********************** Track 1 **********************@ -se_w071_1: - .byte KEYSH , se_w071_key+0 - .byte TEMPO , 150*se_w071_tbs/2 +se_m_absorb_1: + .byte KEYSH , se_m_absorb_key+0 + .byte TEMPO , 150*se_m_absorb_tbs/2 .byte VOICE , 24 - .byte VOL , 110*se_w071_mvl/mxv + .byte VOL , 110*se_m_absorb_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -28,30 +28,30 @@ se_w071_1: .byte Gn6 , v112 .byte W01 .byte VOICE , 38 - .byte VOL , 58*se_w071_mvl/mxv + .byte VOL , 58*se_m_absorb_mvl/mxv .byte N08 , Gn4 .byte W01 - .byte VOL , 68*se_w071_mvl/mxv + .byte VOL , 68*se_m_absorb_mvl/mxv .byte PAN , c_v+8 .byte BEND , c_v-20 .byte W01 - .byte VOL , 75*se_w071_mvl/mxv + .byte VOL , 75*se_m_absorb_mvl/mxv .byte PAN , c_v-8 .byte BEND , c_v-48 .byte W02 - .byte VOL , 83*se_w071_mvl/mxv + .byte VOL , 83*se_m_absorb_mvl/mxv .byte PAN , c_v+8 .byte BEND , c_v-18 .byte W01 - .byte VOL , 90*se_w071_mvl/mxv + .byte VOL , 90*se_m_absorb_mvl/mxv .byte PAN , c_v-8 .byte BEND , c_v+10 .byte W01 - .byte VOL , 101*se_w071_mvl/mxv + .byte VOL , 101*se_m_absorb_mvl/mxv .byte PAN , c_v+9 .byte BEND , c_v+39 .byte W01 - .byte VOL , 110*se_w071_mvl/mxv + .byte VOL , 110*se_m_absorb_mvl/mxv .byte PAN , c_v-8 .byte BEND , c_v+63 .byte W03 @@ -60,14 +60,14 @@ se_w071_1: @******************************************************@ .align 2 -se_w071: +se_m_absorb: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w071_pri @ Priority - .byte se_w071_rev @ Reverb. + .byte se_m_absorb_pri @ Priority + .byte se_m_absorb_rev @ Reverb. - .word se_w071_grp + .word se_m_absorb_grp - .word se_w071_1 + .word se_m_absorb_1 .end diff --git a/sound/songs/se_w071b.s b/sound/songs/se_m_absorb_2.s index 81d8fe8c7..3f9df6dc4 100644 --- a/sound/songs/se_w071b.s +++ b/sound/songs/se_m_absorb_2.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w071b_grp, voicegroup128 - .equ se_w071b_pri, 4 - .equ se_w071b_rev, reverb_set+50 - .equ se_w071b_mvl, 127 - .equ se_w071b_key, 0 - .equ se_w071b_tbs, 1 - .equ se_w071b_exg, 0 - .equ se_w071b_cmp, 1 + .equ se_m_absorb_2_grp, voicegroup128 + .equ se_m_absorb_2_pri, 4 + .equ se_m_absorb_2_rev, reverb_set+50 + .equ se_m_absorb_2_mvl, 127 + .equ se_m_absorb_2_key, 0 + .equ se_m_absorb_2_tbs, 1 + .equ se_m_absorb_2_exg, 0 + .equ se_m_absorb_2_cmp, 1 .section .rodata - .global se_w071b + .global se_m_absorb_2 .align 2 @********************** Track 1 **********************@ -se_w071b_1: - .byte KEYSH , se_w071b_key+0 - .byte TEMPO , 150*se_w071b_tbs/2 +se_m_absorb_2_1: + .byte KEYSH , se_m_absorb_2_key+0 + .byte TEMPO , 150*se_m_absorb_2_tbs/2 .byte VOICE , 46 - .byte VOL , 110*se_w071b_mvl/mxv + .byte VOL , 110*se_m_absorb_2_mvl/mxv .byte BENDR , 2 .byte PAN , c_v+0 .byte BEND , c_v+15 @@ -81,11 +81,11 @@ se_w071b_1: @********************** Track 2 **********************@ -se_w071b_2: - .byte KEYSH , se_w071b_key+0 +se_m_absorb_2_2: + .byte KEYSH , se_m_absorb_2_key+0 .byte VOICE , 53 .byte BENDR , 2 - .byte VOL , 43*se_w071b_mvl/mxv + .byte VOL , 43*se_m_absorb_2_mvl/mxv .byte BEND , c_v+15 .byte N02 , An6 , v112 .byte W02 @@ -141,15 +141,15 @@ se_w071b_2: @******************************************************@ .align 2 -se_w071b: +se_m_absorb_2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w071b_pri @ Priority - .byte se_w071b_rev @ Reverb. + .byte se_m_absorb_2_pri @ Priority + .byte se_m_absorb_2_rev @ Reverb. - .word se_w071b_grp + .word se_m_absorb_2_grp - .word se_w071b_1 - .word se_w071b_2 + .word se_m_absorb_2_1 + .word se_m_absorb_2_2 .end diff --git a/sound/songs/se_w151.s b/sound/songs/se_m_acid_armor.s index c012b2d5f..c7f350a9b 100644 --- a/sound/songs/se_w151.s +++ b/sound/songs/se_m_acid_armor.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w151_grp, voicegroup128 - .equ se_w151_pri, 4 - .equ se_w151_rev, reverb_set+50 - .equ se_w151_mvl, 127 - .equ se_w151_key, 0 - .equ se_w151_tbs, 1 - .equ se_w151_exg, 0 - .equ se_w151_cmp, 1 + .equ se_m_acid_armor_grp, voicegroup128 + .equ se_m_acid_armor_pri, 4 + .equ se_m_acid_armor_rev, reverb_set+50 + .equ se_m_acid_armor_mvl, 127 + .equ se_m_acid_armor_key, 0 + .equ se_m_acid_armor_tbs, 1 + .equ se_m_acid_armor_exg, 0 + .equ se_m_acid_armor_cmp, 1 .section .rodata - .global se_w151 + .global se_m_acid_armor .align 2 @********************** Track 1 **********************@ -se_w151_1: - .byte KEYSH , se_w151_key+0 - .byte TEMPO , 150*se_w151_tbs/2 +se_m_acid_armor_1: + .byte KEYSH , se_m_acid_armor_key+0 + .byte TEMPO , 150*se_m_acid_armor_tbs/2 .byte VOICE , 31 - .byte VOL , 110*se_w151_mvl/mxv + .byte VOL , 110*se_m_acid_armor_mvl/mxv .byte BENDR , 24 .byte PAN , c_v+0 .byte BEND , c_v-37 @@ -189,14 +189,14 @@ se_w151_1: @******************************************************@ .align 2 -se_w151: +se_m_acid_armor: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w151_pri @ Priority - .byte se_w151_rev @ Reverb. + .byte se_m_acid_armor_pri @ Priority + .byte se_m_acid_armor_rev @ Reverb. - .word se_w151_grp + .word se_m_acid_armor_grp - .word se_w151_1 + .word se_m_acid_armor_1 .end diff --git a/sound/songs/se_w213.s b/sound/songs/se_m_attract.s index b35e17038..8e18c16dc 100644 --- a/sound/songs/se_w213.s +++ b/sound/songs/se_m_attract.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w213_grp, voicegroup128 - .equ se_w213_pri, 4 - .equ se_w213_rev, reverb_set+50 - .equ se_w213_mvl, 127 - .equ se_w213_key, 0 - .equ se_w213_tbs, 1 - .equ se_w213_exg, 0 - .equ se_w213_cmp, 1 + .equ se_m_attract_grp, voicegroup128 + .equ se_m_attract_pri, 4 + .equ se_m_attract_rev, reverb_set+50 + .equ se_m_attract_mvl, 127 + .equ se_m_attract_key, 0 + .equ se_m_attract_tbs, 1 + .equ se_m_attract_exg, 0 + .equ se_m_attract_cmp, 1 .section .rodata - .global se_w213 + .global se_m_attract .align 2 @********************** Track 1 **********************@ -se_w213_1: - .byte KEYSH , se_w213_key+0 - .byte TEMPO , 210*se_w213_tbs/2 +se_m_attract_1: + .byte KEYSH , se_m_attract_key+0 + .byte TEMPO , 210*se_m_attract_tbs/2 .byte VOICE , 46 - .byte VOL , 95*se_w213_mvl/mxv + .byte VOL , 95*se_m_attract_mvl/mxv .byte BENDR , 2 .byte PAN , c_v+0 .byte BEND , c_v+15 @@ -67,11 +67,11 @@ se_w213_1: @********************** Track 2 **********************@ -se_w213_2: - .byte KEYSH , se_w213_key+0 +se_m_attract_2: + .byte KEYSH , se_m_attract_key+0 .byte VOICE , 53 .byte BENDR , 2 - .byte VOL , 43*se_w213_mvl/mxv + .byte VOL , 43*se_m_attract_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+15 .byte N06 , Cn5 , v120 @@ -112,15 +112,15 @@ se_w213_2: @******************************************************@ .align 2 -se_w213: +se_m_attract: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w213_pri @ Priority - .byte se_w213_rev @ Reverb. + .byte se_m_attract_pri @ Priority + .byte se_m_attract_rev @ Reverb. - .word se_w213_grp + .word se_m_attract_grp - .word se_w213_1 - .word se_w213_2 + .word se_m_attract_1 + .word se_m_attract_2 .end diff --git a/sound/songs/se_w213b.s b/sound/songs/se_m_attract2.s index b7da4378e..7d3d6f3c5 100644 --- a/sound/songs/se_w213b.s +++ b/sound/songs/se_m_attract2.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w213b_grp, voicegroup128 - .equ se_w213b_pri, 4 - .equ se_w213b_rev, reverb_set+50 - .equ se_w213b_mvl, 127 - .equ se_w213b_key, 0 - .equ se_w213b_tbs, 1 - .equ se_w213b_exg, 0 - .equ se_w213b_cmp, 1 + .equ se_m_attract2_grp, voicegroup128 + .equ se_m_attract2_pri, 4 + .equ se_m_attract2_rev, reverb_set+50 + .equ se_m_attract2_mvl, 127 + .equ se_m_attract2_key, 0 + .equ se_m_attract2_tbs, 1 + .equ se_m_attract2_exg, 0 + .equ se_m_attract2_cmp, 1 .section .rodata - .global se_w213b + .global se_m_attract2 .align 2 @********************** Track 1 **********************@ -se_w213b_1: - .byte KEYSH , se_w213b_key+0 - .byte TEMPO , 150*se_w213b_tbs/2 +se_m_attract2_1: + .byte KEYSH , se_m_attract2_key+0 + .byte TEMPO , 150*se_m_attract2_tbs/2 .byte VOICE , 61 .byte BENDR , 44 .byte PAN , c_v+0 - .byte VOL , 110*se_w213b_mvl/mxv + .byte VOL , 110*se_m_attract2_mvl/mxv .byte MOD , 30 .byte BEND , c_v+2 .byte N54 , Dn4 , v080 @@ -69,11 +69,11 @@ se_w213b_1: @********************** Track 2 **********************@ -se_w213b_2: - .byte KEYSH , se_w213b_key+0 +se_m_attract2_2: + .byte KEYSH , se_m_attract2_key+0 .byte VOICE , 62 .byte BENDR , 44 - .byte VOL , 110*se_w213b_mvl/mxv + .byte VOL , 110*se_m_attract2_mvl/mxv .byte MOD , 30 .byte PAN , c_v+1 .byte BEND , c_v+1 @@ -113,15 +113,15 @@ se_w213b_2: @******************************************************@ .align 2 -se_w213b: +se_m_attract2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w213b_pri @ Priority - .byte se_w213b_rev @ Reverb. + .byte se_m_attract2_pri @ Priority + .byte se_m_attract2_rev @ Reverb. - .word se_w213b_grp + .word se_m_attract2_grp - .word se_w213b_1 - .word se_w213b_2 + .word se_m_attract2_1 + .word se_m_attract2_2 .end diff --git a/sound/songs/se_m_barrier.s b/sound/songs/se_m_barrier.s new file mode 100644 index 000000000..54d57700f --- /dev/null +++ b/sound/songs/se_m_barrier.s @@ -0,0 +1,276 @@ + .include "MPlayDef.s" + + .equ se_m_barrier_grp, voicegroup128 + .equ se_m_barrier_pri, 4 + .equ se_m_barrier_rev, reverb_set+50 + .equ se_m_barrier_mvl, 127 + .equ se_m_barrier_key, 0 + .equ se_m_barrier_tbs, 1 + .equ se_m_barrier_exg, 0 + .equ se_m_barrier_cmp, 1 + + .section .rodata + .global se_m_barrier + .align 2 + +@********************** Track 1 **********************@ + +se_m_barrier_1: + .byte KEYSH , se_m_barrier_key+0 + .byte TEMPO , 150*se_m_barrier_tbs/2 + .byte VOICE , 19 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v+3 + .byte N06 , Cn6 , v088 + .byte W01 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-8 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-17 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-34 + .byte W01 + .byte PAN , c_v+0 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-45 + .byte W02 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v+0 + .byte N06 , Cn6 , v084 + .byte W01 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-11 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-20 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-37 + .byte W01 + .byte PAN , c_v+0 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-47 + .byte W02 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-1 + .byte N06 , Cn6 , v076 + .byte W01 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-11 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-21 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-38 + .byte W01 + .byte PAN , c_v+0 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-48 + .byte W02 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-1 + .byte N06 , Cn6 , v064 + .byte W01 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-11 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-21 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-38 + .byte W01 + .byte PAN , c_v+0 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-48 + .byte W02 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-2 + .byte N06 , Cn6 , v056 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-12 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-22 + .byte W01 + .byte PAN , c_v+8 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-39 + .byte W01 + .byte PAN , c_v-10 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-49 + .byte W02 + .byte PAN , c_v+0 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-2 + .byte N06 , Cn6 , v044 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-12 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-22 + .byte W01 + .byte PAN , c_v+8 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-39 + .byte W01 + .byte PAN , c_v-10 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-49 + .byte W02 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-2 + .byte N06 , Cn6 , v036 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-13 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-22 + .byte W01 + .byte PAN , c_v+8 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-39 + .byte W01 + .byte PAN , c_v-10 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-49 + .byte W02 + .byte PAN , c_v+0 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-2 + .byte N06 , Cn6 , v028 + .byte W01 + .byte PAN , c_v+5 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte BEND , c_v-13 + .byte W01 + .byte PAN , c_v-6 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte BEND , c_v-22 + .byte W01 + .byte PAN , c_v+8 + .byte VOL , 24*se_m_barrier_mvl/mxv + .byte BEND , c_v-39 + .byte W01 + .byte PAN , c_v-10 + .byte VOL , 11*se_m_barrier_mvl/mxv + .byte BEND , c_v-49 + .byte W02 + .byte W06 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_barrier_2: + .byte KEYSH , se_m_barrier_key+0 + .byte VOICE , 53 + .byte PAN , c_v+0 + .byte VOL , 95*se_m_barrier_mvl/mxv + .byte BEND , c_v-5 + .byte W02 + .byte N06 , An5 , v064 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 + .byte 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W01 + .byte 95*se_m_barrier_mvl/mxv + .byte N06 , An5 , v056 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 +se_m_barrier_2_000: + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W01 + .byte 95*se_m_barrier_mvl/mxv + .byte N06 , An5 , v052 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 + .byte PEND + .byte PATT + .word se_m_barrier_2_000 + .byte VOL , 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W01 + .byte 95*se_m_barrier_mvl/mxv + .byte N06 , An5 , v048 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 + .byte 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W01 + .byte 95*se_m_barrier_mvl/mxv + .byte N06 , An5 , v044 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 + .byte 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W01 + .byte 95*se_m_barrier_mvl/mxv + .byte N06 , An5 , v040 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 + .byte 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W01 + .byte 95*se_m_barrier_mvl/mxv + .byte N06 , An5 , v036 + .byte W02 + .byte VOL , 88*se_m_barrier_mvl/mxv + .byte W02 + .byte 56*se_m_barrier_mvl/mxv + .byte W01 + .byte 24*se_m_barrier_mvl/mxv + .byte W05 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_barrier: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_barrier_pri @ Priority + .byte se_m_barrier_rev @ Reverb. + + .word se_m_barrier_grp + + .word se_m_barrier_1 + .word se_m_barrier_2 + + .end diff --git a/sound/songs/se_w226.s b/sound/songs/se_m_baton_pass.s index fe6c6d05e..30027e5b6 100644 --- a/sound/songs/se_w226.s +++ b/sound/songs/se_m_baton_pass.s @@ -1,43 +1,43 @@ .include "MPlayDef.s" - .equ se_w226_grp, voicegroup128 - .equ se_w226_pri, 4 - .equ se_w226_rev, reverb_set+50 - .equ se_w226_mvl, 127 - .equ se_w226_key, 0 - .equ se_w226_tbs, 1 - .equ se_w226_exg, 0 - .equ se_w226_cmp, 1 + .equ se_m_baton_pass_grp, voicegroup128 + .equ se_m_baton_pass_pri, 4 + .equ se_m_baton_pass_rev, reverb_set+50 + .equ se_m_baton_pass_mvl, 127 + .equ se_m_baton_pass_key, 0 + .equ se_m_baton_pass_tbs, 1 + .equ se_m_baton_pass_exg, 0 + .equ se_m_baton_pass_cmp, 1 .section .rodata - .global se_w226 + .global se_m_baton_pass .align 2 @********************** Track 1 **********************@ -se_w226_1: - .byte KEYSH , se_w226_key+0 +se_m_baton_pass_1: + .byte KEYSH , se_m_baton_pass_key+0 .byte VOICE , 19 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 12*se_w226_mvl/mxv + .byte VOL , 12*se_m_baton_pass_mvl/mxv .byte BEND , c_v+49 .byte N06 , Gn4 , v080 .byte W01 - .byte VOL , 44*se_w226_mvl/mxv + .byte VOL , 44*se_m_baton_pass_mvl/mxv .byte BEND , c_v+22 .byte W01 - .byte VOL , 62*se_w226_mvl/mxv + .byte VOL , 62*se_m_baton_pass_mvl/mxv .byte PAN , c_v+8 - .byte VOL , 75*se_w226_mvl/mxv + .byte VOL , 75*se_m_baton_pass_mvl/mxv .byte BEND , c_v+20 .byte W01 - .byte VOL , 87*se_w226_mvl/mxv + .byte VOL , 87*se_m_baton_pass_mvl/mxv .byte BEND , c_v+33 .byte W01 - .byte VOL , 96*se_w226_mvl/mxv + .byte VOL , 96*se_m_baton_pass_mvl/mxv .byte PAN , c_v-7 - .byte VOL , 100*se_w226_mvl/mxv + .byte VOL , 100*se_m_baton_pass_mvl/mxv .byte BEND , c_v+54 .byte W01 .byte c_v+63 @@ -51,18 +51,18 @@ se_w226_1: .byte VOICE , 45 .byte MOD , 30 .byte BENDR , 24 - .byte VOL , 54*se_w226_mvl/mxv + .byte VOL , 54*se_m_baton_pass_mvl/mxv .byte BEND , c_v+0 .byte N06 , Gn3 , v108 .byte W01 - .byte VOL , 70*se_w226_mvl/mxv + .byte VOL , 70*se_m_baton_pass_mvl/mxv .byte BEND , c_v+4 .byte W01 .byte PAN , c_v+5 - .byte VOL , 80*se_w226_mvl/mxv + .byte VOL , 80*se_m_baton_pass_mvl/mxv .byte BEND , c_v+9 .byte W01 - .byte VOL , 100*se_w226_mvl/mxv + .byte VOL , 100*se_m_baton_pass_mvl/mxv .byte BEND , c_v+16 .byte W01 .byte c_v+24 @@ -123,17 +123,17 @@ se_w226_1: @********************** Track 2 **********************@ -se_w226_2: - .byte KEYSH , se_w226_key+0 +se_m_baton_pass_2: + .byte KEYSH , se_m_baton_pass_key+0 .byte VOICE , 57 - .byte VOL , 59*se_w226_mvl/mxv + .byte VOL , 59*se_m_baton_pass_mvl/mxv .byte N06 , Gs4 , v052 .byte W01 - .byte VOL , 72*se_w226_mvl/mxv + .byte VOL , 72*se_m_baton_pass_mvl/mxv .byte W01 - .byte 90*se_w226_mvl/mxv + .byte 90*se_m_baton_pass_mvl/mxv .byte W01 - .byte 100*se_w226_mvl/mxv + .byte 100*se_m_baton_pass_mvl/mxv .byte W03 .byte W02 .byte N04 , Gs4 , v024 @@ -155,15 +155,15 @@ se_w226_2: @******************************************************@ .align 2 -se_w226: +se_m_baton_pass: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w226_pri @ Priority - .byte se_w226_rev @ Reverb. + .byte se_m_baton_pass_pri @ Priority + .byte se_m_baton_pass_rev @ Reverb. - .word se_w226_grp + .word se_m_baton_pass_grp - .word se_w226_1 - .word se_w226_2 + .word se_m_baton_pass_1 + .word se_m_baton_pass_2 .end diff --git a/sound/songs/se_m_belly_drum.s b/sound/songs/se_m_belly_drum.s new file mode 100644 index 000000000..919c02b16 --- /dev/null +++ b/sound/songs/se_m_belly_drum.s @@ -0,0 +1,72 @@ + .include "MPlayDef.s" + + .equ se_m_belly_drum_grp, voicegroup128 + .equ se_m_belly_drum_pri, 4 + .equ se_m_belly_drum_rev, reverb_set+50 + .equ se_m_belly_drum_mvl, 127 + .equ se_m_belly_drum_key, 0 + .equ se_m_belly_drum_tbs, 1 + .equ se_m_belly_drum_exg, 0 + .equ se_m_belly_drum_cmp, 1 + + .section .rodata + .global se_m_belly_drum + .align 2 + +@********************** Track 1 **********************@ + +se_m_belly_drum_1: + .byte KEYSH , se_m_belly_drum_key+0 + .byte TEMPO , 150*se_m_belly_drum_tbs/2 + .byte VOICE , 6 + .byte BENDR , 12 + .byte VOL , 115*se_m_belly_drum_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte N19 , An2 , v127 + .byte W01 + .byte BEND , c_v-6 + .byte W01 + .byte c_v-10 + .byte W01 + .byte c_v-14 + .byte W01 + .byte c_v-12 + .byte W02 + .byte c_v-14 + .byte W01 + .byte c_v-18 + .byte W01 + .byte VOL , 108*se_m_belly_drum_mvl/mxv + .byte BEND , c_v-20 + .byte W01 + .byte c_v-22 + .byte W01 + .byte VOL , 94*se_m_belly_drum_mvl/mxv + .byte W03 + .byte 78*se_m_belly_drum_mvl/mxv + .byte W01 + .byte 62*se_m_belly_drum_mvl/mxv + .byte W01 + .byte 40*se_m_belly_drum_mvl/mxv + .byte W01 + .byte 27*se_m_belly_drum_mvl/mxv + .byte W02 + .byte 12*se_m_belly_drum_mvl/mxv + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_belly_drum: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_belly_drum_pri @ Priority + .byte se_m_belly_drum_rev @ Reverb. + + .word se_m_belly_drum_grp + + .word se_m_belly_drum_1 + + .end diff --git a/sound/songs/se_w044.s b/sound/songs/se_m_bite.s index ad706d93f..3c51a8f2f 100644 --- a/sound/songs/se_w044.s +++ b/sound/songs/se_m_bite.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w044_grp, voicegroup128 - .equ se_w044_pri, 4 - .equ se_w044_rev, reverb_set+50 - .equ se_w044_mvl, 127 - .equ se_w044_key, 0 - .equ se_w044_tbs, 1 - .equ se_w044_exg, 0 - .equ se_w044_cmp, 1 + .equ se_m_bite_grp, voicegroup128 + .equ se_m_bite_pri, 4 + .equ se_m_bite_rev, reverb_set+50 + .equ se_m_bite_mvl, 127 + .equ se_m_bite_key, 0 + .equ se_m_bite_tbs, 1 + .equ se_m_bite_exg, 0 + .equ se_m_bite_cmp, 1 .section .rodata - .global se_w044 + .global se_m_bite .align 2 @********************** Track 1 **********************@ -se_w044_1: - .byte KEYSH , se_w044_key+0 - .byte TEMPO , 220*se_w044_tbs/2 +se_m_bite_1: + .byte KEYSH , se_m_bite_key+0 + .byte TEMPO , 220*se_m_bite_tbs/2 .byte VOICE , 26 .byte BENDR , 12 .byte PAN , c_v+6 - .byte VOL , 110*se_w044_mvl/mxv + .byte VOL , 110*se_m_bite_mvl/mxv .byte BEND , c_v+0 .byte N02 , Gn3 , v112 .byte W02 @@ -70,10 +70,10 @@ se_w044_1: @********************** Track 2 **********************@ -se_w044_2: - .byte KEYSH , se_w044_key+0 +se_m_bite_2: + .byte KEYSH , se_m_bite_key+0 .byte VOICE , 27 - .byte VOL , 110*se_w044_mvl/mxv + .byte VOL , 110*se_m_bite_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte W10 @@ -86,15 +86,15 @@ se_w044_2: @******************************************************@ .align 2 -se_w044: +se_m_bite: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w044_pri @ Priority - .byte se_w044_rev @ Reverb. + .byte se_m_bite_pri @ Priority + .byte se_m_bite_rev @ Reverb. - .word se_w044_grp + .word se_m_bite_grp - .word se_w044_1 - .word se_w044_2 + .word se_m_bite_1 + .word se_m_bite_2 .end diff --git a/sound/songs/se_w059.s b/sound/songs/se_m_blizzard.s index 6b163ef7e..6bce3c987 100644 --- a/sound/songs/se_w059.s +++ b/sound/songs/se_m_blizzard.s @@ -1,49 +1,49 @@ .include "MPlayDef.s" - .equ se_w059_grp, voicegroup128 - .equ se_w059_pri, 4 - .equ se_w059_rev, reverb_set+50 - .equ se_w059_mvl, 127 - .equ se_w059_key, 0 - .equ se_w059_tbs, 1 - .equ se_w059_exg, 0 - .equ se_w059_cmp, 1 + .equ se_m_blizzard_grp, voicegroup128 + .equ se_m_blizzard_pri, 4 + .equ se_m_blizzard_rev, reverb_set+50 + .equ se_m_blizzard_mvl, 127 + .equ se_m_blizzard_key, 0 + .equ se_m_blizzard_tbs, 1 + .equ se_m_blizzard_exg, 0 + .equ se_m_blizzard_cmp, 1 .section .rodata - .global se_w059 + .global se_m_blizzard .align 2 @********************** Track 1 **********************@ -se_w059_1: - .byte KEYSH , se_w059_key+0 - .byte TEMPO , 150*se_w059_tbs/2 +se_m_blizzard_1: + .byte KEYSH , se_m_blizzard_key+0 + .byte TEMPO , 150*se_m_blizzard_tbs/2 .byte VOICE , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 64*se_w059_mvl/mxv + .byte VOL , 64*se_m_blizzard_mvl/mxv .byte BEND , c_v+0 .byte N24 , Gn3 , v108 .byte W03 - .byte VOL , 79*se_w059_mvl/mxv + .byte VOL , 79*se_m_blizzard_mvl/mxv .byte BEND , c_v+22 .byte W02 .byte c_v+8 .byte W01 - .byte VOL , 84*se_w059_mvl/mxv + .byte VOL , 84*se_m_blizzard_mvl/mxv .byte PAN , c_v-4 .byte W03 - .byte VOL , 91*se_w059_mvl/mxv + .byte VOL , 91*se_m_blizzard_mvl/mxv .byte BEND , c_v+0 .byte W03 - .byte VOL , 100*se_w059_mvl/mxv + .byte VOL , 100*se_m_blizzard_mvl/mxv .byte PAN , c_v-8 .byte W03 - .byte VOL , 110*se_w059_mvl/mxv + .byte VOL , 110*se_m_blizzard_mvl/mxv .byte W03 .byte PAN , c_v-12 .byte W06 -se_w059_1_B1: +se_m_blizzard_1_B1: .byte PAN , c_v-17 .byte BEND , c_v+0 .byte N48 , Gn3 , v108 @@ -84,20 +84,20 @@ se_w059_1_B1: .byte PAN , c_v-11 .byte W03 .byte GOTO - .word se_w059_1_B1 + .word se_m_blizzard_1_B1 .byte FINE @******************************************************@ .align 2 -se_w059: +se_m_blizzard: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w059_pri @ Priority - .byte se_w059_rev @ Reverb. + .byte se_m_blizzard_pri @ Priority + .byte se_m_blizzard_rev @ Reverb. - .word se_w059_grp + .word se_m_blizzard_grp - .word se_w059_1 + .word se_m_blizzard_1 .end diff --git a/sound/songs/se_m_blizzard2.s b/sound/songs/se_m_blizzard2.s new file mode 100644 index 000000000..8c1518e63 --- /dev/null +++ b/sound/songs/se_m_blizzard2.s @@ -0,0 +1,72 @@ + .include "MPlayDef.s" + + .equ se_m_blizzard2_grp, voicegroup128 + .equ se_m_blizzard2_pri, 4 + .equ se_m_blizzard2_rev, reverb_set+50 + .equ se_m_blizzard2_mvl, 127 + .equ se_m_blizzard2_key, 0 + .equ se_m_blizzard2_tbs, 1 + .equ se_m_blizzard2_exg, 0 + .equ se_m_blizzard2_cmp, 1 + + .section .rodata + .global se_m_blizzard2 + .align 2 + +@********************** Track 1 **********************@ + +se_m_blizzard2_1: + .byte KEYSH , se_m_blizzard2_key+0 + .byte TEMPO , 150*se_m_blizzard2_tbs/2 + .byte VOICE , 22 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_blizzard2_mvl/mxv + .byte BEND , c_v+0 + .byte N24 , Gn3 , v108 + .byte W02 + .byte PAN , c_v-19 + .byte W04 + .byte c_v+0 + .byte W01 + .byte VOL , 97*se_m_blizzard2_mvl/mxv + .byte W01 + .byte PAN , c_v+16 + .byte W01 + .byte VOL , 84*se_m_blizzard2_mvl/mxv + .byte W03 + .byte 76*se_m_blizzard2_mvl/mxv + .byte PAN , c_v+2 + .byte W02 + .byte VOL , 55*se_m_blizzard2_mvl/mxv + .byte PAN , c_v-8 + .byte W02 + .byte VOL , 39*se_m_blizzard2_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 25*se_m_blizzard2_mvl/mxv + .byte W01 + .byte PAN , c_v+8 + .byte W01 + .byte VOL , 13*se_m_blizzard2_mvl/mxv + .byte W03 + .byte 7*se_m_blizzard2_mvl/mxv + .byte PAN , c_v+0 + .byte W24 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_blizzard2: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_blizzard2_pri @ Priority + .byte se_m_blizzard2_rev @ Reverb. + + .word se_m_blizzard2_grp + + .word se_m_blizzard2_1 + + .end diff --git a/sound/songs/se_w155.s b/sound/songs/se_m_bonemerang.s index 29508b608..11f035347 100644 --- a/sound/songs/se_w155.s +++ b/sound/songs/se_m_bonemerang.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w155_grp, voicegroup128 - .equ se_w155_pri, 4 - .equ se_w155_rev, reverb_set+50 - .equ se_w155_mvl, 127 - .equ se_w155_key, 0 - .equ se_w155_tbs, 1 - .equ se_w155_exg, 0 - .equ se_w155_cmp, 1 + .equ se_m_bonemerang_grp, voicegroup128 + .equ se_m_bonemerang_pri, 4 + .equ se_m_bonemerang_rev, reverb_set+50 + .equ se_m_bonemerang_mvl, 127 + .equ se_m_bonemerang_key, 0 + .equ se_m_bonemerang_tbs, 1 + .equ se_m_bonemerang_exg, 0 + .equ se_m_bonemerang_cmp, 1 .section .rodata - .global se_w155 + .global se_m_bonemerang .align 2 @********************** Track 1 **********************@ -se_w155_1: - .byte KEYSH , se_w155_key+0 - .byte TEMPO , 150*se_w155_tbs/2 +se_m_bonemerang_1: + .byte KEYSH , se_m_bonemerang_key+0 + .byte TEMPO , 150*se_m_bonemerang_tbs/2 .byte VOICE , 24 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w155_mvl/mxv + .byte VOL , 110*se_m_bonemerang_mvl/mxv .byte BEND , c_v+0 .byte N01 , Cn5 , v127 .byte W01 @@ -44,14 +44,14 @@ se_w155_1: @******************************************************@ .align 2 -se_w155: +se_m_bonemerang: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w155_pri @ Priority - .byte se_w155_rev @ Reverb. + .byte se_m_bonemerang_pri @ Priority + .byte se_m_bonemerang_rev @ Reverb. - .word se_w155_grp + .word se_m_bonemerang_grp - .word se_w155_1 + .word se_m_bonemerang_1 .end diff --git a/sound/songs/se_w280.s b/sound/songs/se_m_brick_break.s index 19d383176..08058089f 100644 --- a/sound/songs/se_w280.s +++ b/sound/songs/se_m_brick_break.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w280_grp, voicegroup128 - .equ se_w280_pri, 4 - .equ se_w280_rev, reverb_set+50 - .equ se_w280_mvl, 127 - .equ se_w280_key, 0 - .equ se_w280_tbs, 1 - .equ se_w280_exg, 0 - .equ se_w280_cmp, 1 + .equ se_m_brick_break_grp, voicegroup128 + .equ se_m_brick_break_pri, 4 + .equ se_m_brick_break_rev, reverb_set+50 + .equ se_m_brick_break_mvl, 127 + .equ se_m_brick_break_key, 0 + .equ se_m_brick_break_tbs, 1 + .equ se_m_brick_break_exg, 0 + .equ se_m_brick_break_cmp, 1 .section .rodata - .global se_w280 + .global se_m_brick_break .align 2 @********************** Track 1 **********************@ -se_w280_1: - .byte KEYSH , se_w280_key+0 - .byte TEMPO , 150*se_w280_tbs/2 +se_m_brick_break_1: + .byte KEYSH , se_m_brick_break_key+0 + .byte TEMPO , 150*se_m_brick_break_tbs/2 .byte VOICE , 41 - .byte VOL , 110*se_w280_mvl/mxv + .byte VOL , 110*se_m_brick_break_mvl/mxv .byte PAN , c_v+0 .byte N01 , Cn4 , v127 .byte W01 @@ -56,10 +56,10 @@ se_w280_1: @********************** Track 2 **********************@ -se_w280_2: - .byte KEYSH , se_w280_key+0 +se_m_brick_break_2: + .byte KEYSH , se_m_brick_break_key+0 .byte VOICE , 4 - .byte VOL , 110*se_w280_mvl/mxv + .byte VOL , 110*se_m_brick_break_mvl/mxv .byte PAN , c_v+0 .byte N01 , Cn3 , v064 .byte W01 @@ -86,15 +86,15 @@ se_w280_2: @******************************************************@ .align 2 -se_w280: +se_m_brick_break: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w280_pri @ Priority - .byte se_w280_rev @ Reverb. + .byte se_m_brick_break_pri @ Priority + .byte se_m_brick_break_rev @ Reverb. - .word se_w280_grp + .word se_m_brick_break_grp - .word se_w280_1 - .word se_w280_2 + .word se_m_brick_break_1 + .word se_m_brick_break_2 .end diff --git a/sound/songs/se_w145.s b/sound/songs/se_m_bubble.s index bb7d87a2d..ee31a176b 100644 --- a/sound/songs/se_w145.s +++ b/sound/songs/se_m_bubble.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w145_grp, voicegroup128 - .equ se_w145_pri, 4 - .equ se_w145_rev, reverb_set+50 - .equ se_w145_mvl, 127 - .equ se_w145_key, 0 - .equ se_w145_tbs, 1 - .equ se_w145_exg, 0 - .equ se_w145_cmp, 1 + .equ se_m_bubble_grp, voicegroup128 + .equ se_m_bubble_pri, 4 + .equ se_m_bubble_rev, reverb_set+50 + .equ se_m_bubble_mvl, 127 + .equ se_m_bubble_key, 0 + .equ se_m_bubble_tbs, 1 + .equ se_m_bubble_exg, 0 + .equ se_m_bubble_cmp, 1 .section .rodata - .global se_w145 + .global se_m_bubble .align 2 @********************** Track 1 **********************@ -se_w145_1: - .byte KEYSH , se_w145_key+0 - .byte TEMPO , 220*se_w145_tbs/2 +se_m_bubble_1: + .byte KEYSH , se_m_bubble_key+0 + .byte TEMPO , 220*se_m_bubble_tbs/2 .byte VOICE , 23 - .byte VOL , 95*se_w145_mvl/mxv + .byte VOL , 95*se_m_bubble_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -44,14 +44,14 @@ se_w145_1: @******************************************************@ .align 2 -se_w145: +se_m_bubble: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w145_pri @ Priority - .byte se_w145_rev @ Reverb. + .byte se_m_bubble_pri @ Priority + .byte se_m_bubble_rev @ Reverb. - .word se_w145_grp + .word se_m_bubble_grp - .word se_w145_1 + .word se_m_bubble_1 .end diff --git a/sound/songs/se_m_bubble2.s b/sound/songs/se_m_bubble2.s new file mode 100644 index 000000000..97e7cbbf8 --- /dev/null +++ b/sound/songs/se_m_bubble2.s @@ -0,0 +1,60 @@ + .include "MPlayDef.s" + + .equ se_m_bubble2_grp, voicegroup128 + .equ se_m_bubble2_pri, 4 + .equ se_m_bubble2_rev, reverb_set+50 + .equ se_m_bubble2_mvl, 127 + .equ se_m_bubble2_key, 0 + .equ se_m_bubble2_tbs, 1 + .equ se_m_bubble2_exg, 0 + .equ se_m_bubble2_cmp, 1 + + .section .rodata + .global se_m_bubble2 + .align 2 + +@********************** Track 1 **********************@ + +se_m_bubble2_1: + .byte KEYSH , se_m_bubble2_key+0 + .byte TEMPO , 220*se_m_bubble2_tbs/2 + .byte VOICE , 24 + .byte VOL , 110*se_m_bubble2_mvl/mxv + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte W03 + .byte N09 , Gn4 , v127 + .byte W02 + .byte BEND , c_v+31 + .byte W02 + .byte c_v-34 + .byte W17 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_bubble2_2: + .byte KEYSH , se_m_bubble2_key+0 + .byte VOICE , 4 + .byte VOL , 110*se_m_bubble2_mvl/mxv + .byte PAN , c_v+0 + .byte N01 , Cn4 , v044 + .byte W24 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_bubble2: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_bubble2_pri @ Priority + .byte se_m_bubble2_rev @ Reverb. + + .word se_m_bubble2_grp + + .word se_m_bubble2_1 + .word se_m_bubble2_2 + + .end diff --git a/sound/songs/se_w145c.s b/sound/songs/se_m_bubble3.s index 61bf7fa0d..c14badb5a 100644 --- a/sound/songs/se_w145c.s +++ b/sound/songs/se_m_bubble3.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w145c_grp, voicegroup128 - .equ se_w145c_pri, 4 - .equ se_w145c_rev, reverb_set+50 - .equ se_w145c_mvl, 127 - .equ se_w145c_key, 0 - .equ se_w145c_tbs, 1 - .equ se_w145c_exg, 0 - .equ se_w145c_cmp, 1 + .equ se_m_bubble3_grp, voicegroup128 + .equ se_m_bubble3_pri, 4 + .equ se_m_bubble3_rev, reverb_set+50 + .equ se_m_bubble3_mvl, 127 + .equ se_m_bubble3_key, 0 + .equ se_m_bubble3_tbs, 1 + .equ se_m_bubble3_exg, 0 + .equ se_m_bubble3_cmp, 1 .section .rodata - .global se_w145c + .global se_m_bubble3 .align 2 @********************** Track 1 **********************@ -se_w145c_1: - .byte KEYSH , se_w145c_key+0 - .byte TEMPO , 220*se_w145c_tbs/2 +se_m_bubble3_1: + .byte KEYSH , se_m_bubble3_key+0 + .byte TEMPO , 220*se_m_bubble3_tbs/2 .byte VOICE , 23 - .byte VOL , 95*se_w145c_mvl/mxv + .byte VOL , 95*se_m_bubble3_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -49,14 +49,14 @@ se_w145c_1: @******************************************************@ .align 2 -se_w145c: +se_m_bubble3: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w145c_pri @ Priority - .byte se_w145c_rev @ Reverb. + .byte se_m_bubble3_pri @ Priority + .byte se_m_bubble3_rev @ Reverb. - .word se_w145c_grp + .word se_m_bubble3_grp - .word se_w145c_1 + .word se_m_bubble3_1 .end diff --git a/sound/songs/se_w062.s b/sound/songs/se_m_bubble_beam.s index 58de81e57..621882b03 100644 --- a/sound/songs/se_w062.s +++ b/sound/songs/se_m_bubble_beam.s @@ -1,56 +1,56 @@ .include "MPlayDef.s" - .equ se_w062_grp, voicegroup128 - .equ se_w062_pri, 4 - .equ se_w062_rev, reverb_set+50 - .equ se_w062_mvl, 127 - .equ se_w062_key, 0 - .equ se_w062_tbs, 1 - .equ se_w062_exg, 0 - .equ se_w062_cmp, 1 + .equ se_m_bubble_beam_grp, voicegroup128 + .equ se_m_bubble_beam_pri, 4 + .equ se_m_bubble_beam_rev, reverb_set+50 + .equ se_m_bubble_beam_mvl, 127 + .equ se_m_bubble_beam_key, 0 + .equ se_m_bubble_beam_tbs, 1 + .equ se_m_bubble_beam_exg, 0 + .equ se_m_bubble_beam_cmp, 1 .section .rodata - .global se_w062 + .global se_m_bubble_beam .align 2 @********************** Track 1 **********************@ -se_w062_1: - .byte KEYSH , se_w062_key+0 - .byte TEMPO , 150*se_w062_tbs/2 +se_m_bubble_beam_1: + .byte KEYSH , se_m_bubble_beam_key+0 + .byte TEMPO , 150*se_m_bubble_beam_tbs/2 .byte VOICE , 9 .byte BENDR , 2 .byte PAN , c_v+0 - .byte VOL , 24*se_w062_mvl/mxv + .byte VOL , 24*se_m_bubble_beam_mvl/mxv .byte BEND , c_v-17 .byte N78 , Bn4 , v080 .byte W01 - .byte VOL , 32*se_w062_mvl/mxv + .byte VOL , 32*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+6 .byte W01 - .byte VOL , 38*se_w062_mvl/mxv + .byte VOL , 38*se_m_bubble_beam_mvl/mxv .byte PAN , c_v-7 .byte W01 - .byte VOL , 48*se_w062_mvl/mxv + .byte VOL , 48*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+9 .byte W01 - .byte VOL , 66*se_w062_mvl/mxv + .byte VOL , 66*se_m_bubble_beam_mvl/mxv .byte PAN , c_v-13 .byte W02 - .byte VOL , 78*se_w062_mvl/mxv + .byte VOL , 78*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+6 .byte W01 - .byte VOL , 94*se_w062_mvl/mxv + .byte VOL , 94*se_m_bubble_beam_mvl/mxv .byte PAN , c_v-6 .byte W01 - .byte VOL , 110*se_w062_mvl/mxv + .byte VOL , 110*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v+6 .byte W01 .byte c_v-7 .byte W02 -se_w062_1_000: +se_m_bubble_beam_1_000: .byte PAN , c_v+9 .byte W01 .byte c_v-13 @@ -62,7 +62,7 @@ se_w062_1_000: .byte c_v+0 .byte W02 .byte PEND -se_w062_1_001: +se_m_bubble_beam_1_001: .byte PAN , c_v+6 .byte W01 .byte c_v-7 @@ -125,34 +125,34 @@ se_w062_1_001: .byte c_v-7 .byte W02 .byte PATT - .word se_w062_1_000 + .word se_m_bubble_beam_1_000 .byte PATT - .word se_w062_1_001 + .word se_m_bubble_beam_1_001 .byte PAN , c_v-6 .byte W01 .byte c_v+0 .byte W01 .byte c_v+6 .byte W01 - .byte VOL , 103*se_w062_mvl/mxv + .byte VOL , 103*se_m_bubble_beam_mvl/mxv .byte PAN , c_v-7 .byte W01 - .byte VOL , 91*se_w062_mvl/mxv + .byte VOL , 91*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+9 .byte W02 - .byte VOL , 72*se_w062_mvl/mxv + .byte VOL , 72*se_m_bubble_beam_mvl/mxv .byte PAN , c_v-13 .byte W01 - .byte VOL , 58*se_w062_mvl/mxv + .byte VOL , 58*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+6 .byte W01 - .byte VOL , 38*se_w062_mvl/mxv + .byte VOL , 38*se_m_bubble_beam_mvl/mxv .byte PAN , c_v-6 .byte W01 - .byte VOL , 15*se_w062_mvl/mxv + .byte VOL , 15*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+0 .byte W01 - .byte VOL , 7*se_w062_mvl/mxv + .byte VOL , 7*se_m_bubble_beam_mvl/mxv .byte PAN , c_v+6 .byte W02 .byte FINE @@ -160,14 +160,14 @@ se_w062_1_001: @******************************************************@ .align 2 -se_w062: +se_m_bubble_beam: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w062_pri @ Priority - .byte se_w062_rev @ Reverb. + .byte se_m_bubble_beam_pri @ Priority + .byte se_m_bubble_beam_rev @ Reverb. - .word se_w062_grp + .word se_m_bubble_beam_grp - .word se_w062_1 + .word se_m_bubble_beam_1 .end diff --git a/sound/songs/se_m_bubble_beam2.s b/sound/songs/se_m_bubble_beam2.s new file mode 100644 index 000000000..0e8cbf5e4 --- /dev/null +++ b/sound/songs/se_m_bubble_beam2.s @@ -0,0 +1,131 @@ + .include "MPlayDef.s" + + .equ se_m_bubble_beam2_grp, voicegroup128 + .equ se_m_bubble_beam2_pri, 4 + .equ se_m_bubble_beam2_rev, reverb_set+50 + .equ se_m_bubble_beam2_mvl, 127 + .equ se_m_bubble_beam2_key, 0 + .equ se_m_bubble_beam2_tbs, 1 + .equ se_m_bubble_beam2_exg, 0 + .equ se_m_bubble_beam2_cmp, 1 + + .section .rodata + .global se_m_bubble_beam2 + .align 2 + +@********************** Track 1 **********************@ + +se_m_bubble_beam2_1: + .byte KEYSH , se_m_bubble_beam2_key+0 + .byte TEMPO , 150*se_m_bubble_beam2_tbs/2 + .byte VOICE , 9 + .byte BENDR , 2 + .byte PAN , c_v+0 + .byte VOL , 26*se_m_bubble_beam2_mvl/mxv + .byte BEND , c_v-23 + .byte N09 , Dn5 , v127 + .byte W01 + .byte VOL , 34*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+6 + .byte BEND , c_v-20 + .byte W01 + .byte VOL , 42*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-7 + .byte BEND , c_v-16 + .byte W01 + .byte VOL , 52*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+9 + .byte W01 + .byte VOL , 72*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-13 + .byte BEND , c_v-18 + .byte W02 + .byte VOL , 85*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+6 + .byte BEND , c_v-21 + .byte W01 + .byte VOL , 102*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-6 + .byte BEND , c_v-23 + .byte W01 + .byte VOL , 120*se_m_bubble_beam2_mvl/mxv + .byte BEND , c_v-24 + .byte W02 + .byte VOL , 26*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v-23 + .byte N09 , Dn5 , v100 + .byte W02 + .byte VOL , 34*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+6 + .byte BEND , c_v-20 + .byte W01 + .byte VOL , 42*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-7 + .byte BEND , c_v-16 + .byte W01 + .byte VOL , 52*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+9 + .byte W01 + .byte VOL , 72*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-13 + .byte BEND , c_v-18 + .byte W01 + .byte VOL , 85*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+6 + .byte BEND , c_v-21 + .byte W02 + .byte VOL , 102*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-6 + .byte BEND , c_v-23 + .byte W01 + .byte VOL , 120*se_m_bubble_beam2_mvl/mxv + .byte BEND , c_v-24 + .byte W02 + .byte VOL , 26*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v-23 + .byte N09 , Dn5 , v080 + .byte W01 + .byte VOL , 34*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+6 + .byte BEND , c_v-20 + .byte W02 + .byte VOL , 42*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-7 + .byte BEND , c_v-16 + .byte W01 + .byte VOL , 52*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+9 + .byte W01 + .byte VOL , 72*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-13 + .byte BEND , c_v-18 + .byte W01 + .byte VOL , 85*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v+6 + .byte BEND , c_v-21 + .byte W01 + .byte VOL , 102*se_m_bubble_beam2_mvl/mxv + .byte PAN , c_v-6 + .byte BEND , c_v-23 + .byte W02 + .byte VOL , 120*se_m_bubble_beam2_mvl/mxv + .byte BEND , c_v-24 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_bubble_beam2: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_bubble_beam2_pri @ Priority + .byte se_m_bubble_beam2_rev @ Reverb. + + .word se_m_bubble_beam2_grp + + .word se_m_bubble_beam2_1 + + .end diff --git a/sound/songs/se_w268.s b/sound/songs/se_m_charge.s index c2c9ee9f7..47d70a4bf 100644 --- a/sound/songs/se_w268.s +++ b/sound/songs/se_m_charge.s @@ -1,56 +1,56 @@ .include "MPlayDef.s" - .equ se_w268_grp, voicegroup128 - .equ se_w268_pri, 4 - .equ se_w268_rev, reverb_set+50 - .equ se_w268_mvl, 127 - .equ se_w268_key, 0 - .equ se_w268_tbs, 1 - .equ se_w268_exg, 0 - .equ se_w268_cmp, 1 + .equ se_m_charge_grp, voicegroup128 + .equ se_m_charge_pri, 4 + .equ se_m_charge_rev, reverb_set+50 + .equ se_m_charge_mvl, 127 + .equ se_m_charge_key, 0 + .equ se_m_charge_tbs, 1 + .equ se_m_charge_exg, 0 + .equ se_m_charge_cmp, 1 .section .rodata - .global se_w268 + .global se_m_charge .align 2 @********************** Track 1 **********************@ -se_w268_1: - .byte KEYSH , se_w268_key+0 - .byte TEMPO , 150*se_w268_tbs/2 +se_m_charge_1: + .byte KEYSH , se_m_charge_key+0 + .byte TEMPO , 150*se_m_charge_tbs/2 .byte VOICE , 18 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 34*se_w268_mvl/mxv + .byte VOL , 34*se_m_charge_mvl/mxv .byte BEND , c_v+0 .byte N66 , Cn5 , v127 .byte W01 .byte PAN , c_v-2 .byte W01 - .byte VOL , 43*se_w268_mvl/mxv + .byte VOL , 43*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v+2 .byte BEND , c_v-2 .byte W01 - .byte VOL , 58*se_w268_mvl/mxv + .byte VOL , 58*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte W02 .byte c_v-2 .byte W01 - .byte VOL , 70*se_w268_mvl/mxv + .byte VOL , 70*se_m_charge_mvl/mxv .byte PAN , c_v-4 .byte BEND , c_v-4 .byte W01 .byte PAN , c_v-2 .byte W01 - .byte VOL , 76*se_w268_mvl/mxv + .byte VOL , 76*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v+2 .byte BEND , c_v-6 .byte W02 - .byte VOL , 90*se_w268_mvl/mxv + .byte VOL , 90*se_m_charge_mvl/mxv .byte PAN , c_v+4 .byte W01 .byte c_v+2 @@ -118,14 +118,14 @@ se_w268_1: .byte W01 .byte PAN , c_v+2 .byte W01 - .byte VOL , 84*se_w268_mvl/mxv + .byte VOL , 84*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v+0 .byte W02 .byte c_v-2 .byte W01 - .byte VOL , 78*se_w268_mvl/mxv + .byte VOL , 78*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v+2 @@ -133,39 +133,39 @@ se_w268_1: .byte W01 .byte PAN , c_v+0 .byte W01 - .byte VOL , 70*se_w268_mvl/mxv + .byte VOL , 70*se_m_charge_mvl/mxv .byte PAN , c_v-2 .byte W02 .byte c_v-4 .byte W01 - .byte VOL , 55*se_w268_mvl/mxv + .byte VOL , 55*se_m_charge_mvl/mxv .byte PAN , c_v-2 .byte BEND , c_v-29 .byte W01 .byte PAN , c_v+0 .byte W01 - .byte VOL , 46*se_w268_mvl/mxv + .byte VOL , 46*se_m_charge_mvl/mxv .byte PAN , c_v+2 .byte W01 .byte c_v+4 .byte BEND , c_v-31 .byte W02 - .byte VOL , 36*se_w268_mvl/mxv + .byte VOL , 36*se_m_charge_mvl/mxv .byte PAN , c_v+2 .byte W01 .byte c_v+0 .byte W01 - .byte VOL , 24*se_w268_mvl/mxv + .byte VOL , 24*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-36 .byte W01 .byte PAN , c_v-2 .byte W01 - .byte VOL , 13*se_w268_mvl/mxv + .byte VOL , 13*se_m_charge_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-42 .byte W02 - .byte VOL , 5*se_w268_mvl/mxv + .byte VOL , 5*se_m_charge_mvl/mxv .byte PAN , c_v+2 .byte W06 .byte FINE @@ -173,14 +173,14 @@ se_w268_1: @******************************************************@ .align 2 -se_w268: +se_m_charge: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w268_pri @ Priority - .byte se_w268_rev @ Reverb. + .byte se_m_charge_pri @ Priority + .byte se_m_charge_rev @ Reverb. - .word se_w268_grp + .word se_m_charge_grp - .word se_w268_1 + .word se_m_charge_1 .end diff --git a/sound/songs/se_w204.s b/sound/songs/se_m_charm.s index 1e66392ac..ef10cb3e3 100644 --- a/sound/songs/se_w204.s +++ b/sound/songs/se_m_charm.s @@ -1,52 +1,52 @@ .include "MPlayDef.s" - .equ se_w204_grp, voicegroup128 - .equ se_w204_pri, 4 - .equ se_w204_rev, reverb_set+50 - .equ se_w204_mvl, 127 - .equ se_w204_key, 0 - .equ se_w204_tbs, 1 - .equ se_w204_exg, 0 - .equ se_w204_cmp, 1 + .equ se_m_charm_grp, voicegroup128 + .equ se_m_charm_pri, 4 + .equ se_m_charm_rev, reverb_set+50 + .equ se_m_charm_mvl, 127 + .equ se_m_charm_key, 0 + .equ se_m_charm_tbs, 1 + .equ se_m_charm_exg, 0 + .equ se_m_charm_cmp, 1 .section .rodata - .global se_w204 + .global se_m_charm .align 2 @********************** Track 1 **********************@ -se_w204_1: - .byte KEYSH , se_w204_key+0 - .byte TEMPO , 150*se_w204_tbs/2 +se_m_charm_1: + .byte KEYSH , se_m_charm_key+0 + .byte TEMPO , 150*se_m_charm_tbs/2 .byte VOICE , 37 .byte BENDR , 24 .byte PAN , c_v+0 - .byte VOL , 25*se_w204_mvl/mxv + .byte VOL , 25*se_m_charm_mvl/mxv .byte BEND , c_v+11 .byte N02 , Fn4 , v127 .byte W01 - .byte VOL , 42*se_w204_mvl/mxv + .byte VOL , 42*se_m_charm_mvl/mxv .byte PAN , c_v+4 .byte BEND , c_v+5 .byte W01 - .byte VOL , 62*se_w204_mvl/mxv + .byte VOL , 62*se_m_charm_mvl/mxv .byte PAN , c_v-4 .byte BEND , c_v+0 .byte N15 .byte W01 - .byte VOL , 77*se_w204_mvl/mxv + .byte VOL , 77*se_m_charm_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+5 .byte W01 - .byte VOL , 84*se_w204_mvl/mxv + .byte VOL , 84*se_m_charm_mvl/mxv .byte PAN , c_v+4 .byte BEND , c_v+12 .byte W02 - .byte VOL , 96*se_w204_mvl/mxv + .byte VOL , 96*se_m_charm_mvl/mxv .byte PAN , c_v-4 .byte BEND , c_v+20 .byte W01 - .byte VOL , 100*se_w204_mvl/mxv + .byte VOL , 100*se_m_charm_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+25 .byte W01 @@ -59,22 +59,22 @@ se_w204_1: .byte PAN , c_v+0 .byte BEND , c_v+40 .byte W02 - .byte VOL , 94*se_w204_mvl/mxv + .byte VOL , 94*se_m_charm_mvl/mxv .byte PAN , c_v+4 .byte W01 - .byte VOL , 85*se_w204_mvl/mxv + .byte VOL , 85*se_m_charm_mvl/mxv .byte PAN , c_v-4 .byte BEND , c_v+37 .byte W01 - .byte VOL , 66*se_w204_mvl/mxv + .byte VOL , 66*se_m_charm_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+36 .byte W01 - .byte VOL , 49*se_w204_mvl/mxv + .byte VOL , 49*se_m_charm_mvl/mxv .byte PAN , c_v+4 .byte BEND , c_v+34 .byte W01 - .byte VOL , 32*se_w204_mvl/mxv + .byte VOL , 32*se_m_charm_mvl/mxv .byte PAN , c_v-4 .byte BEND , c_v+32 .byte W02 @@ -83,14 +83,14 @@ se_w204_1: @******************************************************@ .align 2 -se_w204: +se_m_charm: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w204_pri @ Priority - .byte se_w204_rev @ Reverb. + .byte se_m_charm_pri @ Priority + .byte se_m_charm_rev @ Reverb. - .word se_w204_grp + .word se_m_charm_grp - .word se_w204_1 + .word se_m_charm_1 .end diff --git a/sound/songs/se_w109.s b/sound/songs/se_m_confuse_ray.s index 1f43988eb..12aea8ab8 100644 --- a/sound/songs/se_w109.s +++ b/sound/songs/se_m_confuse_ray.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w109_grp, voicegroup128 - .equ se_w109_pri, 4 - .equ se_w109_rev, reverb_set+50 - .equ se_w109_mvl, 127 - .equ se_w109_key, 0 - .equ se_w109_tbs, 1 - .equ se_w109_exg, 0 - .equ se_w109_cmp, 1 + .equ se_m_confuse_ray_grp, voicegroup128 + .equ se_m_confuse_ray_pri, 4 + .equ se_m_confuse_ray_rev, reverb_set+50 + .equ se_m_confuse_ray_mvl, 127 + .equ se_m_confuse_ray_key, 0 + .equ se_m_confuse_ray_tbs, 1 + .equ se_m_confuse_ray_exg, 0 + .equ se_m_confuse_ray_cmp, 1 .section .rodata - .global se_w109 + .global se_m_confuse_ray .align 2 @********************** Track 1 **********************@ -se_w109_1: - .byte KEYSH , se_w109_key+0 - .byte TEMPO , 220*se_w109_tbs/2 +se_m_confuse_ray_1: + .byte KEYSH , se_m_confuse_ray_key+0 + .byte TEMPO , 220*se_m_confuse_ray_tbs/2 .byte VOICE , 52 - .byte VOL , 127*se_w109_mvl/mxv + .byte VOL , 127*se_m_confuse_ray_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -104,14 +104,14 @@ se_w109_1: @******************************************************@ .align 2 -se_w109: +se_m_confuse_ray: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w109_pri @ Priority - .byte se_w109_rev @ Reverb. + .byte se_m_confuse_ray_pri @ Priority + .byte se_m_confuse_ray_rev @ Reverb. - .word se_w109_grp + .word se_m_confuse_ray_grp - .word se_w109_1 + .word se_m_confuse_ray_1 .end diff --git a/sound/songs/se_w322.s b/sound/songs/se_m_cosmic_power.s index 2f48ff968..76812478b 100644 --- a/sound/songs/se_w322.s +++ b/sound/songs/se_m_cosmic_power.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w322_grp, voicegroup128 - .equ se_w322_pri, 4 - .equ se_w322_rev, reverb_set+50 - .equ se_w322_mvl, 127 - .equ se_w322_key, 0 - .equ se_w322_tbs, 1 - .equ se_w322_exg, 0 - .equ se_w322_cmp, 1 + .equ se_m_cosmic_power_grp, voicegroup128 + .equ se_m_cosmic_power_pri, 4 + .equ se_m_cosmic_power_rev, reverb_set+50 + .equ se_m_cosmic_power_mvl, 127 + .equ se_m_cosmic_power_key, 0 + .equ se_m_cosmic_power_tbs, 1 + .equ se_m_cosmic_power_exg, 0 + .equ se_m_cosmic_power_cmp, 1 .section .rodata - .global se_w322 + .global se_m_cosmic_power .align 2 @********************** Track 1 **********************@ -se_w322_1: - .byte KEYSH , se_w322_key+0 - .byte TEMPO , 150*se_w322_tbs/2 +se_m_cosmic_power_1: + .byte KEYSH , se_m_cosmic_power_key+0 + .byte TEMPO , 150*se_m_cosmic_power_tbs/2 .byte VOICE , 46 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w322_mvl/mxv + .byte VOL , 110*se_m_cosmic_power_mvl/mxv .byte BEND , c_v-4 .byte N09 , As5 , v112 .byte W06 @@ -117,12 +117,12 @@ se_w322_1: @********************** Track 2 **********************@ -se_w322_2: - .byte KEYSH , se_w322_key+0 +se_m_cosmic_power_2: + .byte KEYSH , se_m_cosmic_power_key+0 .byte VOICE , 53 .byte XCMD , xIECV , 9 .byte xIECL , 8 - .byte VOL , 43*se_w322_mvl/mxv + .byte VOL , 43*se_m_cosmic_power_mvl/mxv .byte BEND , c_v-2 .byte W04 .byte N08 , Fn5 , v112 @@ -194,15 +194,15 @@ se_w322_2: @******************************************************@ .align 2 -se_w322: +se_m_cosmic_power: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w322_pri @ Priority - .byte se_w322_rev @ Reverb. + .byte se_m_cosmic_power_pri @ Priority + .byte se_m_cosmic_power_rev @ Reverb. - .word se_w322_grp + .word se_m_cosmic_power_grp - .word se_w322_1 - .word se_w322_2 + .word se_m_cosmic_power_1 + .word se_m_cosmic_power_2 .end diff --git a/sound/songs/se_w152.s b/sound/songs/se_m_crabhammer.s index dc03fe76c..6333150dc 100644 --- a/sound/songs/se_w152.s +++ b/sound/songs/se_m_crabhammer.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w152_grp, voicegroup128 - .equ se_w152_pri, 4 - .equ se_w152_rev, reverb_set+50 - .equ se_w152_mvl, 127 - .equ se_w152_key, 0 - .equ se_w152_tbs, 1 - .equ se_w152_exg, 0 - .equ se_w152_cmp, 1 + .equ se_m_crabhammer_grp, voicegroup128 + .equ se_m_crabhammer_pri, 4 + .equ se_m_crabhammer_rev, reverb_set+50 + .equ se_m_crabhammer_mvl, 127 + .equ se_m_crabhammer_key, 0 + .equ se_m_crabhammer_tbs, 1 + .equ se_m_crabhammer_exg, 0 + .equ se_m_crabhammer_cmp, 1 .section .rodata - .global se_w152 + .global se_m_crabhammer .align 2 @********************** Track 1 **********************@ -se_w152_1: - .byte KEYSH , se_w152_key+0 - .byte TEMPO , 150*se_w152_tbs/2 +se_m_crabhammer_1: + .byte KEYSH , se_m_crabhammer_key+0 + .byte TEMPO , 150*se_m_crabhammer_tbs/2 .byte VOICE , 23 - .byte VOL , 100*se_w152_mvl/mxv + .byte VOL , 100*se_m_crabhammer_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+2 @@ -45,14 +45,14 @@ se_w152_1: @******************************************************@ .align 2 -se_w152: +se_m_crabhammer: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w152_pri @ Priority - .byte se_w152_rev @ Reverb. + .byte se_m_crabhammer_pri @ Priority + .byte se_m_crabhammer_rev @ Reverb. - .word se_w152_grp + .word se_m_crabhammer_grp - .word se_w152_1 + .word se_m_crabhammer_1 .end diff --git a/sound/songs/se_w197.s b/sound/songs/se_m_detect.s index 619b81b40..181fb4079 100644 --- a/sound/songs/se_w197.s +++ b/sound/songs/se_m_detect.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w197_grp, voicegroup128 - .equ se_w197_pri, 4 - .equ se_w197_rev, reverb_set+50 - .equ se_w197_mvl, 127 - .equ se_w197_key, 0 - .equ se_w197_tbs, 1 - .equ se_w197_exg, 0 - .equ se_w197_cmp, 1 + .equ se_m_detect_grp, voicegroup128 + .equ se_m_detect_pri, 4 + .equ se_m_detect_rev, reverb_set+50 + .equ se_m_detect_mvl, 127 + .equ se_m_detect_key, 0 + .equ se_m_detect_tbs, 1 + .equ se_m_detect_exg, 0 + .equ se_m_detect_cmp, 1 .section .rodata - .global se_w197 + .global se_m_detect .align 2 @********************** Track 1 **********************@ -se_w197_1: - .byte KEYSH , se_w197_key+0 - .byte TEMPO , 220*se_w197_tbs/2 +se_m_detect_1: + .byte KEYSH , se_m_detect_key+0 + .byte TEMPO , 220*se_m_detect_tbs/2 .byte VOICE , 54 - .byte VOL , 100*se_w197_mvl/mxv + .byte VOL , 100*se_m_detect_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+1 @@ -82,14 +82,14 @@ se_w197_1: @******************************************************@ .align 2 -se_w197: +se_m_detect: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w197_pri @ Priority - .byte se_w197_rev @ Reverb. + .byte se_m_detect_pri @ Priority + .byte se_m_detect_rev @ Reverb. - .word se_w197_grp + .word se_m_detect_grp - .word se_w197_1 + .word se_m_detect_1 .end diff --git a/sound/songs/se_w091.s b/sound/songs/se_m_dig.s index 953edf429..42fed8ab5 100644 --- a/sound/songs/se_w091.s +++ b/sound/songs/se_m_dig.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w091_grp, voicegroup128 - .equ se_w091_pri, 4 - .equ se_w091_rev, reverb_set+50 - .equ se_w091_mvl, 127 - .equ se_w091_key, 0 - .equ se_w091_tbs, 1 - .equ se_w091_exg, 0 - .equ se_w091_cmp, 1 + .equ se_m_dig_grp, voicegroup128 + .equ se_m_dig_pri, 4 + .equ se_m_dig_rev, reverb_set+50 + .equ se_m_dig_mvl, 127 + .equ se_m_dig_key, 0 + .equ se_m_dig_tbs, 1 + .equ se_m_dig_exg, 0 + .equ se_m_dig_cmp, 1 .section .rodata - .global se_w091 + .global se_m_dig .align 2 @********************** Track 1 **********************@ -se_w091_1: - .byte KEYSH , se_w091_key+0 - .byte TEMPO , 150*se_w091_tbs/2 +se_m_dig_1: + .byte KEYSH , se_m_dig_key+0 + .byte TEMPO , 150*se_m_dig_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 115*se_w091_mvl/mxv + .byte VOL , 115*se_m_dig_mvl/mxv .byte BEND , c_v+0 .byte N01 , Cn2 , v112 .byte W01 @@ -53,14 +53,14 @@ se_w091_1: @******************************************************@ .align 2 -se_w091: +se_m_dig: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w091_pri @ Priority - .byte se_w091_rev @ Reverb. + .byte se_m_dig_pri @ Priority + .byte se_m_dig_rev @ Reverb. - .word se_w091_grp + .word se_m_dig_grp - .word se_w091_1 + .word se_m_dig_1 .end diff --git a/sound/songs/se_w291.s b/sound/songs/se_m_dive.s index ae8d11134..2313667fc 100644 --- a/sound/songs/se_w291.s +++ b/sound/songs/se_m_dive.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w291_grp, voicegroup128 - .equ se_w291_pri, 4 - .equ se_w291_rev, reverb_set+50 - .equ se_w291_mvl, 127 - .equ se_w291_key, 0 - .equ se_w291_tbs, 1 - .equ se_w291_exg, 0 - .equ se_w291_cmp, 1 + .equ se_m_dive_grp, voicegroup128 + .equ se_m_dive_pri, 4 + .equ se_m_dive_rev, reverb_set+50 + .equ se_m_dive_mvl, 127 + .equ se_m_dive_key, 0 + .equ se_m_dive_tbs, 1 + .equ se_m_dive_exg, 0 + .equ se_m_dive_cmp, 1 .section .rodata - .global se_w291 + .global se_m_dive .align 2 @********************** Track 1 **********************@ -se_w291_1: - .byte KEYSH , se_w291_key+0 - .byte TEMPO , 150*se_w291_tbs/2 +se_m_dive_1: + .byte KEYSH , se_m_dive_key+0 + .byte TEMPO , 150*se_m_dive_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 105*se_w291_mvl/mxv + .byte VOL , 105*se_m_dive_mvl/mxv .byte BEND , c_v-18 .byte N06 , Fn2 , v127 .byte W03 @@ -43,39 +43,39 @@ se_w291_1: .byte PAN , c_v-3 .byte BEND , c_v-5 .byte W02 - .byte VOL , 100*se_w291_mvl/mxv + .byte VOL , 100*se_m_dive_mvl/mxv .byte W01 .byte PAN , c_v-6 .byte BEND , c_v-2 .byte W03 - .byte VOL , 94*se_w291_mvl/mxv + .byte VOL , 94*se_m_dive_mvl/mxv .byte W01 .byte PAN , c_v-3 .byte BEND , c_v+1 .byte W02 - .byte VOL , 84*se_w291_mvl/mxv + .byte VOL , 84*se_m_dive_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte BEND , c_v+4 .byte W04 .byte PAN , c_v+3 - .byte VOL , 72*se_w291_mvl/mxv + .byte VOL , 72*se_m_dive_mvl/mxv .byte BEND , c_v+2 .byte W04 .byte PAN , c_v+6 - .byte VOL , 57*se_w291_mvl/mxv + .byte VOL , 57*se_m_dive_mvl/mxv .byte BEND , c_v-3 .byte W03 .byte PAN , c_v+3 - .byte VOL , 37*se_w291_mvl/mxv + .byte VOL , 37*se_m_dive_mvl/mxv .byte BEND , c_v-7 .byte W03 - .byte VOL , 20*se_w291_mvl/mxv + .byte VOL , 20*se_m_dive_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte BEND , c_v-11 .byte W01 - .byte VOL , 7*se_w291_mvl/mxv + .byte VOL , 7*se_m_dive_mvl/mxv .byte W02 .byte PAN , c_v-3 .byte BEND , c_v-16 @@ -84,10 +84,10 @@ se_w291_1: @********************** Track 2 **********************@ -se_w291_2: - .byte KEYSH , se_w291_key+0 +se_m_dive_2: + .byte KEYSH , se_m_dive_key+0 .byte VOICE , 25 - .byte VOL , 105*se_w291_mvl/mxv + .byte VOL , 105*se_m_dive_mvl/mxv .byte N06 , An2 , v040 .byte W06 .byte Gn2 @@ -109,15 +109,15 @@ se_w291_2: @******************************************************@ .align 2 -se_w291: +se_m_dive: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w291_pri @ Priority - .byte se_w291_rev @ Reverb. + .byte se_m_dive_pri @ Priority + .byte se_m_dive_rev @ Reverb. - .word se_w291_grp + .word se_m_dive_grp - .word se_w291_1 - .word se_w291_2 + .word se_m_dive_1 + .word se_m_dive_2 .end diff --git a/sound/songs/se_m_dizzy_punch.s b/sound/songs/se_m_dizzy_punch.s new file mode 100644 index 000000000..886a4bc4e --- /dev/null +++ b/sound/songs/se_m_dizzy_punch.s @@ -0,0 +1,79 @@ + .include "MPlayDef.s" + + .equ se_m_dizzy_punch_grp, voicegroup128 + .equ se_m_dizzy_punch_pri, 4 + .equ se_m_dizzy_punch_rev, reverb_set+50 + .equ se_m_dizzy_punch_mvl, 127 + .equ se_m_dizzy_punch_key, 0 + .equ se_m_dizzy_punch_tbs, 1 + .equ se_m_dizzy_punch_exg, 0 + .equ se_m_dizzy_punch_cmp, 1 + + .section .rodata + .global se_m_dizzy_punch + .align 2 + +@********************** Track 1 **********************@ + +se_m_dizzy_punch_1: + .byte KEYSH , se_m_dizzy_punch_key+0 + .byte TEMPO , 150*se_m_dizzy_punch_tbs/2 + .byte VOICE , 19 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 5*se_m_dizzy_punch_mvl/mxv + .byte BEND , c_v+0 + .byte N07 , Bn5 , v080 + .byte W01 + .byte VOL , 55*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v+11 + .byte BEND , c_v+3 + .byte W01 + .byte VOL , 67*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v+22 + .byte BEND , c_v+0 + .byte W01 + .byte VOL , 90*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v-6 + .byte W01 + .byte PAN , c_v-12 + .byte BEND , c_v-14 + .byte W02 + .byte VOL , 4*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v-22 + .byte BEND , c_v-23 + .byte W01 + .byte PAN , c_v-13 + .byte BEND , c_v+0 + .byte N04 , Cn6 + .byte W01 + .byte VOL , 66*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+1 + .byte W01 + .byte VOL , 90*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v+11 + .byte BEND , c_v+3 + .byte W01 + .byte VOL , 4*se_m_dizzy_punch_mvl/mxv + .byte PAN , c_v+21 + .byte BEND , c_v+5 + .byte W14 + .byte VOL , 90*se_m_dizzy_punch_mvl/mxv + .byte FINE + +@******************************************************@ + .align 2 + +se_m_dizzy_punch: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_dizzy_punch_pri @ Priority + .byte se_m_dizzy_punch_rev @ Reverb. + + .word se_m_dizzy_punch_grp + + .word se_m_dizzy_punch_1 + + .end diff --git a/sound/songs/se_m_double_team.s b/sound/songs/se_m_double_team.s new file mode 100644 index 000000000..49bcfb13d --- /dev/null +++ b/sound/songs/se_m_double_team.s @@ -0,0 +1,71 @@ + .include "MPlayDef.s" + + .equ se_m_double_team_grp, voicegroup128 + .equ se_m_double_team_pri, 4 + .equ se_m_double_team_rev, reverb_set+50 + .equ se_m_double_team_mvl, 127 + .equ se_m_double_team_key, 0 + .equ se_m_double_team_tbs, 1 + .equ se_m_double_team_exg, 0 + .equ se_m_double_team_cmp, 1 + + .section .rodata + .global se_m_double_team + .align 2 + +@********************** Track 1 **********************@ + +se_m_double_team_1: + .byte KEYSH , se_m_double_team_key+0 + .byte TEMPO , 150*se_m_double_team_tbs/2 + .byte VOICE , 22 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_double_team_mvl/mxv + .byte BEND , c_v-18 + .byte N19 , Dn3 , v108 + .byte W02 + .byte BEND , c_v-7 + .byte W01 + .byte VOL , 101*se_m_double_team_mvl/mxv + .byte W01 + .byte PAN , c_v-9 + .byte BEND , c_v+8 + .byte W02 + .byte VOL , 84*se_m_double_team_mvl/mxv + .byte BEND , c_v+4 + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 64*se_m_double_team_mvl/mxv + .byte BEND , c_v-13 + .byte W01 + .byte PAN , c_v+8 + .byte W02 + .byte VOL , 45*se_m_double_team_mvl/mxv + .byte BEND , c_v-31 + .byte W02 + .byte VOL , 32*se_m_double_team_mvl/mxv + .byte PAN , c_v+0 + .byte W01 + .byte VOICE , 2 + .byte W01 + .byte VOL , 13*se_m_double_team_mvl/mxv + .byte BEND , c_v-52 + .byte W08 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_double_team: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_double_team_pri @ Priority + .byte se_m_double_team_rev @ Reverb. + + .word se_m_double_team_grp + + .word se_m_double_team_1 + + .end diff --git a/sound/songs/se_m_dragon_rage.s b/sound/songs/se_m_dragon_rage.s new file mode 100644 index 000000000..e9eaefca0 --- /dev/null +++ b/sound/songs/se_m_dragon_rage.s @@ -0,0 +1,150 @@ + .include "MPlayDef.s" + + .equ se_m_dragon_rage_grp, voicegroup128 + .equ se_m_dragon_rage_pri, 4 + .equ se_m_dragon_rage_rev, reverb_set+50 + .equ se_m_dragon_rage_mvl, 127 + .equ se_m_dragon_rage_key, 0 + .equ se_m_dragon_rage_tbs, 1 + .equ se_m_dragon_rage_exg, 0 + .equ se_m_dragon_rage_cmp, 1 + + .section .rodata + .global se_m_dragon_rage + .align 2 + +@********************** Track 1 **********************@ + +se_m_dragon_rage_1: + .byte KEYSH , se_m_dragon_rage_key+0 + .byte TEMPO , 150*se_m_dragon_rage_tbs/2 + .byte VOICE , 29 + .byte BENDR , 12 + .byte PAN , c_v+5 + .byte VOL , 21*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+0 + .byte N10 , An2 , v127 + .byte W02 + .byte VOL , 47*se_m_dragon_rage_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 88*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v-5 + .byte W01 + .byte VOL , 120*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 21*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+10 + .byte N10 , Bn2 + .byte W02 + .byte PAN , c_v+5 + .byte W01 + .byte VOL , 47*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte VOL , 88*se_m_dragon_rage_mvl/mxv + .byte W03 + .byte PAN , c_v-5 + .byte VOL , 120*se_m_dragon_rage_mvl/mxv + .byte W03 + .byte PAN , c_v-2 + .byte VOL , 21*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+18 + .byte N10 , Cs3 + .byte W03 + .byte PAN , c_v+5 + .byte VOL , 47*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte 88*se_m_dragon_rage_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 120*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v-5 + .byte W02 + .byte VOL , 20*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+29 + .byte N10 , Dn3 + .byte W01 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 47*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v+5 + .byte W01 + .byte VOL , 88*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte VOL , 120*se_m_dragon_rage_mvl/mxv + .byte W03 + .byte PAN , c_v-5 + .byte W01 + .byte VOL , 21*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+37 + .byte N10 , En3 + .byte W02 + .byte PAN , c_v-2 + .byte VOL , 46*se_m_dragon_rage_mvl/mxv + .byte W03 + .byte PAN , c_v+5 + .byte VOL , 102*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte 120*se_m_dragon_rage_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W03 + .byte c_v-5 + .byte VOL , 20*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+42 + .byte N20 , Fs3 + .byte W02 + .byte VOL , 47*se_m_dragon_rage_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 88*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v+5 + .byte W01 + .byte VOL , 120*se_m_dragon_rage_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 99*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+50 + .byte W02 + .byte PAN , c_v-5 + .byte W01 + .byte VOL , 74*se_m_dragon_rage_mvl/mxv + .byte W01 + .byte BEND , c_v+56 + .byte W01 + .byte PAN , c_v-2 + .byte VOL , 53*se_m_dragon_rage_mvl/mxv + .byte W03 + .byte 34*se_m_dragon_rage_mvl/mxv + .byte BEND , c_v+63 + .byte W01 + .byte VOL , 15*se_m_dragon_rage_mvl/mxv + .byte W23 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_dragon_rage: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_dragon_rage_pri @ Priority + .byte se_m_dragon_rage_rev @ Reverb. + + .word se_m_dragon_rage_grp + + .word se_m_dragon_rage_1 + + .end diff --git a/sound/songs/se_w089.s b/sound/songs/se_m_earthquake.s index 081988ee9..104eb1bef 100644 --- a/sound/songs/se_w089.s +++ b/sound/songs/se_m_earthquake.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w089_grp, voicegroup128 - .equ se_w089_pri, 4 - .equ se_w089_rev, reverb_set+50 - .equ se_w089_mvl, 127 - .equ se_w089_key, 0 - .equ se_w089_tbs, 1 - .equ se_w089_exg, 0 - .equ se_w089_cmp, 1 + .equ se_m_earthquake_grp, voicegroup128 + .equ se_m_earthquake_pri, 4 + .equ se_m_earthquake_rev, reverb_set+50 + .equ se_m_earthquake_mvl, 127 + .equ se_m_earthquake_key, 0 + .equ se_m_earthquake_tbs, 1 + .equ se_m_earthquake_exg, 0 + .equ se_m_earthquake_cmp, 1 .section .rodata - .global se_w089 + .global se_m_earthquake .align 2 @********************** Track 1 **********************@ -se_w089_1: - .byte KEYSH , se_w089_key+0 - .byte TEMPO , 150*se_w089_tbs/2 +se_m_earthquake_1: + .byte KEYSH , se_m_earthquake_key+0 + .byte TEMPO , 150*se_m_earthquake_tbs/2 .byte VOICE , 26 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w089_mvl/mxv + .byte VOL , 110*se_m_earthquake_mvl/mxv .byte BEND , c_v+0 .byte N03 , Cs2 , v127 .byte W03 @@ -35,13 +35,13 @@ se_w089_1: .byte PAN , c_v+11 .byte N03 , Cn2 , v112 .byte W02 -se_w089_1_000: +se_m_earthquake_1_000: .byte W02 .byte PAN , c_v-11 .byte N03 , Cs2 , v108 .byte W04 .byte PEND -se_w089_1_001: +se_m_earthquake_1_001: .byte PAN , c_v+0 .byte N03 , Cn2 , v100 .byte W03 @@ -49,7 +49,7 @@ se_w089_1_001: .byte N03 , Cs2 , v116 .byte W03 .byte PEND -se_w089_1_002: +se_m_earthquake_1_002: .byte W01 .byte PAN , c_v-6 .byte N03 , Cn2 , v112 @@ -58,13 +58,13 @@ se_w089_1_002: .byte N03 , Cs2 , v108 .byte W02 .byte PEND -se_w089_1_003: +se_m_earthquake_1_003: .byte W02 .byte PAN , c_v-11 .byte N03 , Cn2 , v100 .byte W04 .byte PEND -se_w089_1_004: +se_m_earthquake_1_004: .byte PAN , c_v+0 .byte N03 , Cs2 , v116 .byte W03 @@ -72,7 +72,7 @@ se_w089_1_004: .byte N03 , Cn2 , v112 .byte W03 .byte PEND -se_w089_1_005: +se_m_earthquake_1_005: .byte W01 .byte PAN , c_v-6 .byte N03 , Cs2 , v108 @@ -81,7 +81,7 @@ se_w089_1_005: .byte N03 , Cn2 , v100 .byte W02 .byte PEND -se_w089_1_006: +se_m_earthquake_1_006: .byte W02 .byte PAN , c_v-11 .byte N03 , Cs2 , v116 @@ -104,7 +104,7 @@ se_w089_1_006: .byte PAN , c_v-11 .byte N03 , Cn2 , v112 .byte W04 -se_w089_1_007: +se_m_earthquake_1_007: .byte PAN , c_v+0 .byte N03 , Cs2 , v108 .byte W03 @@ -112,7 +112,7 @@ se_w089_1_007: .byte N03 , Cn2 , v100 .byte W03 .byte PEND -se_w089_1_008: +se_m_earthquake_1_008: .byte W01 .byte PAN , c_v-6 .byte N03 , Cs2 , v116 @@ -122,91 +122,91 @@ se_w089_1_008: .byte W02 .byte PEND .byte PATT - .word se_w089_1_000 + .word se_m_earthquake_1_000 .byte PATT - .word se_w089_1_001 + .word se_m_earthquake_1_001 .byte PATT - .word se_w089_1_002 + .word se_m_earthquake_1_002 .byte PATT - .word se_w089_1_003 + .word se_m_earthquake_1_003 .byte PATT - .word se_w089_1_007 + .word se_m_earthquake_1_007 .byte PATT - .word se_w089_1_008 + .word se_m_earthquake_1_008 .byte PATT - .word se_w089_1_000 + .word se_m_earthquake_1_000 .byte PATT - .word se_w089_1_001 + .word se_m_earthquake_1_001 .byte PATT - .word se_w089_1_002 + .word se_m_earthquake_1_002 .byte PATT - .word se_w089_1_003 + .word se_m_earthquake_1_003 .byte PATT - .word se_w089_1_004 + .word se_m_earthquake_1_004 .byte PATT - .word se_w089_1_005 + .word se_m_earthquake_1_005 .byte PATT - .word se_w089_1_006 - .byte VOL , 106*se_w089_mvl/mxv + .word se_m_earthquake_1_006 + .byte VOL , 106*se_m_earthquake_mvl/mxv .byte PAN , c_v+0 .byte N03 , Cn2 , v112 .byte W03 - .byte VOL , 103*se_w089_mvl/mxv + .byte VOL , 103*se_m_earthquake_mvl/mxv .byte PAN , c_v+6 .byte N03 , Cs2 , v108 .byte W03 .byte W01 - .byte VOL , 97*se_w089_mvl/mxv + .byte VOL , 97*se_m_earthquake_mvl/mxv .byte PAN , c_v-6 .byte N03 , Cn2 , v100 .byte W03 - .byte VOL , 89*se_w089_mvl/mxv + .byte VOL , 89*se_m_earthquake_mvl/mxv .byte PAN , c_v+11 .byte N03 , Cs2 , v116 .byte W02 .byte W02 - .byte VOL , 85*se_w089_mvl/mxv + .byte VOL , 85*se_m_earthquake_mvl/mxv .byte PAN , c_v-11 .byte N03 , Cn2 , v112 .byte W04 - .byte VOL , 78*se_w089_mvl/mxv + .byte VOL , 78*se_m_earthquake_mvl/mxv .byte PAN , c_v+0 .byte N03 , Cs2 , v108 .byte W03 - .byte VOL , 72*se_w089_mvl/mxv + .byte VOL , 72*se_m_earthquake_mvl/mxv .byte PAN , c_v+6 .byte N03 , Cn2 , v100 .byte W03 .byte W01 - .byte VOL , 66*se_w089_mvl/mxv + .byte VOL , 66*se_m_earthquake_mvl/mxv .byte PAN , c_v-6 .byte N03 , Cs2 , v116 .byte W03 - .byte VOL , 58*se_w089_mvl/mxv + .byte VOL , 58*se_m_earthquake_mvl/mxv .byte PAN , c_v+11 .byte N03 , Cn2 , v112 .byte W02 .byte W02 - .byte VOL , 46*se_w089_mvl/mxv + .byte VOL , 46*se_m_earthquake_mvl/mxv .byte PAN , c_v-11 .byte N03 , Cs2 , v108 .byte W04 - .byte VOL , 30*se_w089_mvl/mxv + .byte VOL , 30*se_m_earthquake_mvl/mxv .byte PAN , c_v+0 .byte N03 , Cn2 , v100 .byte W03 - .byte VOL , 12*se_w089_mvl/mxv + .byte VOL , 12*se_m_earthquake_mvl/mxv .byte PAN , c_v+6 .byte W03 .byte FINE @********************** Track 2 **********************@ -se_w089_2: - .byte KEYSH , se_w089_key+0 +se_m_earthquake_2: + .byte KEYSH , se_m_earthquake_key+0 .byte VOICE , 5 .byte PAN , c_v+0 - .byte VOL , 110*se_w089_mvl/mxv + .byte VOL , 110*se_m_earthquake_mvl/mxv .byte N02 , Fn2 , v072 .byte W02 .byte N01 @@ -218,7 +218,7 @@ se_w089_2: .byte VOICE , 27 .byte N06 , Bn1 , v080 .byte W06 -se_w089_2_000: +se_m_earthquake_2_000: .byte PAN , c_v+0 .byte N06 , Bn1 , v080 .byte W06 @@ -228,99 +228,99 @@ se_w089_2_000: .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 .byte PATT - .word se_w089_2_000 + .word se_m_earthquake_2_000 .byte N06 , Bn1 , v080 .byte W06 .byte N06 .byte W06 - .byte VOL , 106*se_w089_mvl/mxv + .byte VOL , 106*se_m_earthquake_mvl/mxv .byte PAN , c_v+0 .byte N06 .byte W03 - .byte VOL , 103*se_w089_mvl/mxv + .byte VOL , 103*se_m_earthquake_mvl/mxv .byte W03 .byte N06 .byte W01 - .byte VOL , 97*se_w089_mvl/mxv + .byte VOL , 97*se_m_earthquake_mvl/mxv .byte W03 - .byte 89*se_w089_mvl/mxv + .byte 89*se_m_earthquake_mvl/mxv .byte W02 .byte N06 .byte W02 - .byte VOL , 85*se_w089_mvl/mxv + .byte VOL , 85*se_m_earthquake_mvl/mxv .byte W04 - .byte 78*se_w089_mvl/mxv + .byte 78*se_m_earthquake_mvl/mxv .byte PAN , c_v+0 .byte N06 .byte W03 - .byte VOL , 72*se_w089_mvl/mxv + .byte VOL , 72*se_m_earthquake_mvl/mxv .byte W03 .byte N06 .byte W01 - .byte VOL , 66*se_w089_mvl/mxv + .byte VOL , 66*se_m_earthquake_mvl/mxv .byte W03 - .byte 58*se_w089_mvl/mxv + .byte 58*se_m_earthquake_mvl/mxv .byte W02 .byte N06 .byte W02 - .byte VOL , 46*se_w089_mvl/mxv + .byte VOL , 46*se_m_earthquake_mvl/mxv .byte W04 - .byte 30*se_w089_mvl/mxv + .byte 30*se_m_earthquake_mvl/mxv .byte PAN , c_v+0 .byte N06 .byte W03 - .byte VOL , 12*se_w089_mvl/mxv + .byte VOL , 12*se_m_earthquake_mvl/mxv .byte W03 .byte FINE @******************************************************@ .align 2 -se_w089: +se_m_earthquake: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w089_pri @ Priority - .byte se_w089_rev @ Reverb. + .byte se_m_earthquake_pri @ Priority + .byte se_m_earthquake_rev @ Reverb. - .word se_w089_grp + .word se_m_earthquake_grp - .word se_w089_1 - .word se_w089_2 + .word se_m_earthquake_1 + .word se_m_earthquake_2 .end diff --git a/sound/songs/se_m_ember.s b/sound/songs/se_m_ember.s new file mode 100644 index 000000000..a685ca24c --- /dev/null +++ b/sound/songs/se_m_ember.s @@ -0,0 +1,61 @@ + .include "MPlayDef.s" + + .equ se_m_ember_grp, voicegroup128 + .equ se_m_ember_pri, 4 + .equ se_m_ember_rev, reverb_set+50 + .equ se_m_ember_mvl, 127 + .equ se_m_ember_key, 0 + .equ se_m_ember_tbs, 1 + .equ se_m_ember_exg, 0 + .equ se_m_ember_cmp, 1 + + .section .rodata + .global se_m_ember + .align 2 + +@********************** Track 1 **********************@ + +se_m_ember_1: + .byte KEYSH , se_m_ember_key+0 + .byte TEMPO , 150*se_m_ember_tbs/2 + .byte VOICE , 29 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 61*se_m_ember_mvl/mxv + .byte BEND , c_v+8 + .byte N10 , Gn3 , v127 + .byte W01 + .byte VOL , 84*se_m_ember_mvl/mxv + .byte W01 + .byte 97*se_m_ember_mvl/mxv + .byte BEND , c_v+16 + .byte W01 + .byte VOL , 110*se_m_ember_mvl/mxv + .byte W01 + .byte BEND , c_v+7 + .byte W02 + .byte c_v-12 + .byte W01 + .byte VOL , 89*se_m_ember_mvl/mxv + .byte W01 + .byte 64*se_m_ember_mvl/mxv + .byte BEND , c_v-42 + .byte W01 + .byte VOL , 34*se_m_ember_mvl/mxv + .byte W15 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_ember: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_ember_pri @ Priority + .byte se_m_ember_rev @ Reverb. + + .word se_m_ember_grp + + .word se_m_ember_1 + + .end diff --git a/sound/songs/se_w227.s b/sound/songs/se_m_encore.s index 7a6f87abc..cf13ab761 100644 --- a/sound/songs/se_w227.s +++ b/sound/songs/se_m_encore.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_w227_grp, voicegroup128 - .equ se_w227_pri, 4 - .equ se_w227_rev, reverb_set+50 - .equ se_w227_mvl, 127 - .equ se_w227_key, 0 - .equ se_w227_tbs, 1 - .equ se_w227_exg, 0 - .equ se_w227_cmp, 1 + .equ se_m_encore_grp, voicegroup128 + .equ se_m_encore_pri, 4 + .equ se_m_encore_rev, reverb_set+50 + .equ se_m_encore_mvl, 127 + .equ se_m_encore_key, 0 + .equ se_m_encore_tbs, 1 + .equ se_m_encore_exg, 0 + .equ se_m_encore_cmp, 1 .section .rodata - .global se_w227 + .global se_m_encore .align 2 @********************** Track 1 **********************@ -se_w227_1: - .byte KEYSH , se_w227_key+0 - .byte TEMPO , 150*se_w227_tbs/2 +se_m_encore_1: + .byte KEYSH , se_m_encore_key+0 + .byte TEMPO , 150*se_m_encore_tbs/2 .byte VOICE , 59 .byte BENDR , 12 - .byte VOL , 110*se_w227_mvl/mxv + .byte VOL , 110*se_m_encore_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N06 , En3 , v127 @@ -45,14 +45,14 @@ se_w227_1: @******************************************************@ .align 2 -se_w227: +se_m_encore: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w227_pri @ Priority - .byte se_w227_rev @ Reverb. + .byte se_m_encore_pri @ Priority + .byte se_m_encore_rev @ Reverb. - .word se_w227_grp + .word se_m_encore_grp - .word se_w227_1 + .word se_m_encore_1 .end diff --git a/sound/songs/se_w227b.s b/sound/songs/se_m_encore2.s index a3fa4adfe..9c53cdfe3 100644 --- a/sound/songs/se_w227b.s +++ b/sound/songs/se_m_encore2.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_w227b_grp, voicegroup128 - .equ se_w227b_pri, 4 - .equ se_w227b_rev, reverb_set+50 - .equ se_w227b_mvl, 127 - .equ se_w227b_key, 0 - .equ se_w227b_tbs, 1 - .equ se_w227b_exg, 0 - .equ se_w227b_cmp, 1 + .equ se_m_encore2_grp, voicegroup128 + .equ se_m_encore2_pri, 4 + .equ se_m_encore2_rev, reverb_set+50 + .equ se_m_encore2_mvl, 127 + .equ se_m_encore2_key, 0 + .equ se_m_encore2_tbs, 1 + .equ se_m_encore2_exg, 0 + .equ se_m_encore2_cmp, 1 .section .rodata - .global se_w227b + .global se_m_encore2 .align 2 @********************** Track 1 **********************@ -se_w227b_1: - .byte KEYSH , se_w227b_key+0 - .byte TEMPO , 150*se_w227b_tbs/2 +se_m_encore2_1: + .byte KEYSH , se_m_encore2_key+0 + .byte TEMPO , 150*se_m_encore2_tbs/2 .byte VOICE , 60 .byte BENDR , 12 - .byte VOL , 25*se_w227b_mvl/mxv + .byte VOL , 25*se_m_encore2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte TIE , Cn3 , v127 @@ -29,18 +29,18 @@ se_w227b_1: .byte W01 .byte c_v+5 .byte W01 - .byte VOL , 34*se_w227b_mvl/mxv + .byte VOL , 34*se_m_encore2_mvl/mxv .byte W01 .byte PAN , c_v+2 .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 46*se_w227b_mvl/mxv + .byte VOL , 46*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 .byte W02 - .byte VOL , 56*se_w227b_mvl/mxv + .byte VOL , 56*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W02 .byte c_v+0 @@ -49,30 +49,30 @@ se_w227b_1: .byte W01 .byte c_v+5 .byte W01 - .byte VOL , 70*se_w227b_mvl/mxv + .byte VOL , 70*se_m_encore2_mvl/mxv .byte W01 .byte PAN , c_v+2 .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 80*se_w227b_mvl/mxv + .byte VOL , 80*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 .byte W02 - .byte VOL , 88*se_w227b_mvl/mxv + .byte VOL , 88*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W02 .byte c_v+0 .byte W01 .byte c_v+2 .byte W01 - .byte VOL , 96*se_w227b_mvl/mxv + .byte VOL , 96*se_m_encore2_mvl/mxv .byte PAN , c_v+5 .byte W02 .byte c_v+2 .byte W02 - .byte VOL , 100*se_w227b_mvl/mxv + .byte VOL , 100*se_m_encore2_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v-2 @@ -81,7 +81,7 @@ se_w227b_1: .byte W02 .byte c_v-2 .byte W02 -se_w227b_1_000: +se_m_encore2_1_000: .byte PAN , c_v+0 .byte W01 .byte c_v+2 @@ -100,58 +100,58 @@ se_w227b_1_000: .byte W02 .byte PEND .byte PATT - .word se_w227b_1_000 + .word se_m_encore2_1_000 .byte PATT - .word se_w227b_1_000 + .word se_m_encore2_1_000 .byte PATT - .word se_w227b_1_000 + .word se_m_encore2_1_000 .byte PATT - .word se_w227b_1_000 + .word se_m_encore2_1_000 .byte PATT - .word se_w227b_1_000 + .word se_m_encore2_1_000 .byte PATT - .word se_w227b_1_000 - .byte VOL , 96*se_w227b_mvl/mxv + .word se_m_encore2_1_000 + .byte VOL , 96*se_m_encore2_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v+2 .byte W01 .byte c_v+5 .byte W01 - .byte VOL , 92*se_w227b_mvl/mxv + .byte VOL , 92*se_m_encore2_mvl/mxv .byte W01 .byte PAN , c_v+2 .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 84*se_w227b_mvl/mxv + .byte VOL , 84*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 .byte W02 - .byte VOL , 72*se_w227b_mvl/mxv + .byte VOL , 72*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W02 .byte c_v+0 .byte W01 .byte c_v+2 .byte W01 - .byte VOL , 63*se_w227b_mvl/mxv + .byte VOL , 63*se_m_encore2_mvl/mxv .byte PAN , c_v+5 .byte W02 - .byte VOL , 52*se_w227b_mvl/mxv + .byte VOL , 52*se_m_encore2_mvl/mxv .byte PAN , c_v+2 .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 37*se_w227b_mvl/mxv + .byte VOL , 37*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 .byte W01 - .byte VOL , 22*se_w227b_mvl/mxv + .byte VOL , 22*se_m_encore2_mvl/mxv .byte W01 - .byte 12*se_w227b_mvl/mxv + .byte 12*se_m_encore2_mvl/mxv .byte PAN , c_v-2 .byte W02 .byte EOT , Cn3 @@ -160,14 +160,14 @@ se_w227b_1_000: @******************************************************@ .align 2 -se_w227b: +se_m_encore2: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w227b_pri @ Priority - .byte se_w227b_rev @ Reverb. + .byte se_m_encore2_pri @ Priority + .byte se_m_encore2_rev @ Reverb. - .word se_w227b_grp + .word se_m_encore2_grp - .word se_w227b_1 + .word se_m_encore2_1 .end diff --git a/sound/songs/se_w153.s b/sound/songs/se_m_explosion.s index fe4e25a9e..c93f485b8 100644 --- a/sound/songs/se_w153.s +++ b/sound/songs/se_m_explosion.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w153_grp, voicegroup128 - .equ se_w153_pri, 4 - .equ se_w153_rev, reverb_set+50 - .equ se_w153_mvl, 127 - .equ se_w153_key, 0 - .equ se_w153_tbs, 1 - .equ se_w153_exg, 0 - .equ se_w153_cmp, 1 + .equ se_m_explosion_grp, voicegroup128 + .equ se_m_explosion_pri, 4 + .equ se_m_explosion_rev, reverb_set+50 + .equ se_m_explosion_mvl, 127 + .equ se_m_explosion_key, 0 + .equ se_m_explosion_tbs, 1 + .equ se_m_explosion_exg, 0 + .equ se_m_explosion_cmp, 1 .section .rodata - .global se_w153 + .global se_m_explosion .align 2 @********************** Track 1 **********************@ -se_w153_1: - .byte KEYSH , se_w153_key+0 - .byte TEMPO , 150*se_w153_tbs/2 +se_m_explosion_1: + .byte KEYSH , se_m_explosion_key+0 + .byte TEMPO , 150*se_m_explosion_tbs/2 .byte VOICE , 41 - .byte VOL , 125*se_w153_mvl/mxv + .byte VOL , 125*se_m_explosion_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -82,20 +82,20 @@ se_w153_1: @********************** Track 2 **********************@ -se_w153_2: - .byte KEYSH , se_w153_key+0 +se_m_explosion_2: + .byte KEYSH , se_m_explosion_key+0 .byte VOICE , 4 - .byte VOL , 125*se_w153_mvl/mxv + .byte VOL , 125*se_m_explosion_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+1 .byte N02 , Cn3 , v052 .byte W01 - .byte VOL , 74*se_w153_mvl/mxv + .byte VOL , 74*se_m_explosion_mvl/mxv .byte W06 - .byte 125*se_w153_mvl/mxv + .byte 125*se_m_explosion_mvl/mxv .byte N02 .byte W01 - .byte VOL , 74*se_w153_mvl/mxv + .byte VOL , 74*se_m_explosion_mvl/mxv .byte W16 .byte W24 .byte W24 @@ -104,15 +104,15 @@ se_w153_2: @******************************************************@ .align 2 -se_w153: +se_m_explosion: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w153_pri @ Priority - .byte se_w153_rev @ Reverb. + .byte se_m_explosion_pri @ Priority + .byte se_m_explosion_rev @ Reverb. - .word se_w153_grp + .word se_m_explosion_grp - .word se_w153_1 - .word se_w153_2 + .word se_m_explosion_1 + .word se_m_explosion_2 .end diff --git a/sound/songs/se_w185.s b/sound/songs/se_m_faint_attack.s index 8ec9ebfe8..ce53c7173 100644 --- a/sound/songs/se_w185.s +++ b/sound/songs/se_m_faint_attack.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w185_grp, voicegroup128 - .equ se_w185_pri, 4 - .equ se_w185_rev, reverb_set+50 - .equ se_w185_mvl, 127 - .equ se_w185_key, 0 - .equ se_w185_tbs, 1 - .equ se_w185_exg, 0 - .equ se_w185_cmp, 1 + .equ se_m_faint_attack_grp, voicegroup128 + .equ se_m_faint_attack_pri, 4 + .equ se_m_faint_attack_rev, reverb_set+50 + .equ se_m_faint_attack_mvl, 127 + .equ se_m_faint_attack_key, 0 + .equ se_m_faint_attack_tbs, 1 + .equ se_m_faint_attack_exg, 0 + .equ se_m_faint_attack_cmp, 1 .section .rodata - .global se_w185 + .global se_m_faint_attack .align 2 @********************** Track 1 **********************@ -se_w185_1: - .byte KEYSH , se_w185_key+0 - .byte TEMPO , 150*se_w185_tbs/2 +se_m_faint_attack_1: + .byte KEYSH , se_m_faint_attack_key+0 + .byte TEMPO , 150*se_m_faint_attack_tbs/2 .byte VOICE , 45 - .byte VOL , 100*se_w185_mvl/mxv + .byte VOL , 100*se_m_faint_attack_mvl/mxv .byte BENDR , 2 .byte PAN , c_v+0 .byte BEND , c_v-5 @@ -76,14 +76,14 @@ se_w185_1: @******************************************************@ .align 2 -se_w185: +se_m_faint_attack: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w185_pri @ Priority - .byte se_w185_rev @ Reverb. + .byte se_m_faint_attack_pri @ Priority + .byte se_m_faint_attack_rev @ Reverb. - .word se_w185_grp + .word se_m_faint_attack_grp - .word se_w185_1 + .word se_m_faint_attack_1 .end diff --git a/sound/songs/se_m_flame_wheel.s b/sound/songs/se_m_flame_wheel.s new file mode 100644 index 000000000..797073466 --- /dev/null +++ b/sound/songs/se_m_flame_wheel.s @@ -0,0 +1,124 @@ + .include "MPlayDef.s" + + .equ se_m_flame_wheel_grp, voicegroup128 + .equ se_m_flame_wheel_pri, 4 + .equ se_m_flame_wheel_rev, reverb_set+50 + .equ se_m_flame_wheel_mvl, 127 + .equ se_m_flame_wheel_key, 0 + .equ se_m_flame_wheel_tbs, 1 + .equ se_m_flame_wheel_exg, 0 + .equ se_m_flame_wheel_cmp, 1 + + .section .rodata + .global se_m_flame_wheel + .align 2 + +@********************** Track 1 **********************@ + +se_m_flame_wheel_1: + .byte KEYSH , se_m_flame_wheel_key+0 + .byte TEMPO , 150*se_m_flame_wheel_tbs/2 + .byte VOICE , 29 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 22*se_m_flame_wheel_mvl/mxv + .byte BEND , c_v+0 + .byte N30 , Dn4 , v127 + .byte W01 + .byte VOL , 49*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte 71*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte 95*se_m_flame_wheel_mvl/mxv + .byte BEND , c_v+8 + .byte W01 + .byte VOL , 110*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte PAN , c_v+5 + .byte BEND , c_v+16 + .byte W01 + .byte VOL , 95*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 88*se_m_flame_wheel_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+7 + .byte W01 + .byte VOL , 93*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 110*se_m_flame_wheel_mvl/mxv + .byte PAN , c_v-5 + .byte BEND , c_v+0 + .byte W02 + .byte VOL , 86*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte BEND , c_v-9 + .byte W01 + .byte VOL , 63*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 37*se_m_flame_wheel_mvl/mxv + .byte BEND , c_v-24 + .byte W03 + .byte VOL , 13*se_m_flame_wheel_mvl/mxv + .byte BEND , c_v-46 + .byte W03 + .byte W03 + .byte W03 + .byte W03 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_flame_wheel_2: + .byte KEYSH , se_m_flame_wheel_key+0 + .byte VOICE , 27 + .byte PAN , c_v+0 + .byte VOL , 22*se_m_flame_wheel_mvl/mxv + .byte N30 , Gn2 , v032 + .byte W01 + .byte VOL , 49*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte 71*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte 95*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte 110*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte W01 + .byte 95*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 88*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte 93*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 110*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 86*se_m_flame_wheel_mvl/mxv + .byte W01 + .byte W01 + .byte 63*se_m_flame_wheel_mvl/mxv + .byte W02 + .byte 37*se_m_flame_wheel_mvl/mxv + .byte W03 + .byte 13*se_m_flame_wheel_mvl/mxv + .byte W03 + .byte W03 + .byte W03 + .byte W03 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_flame_wheel: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_flame_wheel_pri @ Priority + .byte se_m_flame_wheel_rev @ Reverb. + + .word se_m_flame_wheel_grp + + .word se_m_flame_wheel_1 + .word se_m_flame_wheel_2 + + .end diff --git a/sound/songs/se_m_flame_wheel2.s b/sound/songs/se_m_flame_wheel2.s new file mode 100644 index 000000000..21f911b0b --- /dev/null +++ b/sound/songs/se_m_flame_wheel2.s @@ -0,0 +1,99 @@ + .include "MPlayDef.s" + + .equ se_m_flame_wheel2_grp, voicegroup128 + .equ se_m_flame_wheel2_pri, 4 + .equ se_m_flame_wheel2_rev, reverb_set+50 + .equ se_m_flame_wheel2_mvl, 127 + .equ se_m_flame_wheel2_key, 0 + .equ se_m_flame_wheel2_tbs, 1 + .equ se_m_flame_wheel2_exg, 0 + .equ se_m_flame_wheel2_cmp, 1 + + .section .rodata + .global se_m_flame_wheel2 + .align 2 + +@********************** Track 1 **********************@ + +se_m_flame_wheel2_1: + .byte KEYSH , se_m_flame_wheel2_key+0 + .byte TEMPO , 150*se_m_flame_wheel2_tbs/2 + .byte VOICE , 29 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_flame_wheel2_mvl/mxv + .byte BEND , c_v+0 + .byte N48 , Cn4 , v127 + .byte W06 + .byte PAN , c_v+4 + .byte W03 + .byte BEND , c_v+2 + .byte W03 + .byte PAN , c_v+10 + .byte W03 + .byte BEND , c_v+5 + .byte W03 + .byte VOL , 98*se_m_flame_wheel2_mvl/mxv + .byte PAN , c_v+4 + .byte W03 + .byte BEND , c_v+3 + .byte W03 + .byte VOL , 88*se_m_flame_wheel2_mvl/mxv + .byte PAN , c_v+0 + .byte W03 + .byte BEND , c_v-5 + .byte W03 + .byte VOL , 68*se_m_flame_wheel2_mvl/mxv + .byte PAN , c_v-5 + .byte W03 + .byte c_v+7 + .byte BEND , c_v-9 + .byte W03 + .byte VOL , 44*se_m_flame_wheel2_mvl/mxv + .byte PAN , c_v+0 + .byte W03 + .byte BEND , c_v-15 + .byte W03 + .byte VOL , 13*se_m_flame_wheel2_mvl/mxv + .byte BEND , c_v-24 + .byte W03 + .byte c_v-40 + .byte W03 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_flame_wheel2_2: + .byte KEYSH , se_m_flame_wheel2_key+0 + .byte VOICE , 27 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_flame_wheel2_mvl/mxv + .byte N48 , Gn2 , v032 + .byte W18 + .byte VOL , 98*se_m_flame_wheel2_mvl/mxv + .byte W06 + .byte 88*se_m_flame_wheel2_mvl/mxv + .byte W06 + .byte 68*se_m_flame_wheel2_mvl/mxv + .byte W06 + .byte 44*se_m_flame_wheel2_mvl/mxv + .byte W06 + .byte 13*se_m_flame_wheel2_mvl/mxv + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_flame_wheel2: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_flame_wheel2_pri @ Priority + .byte se_m_flame_wheel2_rev @ Reverb. + + .word se_m_flame_wheel2_grp + + .word se_m_flame_wheel2_1 + .word se_m_flame_wheel2_2 + + .end diff --git a/sound/songs/se_w053.s b/sound/songs/se_m_flamethrower.s index 7c414896a..29438337f 100644 --- a/sound/songs/se_w053.s +++ b/sound/songs/se_m_flamethrower.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_w053_grp, voicegroup128 - .equ se_w053_pri, 4 - .equ se_w053_rev, reverb_set+50 - .equ se_w053_mvl, 127 - .equ se_w053_key, 0 - .equ se_w053_tbs, 1 - .equ se_w053_exg, 0 - .equ se_w053_cmp, 1 + .equ se_m_flamethrower_grp, voicegroup128 + .equ se_m_flamethrower_pri, 4 + .equ se_m_flamethrower_rev, reverb_set+50 + .equ se_m_flamethrower_mvl, 127 + .equ se_m_flamethrower_key, 0 + .equ se_m_flamethrower_tbs, 1 + .equ se_m_flamethrower_exg, 0 + .equ se_m_flamethrower_cmp, 1 .section .rodata - .global se_w053 + .global se_m_flamethrower .align 2 @********************** Track 1 **********************@ -se_w053_1: - .byte KEYSH , se_w053_key+0 - .byte TEMPO , 150*se_w053_tbs/2 +se_m_flamethrower_1: + .byte KEYSH , se_m_flamethrower_key+0 + .byte TEMPO , 150*se_m_flamethrower_tbs/2 .byte VOICE , 29 .byte BENDR , 12 - .byte VOL , 110*se_w053_mvl/mxv + .byte VOL , 110*se_m_flamethrower_mvl/mxv .byte PAN , c_v+4 .byte BEND , c_v+50 .byte TIE , Cn3 , v127 @@ -66,7 +66,7 @@ se_w053_1: .byte W03 .byte c_v+0 .byte W03 -se_w053_1_000: +se_m_flamethrower_1_000: .byte PAN , c_v+4 .byte W03 .byte c_v-5 @@ -83,48 +83,48 @@ se_w053_1_000: .byte W03 .byte PEND .byte PATT - .word se_w053_1_000 + .word se_m_flamethrower_1_000 .byte PATT - .word se_w053_1_000 + .word se_m_flamethrower_1_000 .byte PATT - .word se_w053_1_000 + .word se_m_flamethrower_1_000 .byte PAN , c_v+4 .byte W03 .byte c_v-5 .byte W03 - .byte VOL , 103*se_w053_mvl/mxv + .byte VOL , 103*se_m_flamethrower_mvl/mxv .byte W01 .byte PAN , c_v+8 .byte W03 - .byte VOL , 96*se_w053_mvl/mxv + .byte VOL , 96*se_m_flamethrower_mvl/mxv .byte PAN , c_v-9 .byte W04 .byte c_v+4 .byte W02 - .byte VOL , 88*se_w053_mvl/mxv + .byte VOL , 88*se_m_flamethrower_mvl/mxv .byte W02 .byte PAN , c_v-5 .byte W03 .byte c_v+0 .byte W01 - .byte VOL , 73*se_w053_mvl/mxv + .byte VOL , 73*se_m_flamethrower_mvl/mxv .byte W02 .byte PAN , c_v+4 .byte W03 - .byte VOL , 62*se_w053_mvl/mxv + .byte VOL , 62*se_m_flamethrower_mvl/mxv .byte PAN , c_v-5 .byte W04 .byte c_v+8 .byte W01 - .byte VOL , 47*se_w053_mvl/mxv + .byte VOL , 47*se_m_flamethrower_mvl/mxv .byte W02 .byte PAN , c_v-9 .byte W03 - .byte VOL , 27*se_w053_mvl/mxv + .byte VOL , 27*se_m_flamethrower_mvl/mxv .byte W01 .byte PAN , c_v+4 .byte W04 - .byte VOL , 10*se_w053_mvl/mxv + .byte VOL , 10*se_m_flamethrower_mvl/mxv .byte PAN , c_v-5 .byte W03 .byte c_v+0 @@ -134,20 +134,20 @@ se_w053_1_000: @********************** Track 2 **********************@ -se_w053_2: - .byte KEYSH , se_w053_key+0 +se_m_flamethrower_2: + .byte KEYSH , se_m_flamethrower_key+0 .byte VOICE , 27 .byte PAN , c_v+0 - .byte VOL , 110*se_w053_mvl/mxv + .byte VOL , 110*se_m_flamethrower_mvl/mxv .byte N24 , Fn2 , v060 .byte W10 - .byte VOL , 99*se_w053_mvl/mxv + .byte VOL , 99*se_m_flamethrower_mvl/mxv .byte W05 - .byte 82*se_w053_mvl/mxv + .byte 82*se_m_flamethrower_mvl/mxv .byte W04 - .byte 54*se_w053_mvl/mxv + .byte 54*se_m_flamethrower_mvl/mxv .byte W02 - .byte 25*se_w053_mvl/mxv + .byte 25*se_m_flamethrower_mvl/mxv .byte W03 .byte W24 .byte W24 @@ -161,15 +161,15 @@ se_w053_2: @******************************************************@ .align 2 -se_w053: +se_m_flamethrower: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w053_pri @ Priority - .byte se_w053_rev @ Reverb. + .byte se_m_flamethrower_pri @ Priority + .byte se_m_flamethrower_rev @ Reverb. - .word se_w053_grp + .word se_m_flamethrower_grp - .word se_w053_1 - .word se_w053_2 + .word se_m_flamethrower_1 + .word se_m_flamethrower_2 .end diff --git a/sound/songs/se_m_flatter.s b/sound/songs/se_m_flatter.s new file mode 100644 index 000000000..e3746c990 --- /dev/null +++ b/sound/songs/se_m_flatter.s @@ -0,0 +1,67 @@ + .include "MPlayDef.s" + + .equ se_m_flatter_grp, voicegroup128 + .equ se_m_flatter_pri, 4 + .equ se_m_flatter_rev, reverb_set+50 + .equ se_m_flatter_mvl, 127 + .equ se_m_flatter_key, 0 + .equ se_m_flatter_tbs, 1 + .equ se_m_flatter_exg, 0 + .equ se_m_flatter_cmp, 1 + + .section .rodata + .global se_m_flatter + .align 2 + +@********************** Track 1 **********************@ + +se_m_flatter_1: + .byte KEYSH , se_m_flatter_key+0 + .byte TEMPO , 150*se_m_flatter_tbs/2 + .byte VOICE , 41 + .byte VOL , 100*se_m_flatter_mvl/mxv + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte N01 , Dn5 , v127 + .byte W01 + .byte Gn4 + .byte W01 + .byte N09 , En5 + .byte W02 + .byte PAN , c_v+6 + .byte W02 + .byte VOL , 92*se_m_flatter_mvl/mxv + .byte PAN , c_v-8 + .byte W01 + .byte VOL , 83*se_m_flatter_mvl/mxv + .byte PAN , c_v+6 + .byte W01 + .byte VOL , 71*se_m_flatter_mvl/mxv + .byte PAN , c_v-8 + .byte BEND , c_v-4 + .byte W01 + .byte VOL , 46*se_m_flatter_mvl/mxv + .byte PAN , c_v+11 + .byte BEND , c_v-8 + .byte W01 + .byte VOL , 22*se_m_flatter_mvl/mxv + .byte PAN , c_v-12 + .byte BEND , c_v-15 + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_flatter: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_flatter_pri @ Priority + .byte se_m_flatter_rev @ Reverb. + + .word se_m_flatter_grp + + .word se_m_flatter_1 + + .end diff --git a/sound/songs/se_w202.s b/sound/songs/se_m_giga_drain.s index 6149a878d..4596a0252 100644 --- a/sound/songs/se_w202.s +++ b/sound/songs/se_m_giga_drain.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w202_grp, voicegroup128 - .equ se_w202_pri, 4 - .equ se_w202_rev, reverb_set+50 - .equ se_w202_mvl, 127 - .equ se_w202_key, 0 - .equ se_w202_tbs, 1 - .equ se_w202_exg, 0 - .equ se_w202_cmp, 1 + .equ se_m_giga_drain_grp, voicegroup128 + .equ se_m_giga_drain_pri, 4 + .equ se_m_giga_drain_rev, reverb_set+50 + .equ se_m_giga_drain_mvl, 127 + .equ se_m_giga_drain_key, 0 + .equ se_m_giga_drain_tbs, 1 + .equ se_m_giga_drain_exg, 0 + .equ se_m_giga_drain_cmp, 1 .section .rodata - .global se_w202 + .global se_m_giga_drain .align 2 @********************** Track 1 **********************@ -se_w202_1: - .byte KEYSH , se_w202_key+0 - .byte TEMPO , 150*se_w202_tbs/2 +se_m_giga_drain_1: + .byte KEYSH , se_m_giga_drain_key+0 + .byte TEMPO , 150*se_m_giga_drain_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w202_mvl/mxv + .byte VOL , 110*se_m_giga_drain_mvl/mxv .byte BEND , c_v+0 .byte N03 , Gn2 , v127 .byte W02 @@ -68,14 +68,14 @@ se_w202_1: @******************************************************@ .align 2 -se_w202: +se_m_giga_drain: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w202_pri @ Priority - .byte se_w202_rev @ Reverb. + .byte se_m_giga_drain_pri @ Priority + .byte se_m_giga_drain_rev @ Reverb. - .word se_w202_grp + .word se_m_giga_drain_grp - .word se_w202_1 + .word se_m_giga_drain_1 .end diff --git a/sound/songs/se_w320.s b/sound/songs/se_m_grasswhistle.s index 82d93b571..111bc2166 100644 --- a/sound/songs/se_w320.s +++ b/sound/songs/se_m_grasswhistle.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ se_w320_grp, voicegroup128 - .equ se_w320_pri, 4 - .equ se_w320_rev, reverb_set+50 - .equ se_w320_mvl, 127 - .equ se_w320_key, 0 - .equ se_w320_tbs, 1 - .equ se_w320_exg, 0 - .equ se_w320_cmp, 1 + .equ se_m_grasswhistle_grp, voicegroup128 + .equ se_m_grasswhistle_pri, 4 + .equ se_m_grasswhistle_rev, reverb_set+50 + .equ se_m_grasswhistle_mvl, 127 + .equ se_m_grasswhistle_key, 0 + .equ se_m_grasswhistle_tbs, 1 + .equ se_m_grasswhistle_exg, 0 + .equ se_m_grasswhistle_cmp, 1 .section .rodata - .global se_w320 + .global se_m_grasswhistle .align 2 @********************** Track 1 **********************@ -se_w320_1: - .byte KEYSH , se_w320_key+0 - .byte TEMPO , 100*se_w320_tbs/2 +se_m_grasswhistle_1: + .byte KEYSH , se_m_grasswhistle_key+0 + .byte TEMPO , 100*se_m_grasswhistle_tbs/2 .byte VOICE , 64 .byte BENDR , 2 .byte LFOS , 40 .byte PAN , c_v+0 - .byte VOL , 70*se_w320_mvl/mxv + .byte VOL , 70*se_m_grasswhistle_mvl/mxv .byte BEND , c_v-16 .byte N21 , Gn5 , v112 .byte W03 @@ -52,24 +52,24 @@ se_w320_1: .byte W12 .byte W12 .byte W06 - .byte VOL , 61*se_w320_mvl/mxv + .byte VOL , 61*se_m_grasswhistle_mvl/mxv .byte W06 - .byte 51*se_w320_mvl/mxv + .byte 51*se_m_grasswhistle_mvl/mxv .byte W06 - .byte 36*se_w320_mvl/mxv + .byte 36*se_m_grasswhistle_mvl/mxv .byte W06 - .byte 18*se_w320_mvl/mxv + .byte 18*se_m_grasswhistle_mvl/mxv .byte W12 .byte FINE @********************** Track 2 **********************@ -se_w320_2: - .byte KEYSH , se_w320_key+0 +se_m_grasswhistle_2: + .byte KEYSH , se_m_grasswhistle_key+0 .byte VOICE , 64 .byte BENDR , 2 .byte LFOS , 40 - .byte VOL , 70*se_w320_mvl/mxv + .byte VOL , 70*se_m_grasswhistle_mvl/mxv .byte W12 .byte PAN , c_v+12 .byte BEND , c_v-16 @@ -103,28 +103,28 @@ se_w320_2: .byte MOD , 10 .byte W12 .byte W06 - .byte VOL , 61*se_w320_mvl/mxv + .byte VOL , 61*se_m_grasswhistle_mvl/mxv .byte W06 - .byte 51*se_w320_mvl/mxv + .byte 51*se_m_grasswhistle_mvl/mxv .byte W06 - .byte 36*se_w320_mvl/mxv + .byte 36*se_m_grasswhistle_mvl/mxv .byte W06 - .byte 18*se_w320_mvl/mxv + .byte 18*se_m_grasswhistle_mvl/mxv .byte W12 .byte FINE @******************************************************@ .align 2 -se_w320: +se_m_grasswhistle: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w320_pri @ Priority - .byte se_w320_rev @ Reverb. + .byte se_m_grasswhistle_pri @ Priority + .byte se_m_grasswhistle_rev @ Reverb. - .word se_w320_grp + .word se_m_grasswhistle_grp - .word se_w320_1 - .word se_w320_2 + .word se_m_grasswhistle_1 + .word se_m_grasswhistle_2 .end diff --git a/sound/songs/se_w258.s b/sound/songs/se_m_hail.s index e2b1a531f..0c04af212 100644 --- a/sound/songs/se_w258.s +++ b/sound/songs/se_m_hail.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w258_grp, voicegroup128 - .equ se_w258_pri, 4 - .equ se_w258_rev, reverb_set+50 - .equ se_w258_mvl, 127 - .equ se_w258_key, 0 - .equ se_w258_tbs, 1 - .equ se_w258_exg, 0 - .equ se_w258_cmp, 1 + .equ se_m_hail_grp, voicegroup128 + .equ se_m_hail_pri, 4 + .equ se_m_hail_rev, reverb_set+50 + .equ se_m_hail_mvl, 127 + .equ se_m_hail_key, 0 + .equ se_m_hail_tbs, 1 + .equ se_m_hail_exg, 0 + .equ se_m_hail_cmp, 1 .section .rodata - .global se_w258 + .global se_m_hail .align 2 @********************** Track 1 **********************@ -se_w258_1: - .byte KEYSH , se_w258_key+0 - .byte TEMPO , 150*se_w258_tbs/2 +se_m_hail_1: + .byte KEYSH , se_m_hail_key+0 + .byte TEMPO , 150*se_m_hail_tbs/2 .byte VOICE , 3 - .byte VOL , 100*se_w258_mvl/mxv + .byte VOL , 100*se_m_hail_mvl/mxv .byte PAN , c_v+0 .byte N01 , Fn4 , v112 .byte W04 @@ -57,10 +57,10 @@ se_w258_1: @********************** Track 2 **********************@ -se_w258_2: - .byte KEYSH , se_w258_key+0 +se_m_hail_2: + .byte KEYSH , se_m_hail_key+0 .byte VOICE , 4 - .byte VOL , 100*se_w258_mvl/mxv + .byte VOL , 100*se_m_hail_mvl/mxv .byte PAN , c_v+0 .byte N01 , Dn4 , v040 .byte W04 @@ -84,15 +84,15 @@ se_w258_2: @******************************************************@ .align 2 -se_w258: +se_m_hail: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w258_pri @ Priority - .byte se_w258_rev @ Reverb. + .byte se_m_hail_pri @ Priority + .byte se_m_hail_rev @ Reverb. - .word se_w258_grp + .word se_m_hail_grp - .word se_w258_1 - .word se_w258_2 + .word se_m_hail_1 + .word se_m_hail_2 .end diff --git a/sound/songs/se_w231.s b/sound/songs/se_m_harden.s index 46e5ba938..e9bd888de 100644 --- a/sound/songs/se_w231.s +++ b/sound/songs/se_m_harden.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w231_grp, voicegroup128 - .equ se_w231_pri, 4 - .equ se_w231_rev, reverb_set+50 - .equ se_w231_mvl, 127 - .equ se_w231_key, 0 - .equ se_w231_tbs, 1 - .equ se_w231_exg, 0 - .equ se_w231_cmp, 1 + .equ se_m_harden_grp, voicegroup128 + .equ se_m_harden_pri, 4 + .equ se_m_harden_rev, reverb_set+50 + .equ se_m_harden_mvl, 127 + .equ se_m_harden_key, 0 + .equ se_m_harden_tbs, 1 + .equ se_m_harden_exg, 0 + .equ se_m_harden_cmp, 1 .section .rodata - .global se_w231 + .global se_m_harden .align 2 @********************** Track 1 **********************@ -se_w231_1: - .byte KEYSH , se_w231_key+0 - .byte TEMPO , 150*se_w231_tbs/2 +se_m_harden_1: + .byte KEYSH , se_m_harden_key+0 + .byte TEMPO , 150*se_m_harden_tbs/2 .byte VOICE , 28 - .byte VOL , 100*se_w231_mvl/mxv + .byte VOL , 100*se_m_harden_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+16 .byte N03 , Gs3 , v080 @@ -46,10 +46,10 @@ se_w231_1: @********************** Track 2 **********************@ -se_w231_2: - .byte KEYSH , se_w231_key+0 +se_m_harden_2: + .byte KEYSH , se_m_harden_key+0 .byte VOICE , 4 - .byte VOL , 100*se_w231_mvl/mxv + .byte VOL , 100*se_m_harden_mvl/mxv .byte PAN , c_v+0 .byte N01 , En4 , v060 .byte W04 @@ -60,15 +60,15 @@ se_w231_2: @******************************************************@ .align 2 -se_w231: +se_m_harden: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w231_pri @ Priority - .byte se_w231_rev @ Reverb. + .byte se_m_harden_pri @ Priority + .byte se_m_harden_rev @ Reverb. - .word se_w231_grp + .word se_m_harden_grp - .word se_w231_1 - .word se_w231_2 + .word se_m_harden_1 + .word se_m_harden_2 .end diff --git a/sound/songs/se_w114.s b/sound/songs/se_m_haze.s index 4de8c4ed8..4bf61faa6 100644 --- a/sound/songs/se_w114.s +++ b/sound/songs/se_m_haze.s @@ -1,191 +1,191 @@ .include "MPlayDef.s" - .equ se_w114_grp, voicegroup128 - .equ se_w114_pri, 4 - .equ se_w114_rev, reverb_set+50 - .equ se_w114_mvl, 127 - .equ se_w114_key, 0 - .equ se_w114_tbs, 1 - .equ se_w114_exg, 0 - .equ se_w114_cmp, 1 + .equ se_m_haze_grp, voicegroup128 + .equ se_m_haze_pri, 4 + .equ se_m_haze_rev, reverb_set+50 + .equ se_m_haze_mvl, 127 + .equ se_m_haze_key, 0 + .equ se_m_haze_tbs, 1 + .equ se_m_haze_exg, 0 + .equ se_m_haze_cmp, 1 .section .rodata - .global se_w114 + .global se_m_haze .align 2 @********************** Track 1 **********************@ -se_w114_1: - .byte KEYSH , se_w114_key+0 - .byte TEMPO , 190*se_w114_tbs/2 +se_m_haze_1: + .byte KEYSH , se_m_haze_key+0 + .byte TEMPO , 190*se_m_haze_tbs/2 .byte VOICE , 45 .byte BENDR , 8 .byte PAN , c_v-47 - .byte VOL , 10*se_w114_mvl/mxv + .byte VOL , 10*se_m_haze_mvl/mxv .byte MOD , 30 .byte BEND , c_v+1 .byte TIE , As2 , v100 .byte W03 - .byte VOL , 14*se_w114_mvl/mxv + .byte VOL , 14*se_m_haze_mvl/mxv .byte W03 - .byte 22*se_w114_mvl/mxv + .byte 22*se_m_haze_mvl/mxv .byte PAN , c_v-45 .byte W02 - .byte VOL , 31*se_w114_mvl/mxv + .byte VOL , 31*se_m_haze_mvl/mxv .byte W02 - .byte 39*se_w114_mvl/mxv + .byte 39*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v-43 .byte W02 - .byte VOL , 45*se_w114_mvl/mxv + .byte VOL , 45*se_m_haze_mvl/mxv .byte W02 - .byte 50*se_w114_mvl/mxv + .byte 50*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v-41 .byte W01 - .byte VOL , 61*se_w114_mvl/mxv + .byte VOL , 61*se_m_haze_mvl/mxv .byte W02 - .byte 66*se_w114_mvl/mxv + .byte 66*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v-39 - .byte VOL , 73*se_w114_mvl/mxv + .byte VOL , 73*se_m_haze_mvl/mxv .byte W02 - .byte 78*se_w114_mvl/mxv + .byte 78*se_m_haze_mvl/mxv .byte W04 - .byte 84*se_w114_mvl/mxv + .byte 84*se_m_haze_mvl/mxv .byte PAN , c_v-37 .byte W03 - .byte VOL , 91*se_w114_mvl/mxv + .byte VOL , 91*se_m_haze_mvl/mxv .byte W03 - .byte 98*se_w114_mvl/mxv + .byte 98*se_m_haze_mvl/mxv .byte PAN , c_v-35 .byte W02 - .byte VOL , 104*se_w114_mvl/mxv + .byte VOL , 104*se_m_haze_mvl/mxv .byte W04 - .byte 110*se_w114_mvl/mxv + .byte 110*se_m_haze_mvl/mxv .byte PAN , c_v-32 .byte W06 .byte c_v-28 .byte W06 .byte c_v-25 - .byte VOL , 106*se_w114_mvl/mxv + .byte VOL , 106*se_m_haze_mvl/mxv .byte W04 - .byte 104*se_w114_mvl/mxv + .byte 104*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v-23 .byte W03 - .byte VOL , 101*se_w114_mvl/mxv + .byte VOL , 101*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v-20 .byte W03 - .byte VOL , 97*se_w114_mvl/mxv + .byte VOL , 97*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v-17 .byte W02 - .byte VOL , 91*se_w114_mvl/mxv + .byte VOL , 91*se_m_haze_mvl/mxv .byte W04 .byte PAN , c_v-13 .byte W03 - .byte VOL , 88*se_w114_mvl/mxv + .byte VOL , 88*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v-10 .byte W03 - .byte VOL , 81*se_w114_mvl/mxv + .byte VOL , 81*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v-7 .byte W04 - .byte VOL , 75*se_w114_mvl/mxv + .byte VOL , 75*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v-3 .byte W02 - .byte VOL , 74*se_w114_mvl/mxv + .byte VOL , 74*se_m_haze_mvl/mxv .byte W02 - .byte 76*se_w114_mvl/mxv + .byte 76*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v+0 .byte W01 - .byte VOL , 79*se_w114_mvl/mxv + .byte VOL , 79*se_m_haze_mvl/mxv .byte W02 - .byte 83*se_w114_mvl/mxv + .byte 83*se_m_haze_mvl/mxv .byte W03 .byte W01 - .byte 86*se_w114_mvl/mxv + .byte 86*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v+2 - .byte VOL , 90*se_w114_mvl/mxv + .byte VOL , 90*se_m_haze_mvl/mxv .byte W03 - .byte 95*se_w114_mvl/mxv + .byte 95*se_m_haze_mvl/mxv .byte W03 - .byte 98*se_w114_mvl/mxv + .byte 98*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v+7 - .byte VOL , 102*se_w114_mvl/mxv + .byte VOL , 102*se_m_haze_mvl/mxv .byte W02 - .byte 104*se_w114_mvl/mxv + .byte 104*se_m_haze_mvl/mxv .byte W04 .byte PAN , c_v+10 - .byte VOL , 110*se_w114_mvl/mxv + .byte VOL , 110*se_m_haze_mvl/mxv .byte W06 .byte PAN , c_v+14 .byte W06 .byte c_v+16 .byte W02 - .byte VOL , 106*se_w114_mvl/mxv + .byte VOL , 106*se_m_haze_mvl/mxv .byte W04 .byte PAN , c_v+19 .byte W01 - .byte VOL , 100*se_w114_mvl/mxv + .byte VOL , 100*se_m_haze_mvl/mxv .byte W05 .byte PAN , c_v+22 - .byte VOL , 94*se_w114_mvl/mxv + .byte VOL , 94*se_m_haze_mvl/mxv .byte W06 .byte PAN , c_v+25 - .byte VOL , 88*se_w114_mvl/mxv + .byte VOL , 88*se_m_haze_mvl/mxv .byte W04 - .byte 83*se_w114_mvl/mxv + .byte 83*se_m_haze_mvl/mxv .byte W02 .byte PAN , c_v+27 .byte W06 .byte c_v+29 - .byte VOL , 75*se_w114_mvl/mxv + .byte VOL , 75*se_m_haze_mvl/mxv .byte W06 .byte PAN , c_v+32 - .byte VOL , 64*se_w114_mvl/mxv + .byte VOL , 64*se_m_haze_mvl/mxv .byte W06 .byte PAN , c_v+34 .byte W01 - .byte VOL , 55*se_w114_mvl/mxv + .byte VOL , 55*se_m_haze_mvl/mxv .byte W05 .byte PAN , c_v+38 .byte W01 - .byte VOL , 47*se_w114_mvl/mxv + .byte VOL , 47*se_m_haze_mvl/mxv .byte W05 .byte PAN , c_v+41 .byte W01 - .byte VOL , 41*se_w114_mvl/mxv + .byte VOL , 41*se_m_haze_mvl/mxv .byte W05 .byte PAN , c_v+44 - .byte VOL , 32*se_w114_mvl/mxv + .byte VOL , 32*se_m_haze_mvl/mxv .byte W03 - .byte 25*se_w114_mvl/mxv + .byte 25*se_m_haze_mvl/mxv .byte W03 .byte PAN , c_v+47 .byte W01 - .byte VOL , 12*se_w114_mvl/mxv + .byte VOL , 12*se_m_haze_mvl/mxv .byte W03 - .byte 6*se_w114_mvl/mxv + .byte 6*se_m_haze_mvl/mxv .byte W02 .byte EOT .byte FINE @********************** Track 2 **********************@ -se_w114_2: - .byte KEYSH , se_w114_key+0 +se_m_haze_2: + .byte KEYSH , se_m_haze_key+0 .byte VOICE , 70 .byte BENDR , 8 .byte PAN , c_v+0 - .byte VOL , 110*se_w114_mvl/mxv + .byte VOL , 110*se_m_haze_mvl/mxv .byte BEND , c_v+0 .byte N24 , Fn4 , v020 .byte W06 @@ -236,15 +236,15 @@ se_w114_2: @******************************************************@ .align 2 -se_w114: +se_m_haze: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w114_pri @ Priority - .byte se_w114_rev @ Reverb. + .byte se_m_haze_pri @ Priority + .byte se_m_haze_rev @ Reverb. - .word se_w114_grp + .word se_m_haze_grp - .word se_w114_1 - .word se_w114_2 + .word se_m_haze_1 + .word se_m_haze_2 .end diff --git a/sound/songs/se_w215.s b/sound/songs/se_m_heal_bell.s index 196686fbd..b2b17f7d8 100644 --- a/sound/songs/se_w215.s +++ b/sound/songs/se_m_heal_bell.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w215_grp, voicegroup128 - .equ se_w215_pri, 4 - .equ se_w215_rev, reverb_set+50 - .equ se_w215_mvl, 127 - .equ se_w215_key, 0 - .equ se_w215_tbs, 1 - .equ se_w215_exg, 0 - .equ se_w215_cmp, 1 + .equ se_m_heal_bell_grp, voicegroup128 + .equ se_m_heal_bell_pri, 4 + .equ se_m_heal_bell_rev, reverb_set+50 + .equ se_m_heal_bell_mvl, 127 + .equ se_m_heal_bell_key, 0 + .equ se_m_heal_bell_tbs, 1 + .equ se_m_heal_bell_exg, 0 + .equ se_m_heal_bell_cmp, 1 .section .rodata - .global se_w215 + .global se_m_heal_bell .align 2 @********************** Track 1 **********************@ -se_w215_1: - .byte KEYSH , se_w215_key+0 - .byte TEMPO , 150*se_w215_tbs/2 +se_m_heal_bell_1: + .byte KEYSH , se_m_heal_bell_key+0 + .byte TEMPO , 150*se_m_heal_bell_tbs/2 .byte VOICE , 51 .byte BENDR , 2 .byte PAN , c_v+0 - .byte VOL , 90*se_w215_mvl/mxv + .byte VOL , 90*se_m_heal_bell_mvl/mxv .byte BEND , c_v+4 .byte N03 , As5 , v100 .byte W01 @@ -70,14 +70,14 @@ se_w215_1: @******************************************************@ .align 2 -se_w215: +se_m_heal_bell: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w215_pri @ Priority - .byte se_w215_rev @ Reverb. + .byte se_m_heal_bell_pri @ Priority + .byte se_m_heal_bell_rev @ Reverb. - .word se_w215_grp + .word se_m_heal_bell_grp - .word se_w215_1 + .word se_m_heal_bell_1 .end diff --git a/sound/songs/se_w257.s b/sound/songs/se_m_heat_wave.s index 5e9b6d06d..a4b5cc896 100644 --- a/sound/songs/se_w257.s +++ b/sound/songs/se_m_heat_wave.s @@ -1,60 +1,60 @@ .include "MPlayDef.s" - .equ se_w257_grp, voicegroup128 - .equ se_w257_pri, 4 - .equ se_w257_rev, reverb_set+50 - .equ se_w257_mvl, 127 - .equ se_w257_key, 0 - .equ se_w257_tbs, 1 - .equ se_w257_exg, 0 - .equ se_w257_cmp, 1 + .equ se_m_heat_wave_grp, voicegroup128 + .equ se_m_heat_wave_pri, 4 + .equ se_m_heat_wave_rev, reverb_set+50 + .equ se_m_heat_wave_mvl, 127 + .equ se_m_heat_wave_key, 0 + .equ se_m_heat_wave_tbs, 1 + .equ se_m_heat_wave_exg, 0 + .equ se_m_heat_wave_cmp, 1 .section .rodata - .global se_w257 + .global se_m_heat_wave .align 2 @********************** Track 1 **********************@ -se_w257_1: - .byte KEYSH , se_w257_key+0 - .byte TEMPO , 150*se_w257_tbs/2 +se_m_heat_wave_1: + .byte KEYSH , se_m_heat_wave_key+0 + .byte TEMPO , 150*se_m_heat_wave_tbs/2 .byte VOICE , 29 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 23*se_w257_mvl/mxv + .byte VOL , 23*se_m_heat_wave_mvl/mxv .byte BEND , c_v+0 .byte TIE , Fn4 , v127 .byte W01 - .byte VOL , 51*se_w257_mvl/mxv + .byte VOL , 51*se_m_heat_wave_mvl/mxv .byte W01 - .byte 75*se_w257_mvl/mxv + .byte 75*se_m_heat_wave_mvl/mxv .byte W01 - .byte 99*se_w257_mvl/mxv + .byte 99*se_m_heat_wave_mvl/mxv .byte BEND , c_v+8 .byte W01 - .byte VOL , 115*se_w257_mvl/mxv + .byte VOL , 115*se_m_heat_wave_mvl/mxv .byte W02 .byte PAN , c_v+6 .byte BEND , c_v+16 .byte W01 - .byte VOL , 99*se_w257_mvl/mxv + .byte VOL , 99*se_m_heat_wave_mvl/mxv .byte W02 - .byte 92*se_w257_mvl/mxv + .byte 92*se_m_heat_wave_mvl/mxv .byte BEND , c_v+7 .byte W01 - .byte VOL , 97*se_w257_mvl/mxv + .byte VOL , 97*se_m_heat_wave_mvl/mxv .byte W02 - .byte 105*se_w257_mvl/mxv + .byte 105*se_m_heat_wave_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte W03 - .byte VOL , 110*se_w257_mvl/mxv + .byte VOL , 110*se_m_heat_wave_mvl/mxv .byte BEND , c_v-9 .byte W03 .byte PAN , c_v-8 .byte BEND , c_v-24 .byte W03 - .byte VOL , 115*se_w257_mvl/mxv + .byte VOL , 115*se_m_heat_wave_mvl/mxv .byte BEND , c_v-38 .byte W03 .byte PAN , c_v+0 @@ -100,78 +100,78 @@ se_w257_1: .byte BEND , c_v-3 .byte W02 .byte PAN , c_v-8 - .byte VOL , 113*se_w257_mvl/mxv + .byte VOL , 113*se_m_heat_wave_mvl/mxv .byte W04 - .byte 110*se_w257_mvl/mxv + .byte 110*se_m_heat_wave_mvl/mxv .byte W02 .byte PAN , c_v+0 .byte W02 .byte BEND , c_v-7 .byte W02 - .byte VOL , 105*se_w257_mvl/mxv + .byte VOL , 105*se_m_heat_wave_mvl/mxv .byte W02 .byte PAN , c_v+6 .byte W03 - .byte VOL , 98*se_w257_mvl/mxv + .byte VOL , 98*se_m_heat_wave_mvl/mxv .byte BEND , c_v-11 .byte W03 .byte PAN , c_v+0 .byte W01 - .byte VOL , 91*se_w257_mvl/mxv + .byte VOL , 91*se_m_heat_wave_mvl/mxv .byte W03 - .byte 81*se_w257_mvl/mxv + .byte 81*se_m_heat_wave_mvl/mxv .byte BEND , c_v-15 .byte W02 .byte PAN , c_v-8 .byte W02 - .byte VOL , 74*se_w257_mvl/mxv + .byte VOL , 74*se_m_heat_wave_mvl/mxv .byte W01 .byte BEND , c_v-22 .byte W03 .byte PAN , c_v+0 - .byte VOL , 63*se_w257_mvl/mxv + .byte VOL , 63*se_m_heat_wave_mvl/mxv .byte W01 .byte BEND , c_v-30 .byte W01 - .byte VOL , 50*se_w257_mvl/mxv + .byte VOL , 50*se_m_heat_wave_mvl/mxv .byte W02 - .byte 40*se_w257_mvl/mxv + .byte 40*se_m_heat_wave_mvl/mxv .byte BEND , c_v-39 .byte W02 .byte PAN , c_v+6 .byte W01 - .byte VOL , 28*se_w257_mvl/mxv + .byte VOL , 28*se_m_heat_wave_mvl/mxv .byte BEND , c_v-52 .byte W02 - .byte VOL , 17*se_w257_mvl/mxv + .byte VOL , 17*se_m_heat_wave_mvl/mxv .byte W03 .byte EOT .byte FINE @********************** Track 2 **********************@ -se_w257_2: - .byte KEYSH , se_w257_key+0 +se_m_heat_wave_2: + .byte KEYSH , se_m_heat_wave_key+0 .byte VOICE , 27 .byte PAN , c_v+0 - .byte VOL , 23*se_w257_mvl/mxv + .byte VOL , 23*se_m_heat_wave_mvl/mxv .byte N30 , Gn2 , v032 .byte W01 - .byte VOL , 51*se_w257_mvl/mxv + .byte VOL , 51*se_m_heat_wave_mvl/mxv .byte W01 - .byte 75*se_w257_mvl/mxv + .byte 75*se_m_heat_wave_mvl/mxv .byte W01 - .byte 99*se_w257_mvl/mxv + .byte 99*se_m_heat_wave_mvl/mxv .byte W01 - .byte 115*se_w257_mvl/mxv + .byte 115*se_m_heat_wave_mvl/mxv .byte W03 - .byte 99*se_w257_mvl/mxv + .byte 99*se_m_heat_wave_mvl/mxv .byte W02 - .byte 92*se_w257_mvl/mxv + .byte 92*se_m_heat_wave_mvl/mxv .byte W01 - .byte 97*se_w257_mvl/mxv + .byte 97*se_m_heat_wave_mvl/mxv .byte W02 - .byte 115*se_w257_mvl/mxv + .byte 115*se_m_heat_wave_mvl/mxv .byte W12 .byte PAN , c_v+0 .byte W12 @@ -192,15 +192,15 @@ se_w257_2: @******************************************************@ .align 2 -se_w257: +se_m_heat_wave: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w257_pri @ Priority - .byte se_w257_rev @ Reverb. + .byte se_m_heat_wave_pri @ Priority + .byte se_m_heat_wave_rev @ Reverb. - .word se_w257_grp + .word se_m_heat_wave_grp - .word se_w257_1 - .word se_w257_2 + .word se_m_heat_wave_1 + .word se_m_heat_wave_2 .end diff --git a/sound/songs/se_w056.s b/sound/songs/se_m_hydro_pump.s index d553f418f..050f6281b 100644 --- a/sound/songs/se_w056.s +++ b/sound/songs/se_m_hydro_pump.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w056_grp, voicegroup128 - .equ se_w056_pri, 4 - .equ se_w056_rev, reverb_set+50 - .equ se_w056_mvl, 127 - .equ se_w056_key, 0 - .equ se_w056_tbs, 1 - .equ se_w056_exg, 0 - .equ se_w056_cmp, 1 + .equ se_m_hydro_pump_grp, voicegroup128 + .equ se_m_hydro_pump_pri, 4 + .equ se_m_hydro_pump_rev, reverb_set+50 + .equ se_m_hydro_pump_mvl, 127 + .equ se_m_hydro_pump_key, 0 + .equ se_m_hydro_pump_tbs, 1 + .equ se_m_hydro_pump_exg, 0 + .equ se_m_hydro_pump_cmp, 1 .section .rodata - .global se_w056 + .global se_m_hydro_pump .align 2 @********************** Track 1 **********************@ -se_w056_1: - .byte KEYSH , se_w056_key+0 - .byte TEMPO , 150*se_w056_tbs/2 +se_m_hydro_pump_1: + .byte KEYSH , se_m_hydro_pump_key+0 + .byte TEMPO , 150*se_m_hydro_pump_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 115*se_w056_mvl/mxv + .byte VOL , 115*se_m_hydro_pump_mvl/mxv .byte BEND , c_v+0 .byte TIE , Gn2 , v127 .byte W06 @@ -53,53 +53,53 @@ se_w056_1: .byte W06 .byte c_v+11 .byte W02 - .byte VOL , 103*se_w056_mvl/mxv + .byte VOL , 103*se_m_hydro_pump_mvl/mxv .byte W04 .byte PAN , c_v+4 .byte W01 - .byte VOL , 85*se_w056_mvl/mxv + .byte VOL , 85*se_m_hydro_pump_mvl/mxv .byte W05 .byte PAN , c_v+0 .byte W01 - .byte VOL , 71*se_w056_mvl/mxv + .byte VOL , 71*se_m_hydro_pump_mvl/mxv .byte W05 - .byte 52*se_w056_mvl/mxv + .byte 52*se_m_hydro_pump_mvl/mxv .byte PAN , c_v-4 .byte W04 - .byte VOL , 32*se_w056_mvl/mxv + .byte VOL , 32*se_m_hydro_pump_mvl/mxv .byte W02 .byte PAN , c_v-10 .byte W03 - .byte VOL , 11*se_w056_mvl/mxv + .byte VOL , 11*se_m_hydro_pump_mvl/mxv .byte W03 .byte PAN , c_v-5 .byte W01 - .byte VOL , 6*se_w056_mvl/mxv + .byte VOL , 6*se_m_hydro_pump_mvl/mxv .byte W05 .byte EOT .byte FINE @********************** Track 2 **********************@ -se_w056_2: - .byte KEYSH , se_w056_key+0 - .byte VOL , 58*se_w056_mvl/mxv +se_m_hydro_pump_2: + .byte KEYSH , se_m_hydro_pump_key+0 + .byte VOL , 58*se_m_hydro_pump_mvl/mxv .byte N14 , Gn3 , v080 .byte W01 .byte VOICE , 25 - .byte VOL , 76*se_w056_mvl/mxv + .byte VOL , 76*se_m_hydro_pump_mvl/mxv .byte W01 - .byte 89*se_w056_mvl/mxv + .byte 89*se_m_hydro_pump_mvl/mxv .byte W01 - .byte 100*se_w056_mvl/mxv + .byte 100*se_m_hydro_pump_mvl/mxv .byte W01 - .byte 115*se_w056_mvl/mxv + .byte 115*se_m_hydro_pump_mvl/mxv .byte W06 - .byte 90*se_w056_mvl/mxv + .byte 90*se_m_hydro_pump_mvl/mxv .byte W02 - .byte 76*se_w056_mvl/mxv + .byte 76*se_m_hydro_pump_mvl/mxv .byte W01 - .byte 58*se_w056_mvl/mxv + .byte 58*se_m_hydro_pump_mvl/mxv .byte W11 .byte W24 .byte W24 @@ -110,15 +110,15 @@ se_w056_2: @******************************************************@ .align 2 -se_w056: +se_m_hydro_pump: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w056_pri @ Priority - .byte se_w056_rev @ Reverb. + .byte se_m_hydro_pump_pri @ Priority + .byte se_m_hydro_pump_rev @ Reverb. - .word se_w056_grp + .word se_m_hydro_pump_grp - .word se_w056_1 - .word se_w056_2 + .word se_m_hydro_pump_1 + .word se_m_hydro_pump_2 .end diff --git a/sound/songs/se_w063.s b/sound/songs/se_m_hyper_beam.s index e2db381bd..bce85a21a 100644 --- a/sound/songs/se_w063.s +++ b/sound/songs/se_m_hyper_beam.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w063_grp, voicegroup128 - .equ se_w063_pri, 4 - .equ se_w063_rev, reverb_set+50 - .equ se_w063_mvl, 127 - .equ se_w063_key, 0 - .equ se_w063_tbs, 1 - .equ se_w063_exg, 0 - .equ se_w063_cmp, 1 + .equ se_m_hyper_beam_grp, voicegroup128 + .equ se_m_hyper_beam_pri, 4 + .equ se_m_hyper_beam_rev, reverb_set+50 + .equ se_m_hyper_beam_mvl, 127 + .equ se_m_hyper_beam_key, 0 + .equ se_m_hyper_beam_tbs, 1 + .equ se_m_hyper_beam_exg, 0 + .equ se_m_hyper_beam_cmp, 1 .section .rodata - .global se_w063 + .global se_m_hyper_beam .align 2 @********************** Track 1 **********************@ -se_w063_1: - .byte KEYSH , se_w063_key+0 - .byte TEMPO , 150*se_w063_tbs/2 +se_m_hyper_beam_1: + .byte KEYSH , se_m_hyper_beam_key+0 + .byte TEMPO , 150*se_m_hyper_beam_tbs/2 .byte VOICE , 18 - .byte VOL , 110*se_w063_mvl/mxv + .byte VOL , 110*se_m_hyper_beam_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -45,10 +45,10 @@ se_w063_1: @********************** Track 2 **********************@ -se_w063_2: - .byte KEYSH , se_w063_key+0 +se_m_hyper_beam_2: + .byte KEYSH , se_m_hyper_beam_key+0 .byte VOICE , 5 - .byte VOL , 110*se_w063_mvl/mxv + .byte VOL , 110*se_m_hyper_beam_mvl/mxv .byte N01 , Cn3 , v040 .byte W02 .byte N01 @@ -57,28 +57,28 @@ se_w063_2: .byte W02 .byte N01 .byte W04 -se_w063_2_000: +se_m_hyper_beam_2_000: .byte N01 , Cn3 , v020 .byte W02 .byte N01 .byte W04 .byte PEND .byte PATT - .word se_w063_2_000 + .word se_m_hyper_beam_2_000 .byte FINE @******************************************************@ .align 2 -se_w063: +se_m_hyper_beam: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w063_pri @ Priority - .byte se_w063_rev @ Reverb. + .byte se_m_hyper_beam_pri @ Priority + .byte se_m_hyper_beam_rev @ Reverb. - .word se_w063_grp + .word se_m_hyper_beam_grp - .word se_w063_1 - .word se_w063_2 + .word se_m_hyper_beam_1 + .word se_m_hyper_beam_2 .end diff --git a/sound/songs/se_w063b.s b/sound/songs/se_m_hyper_beam2.s index eef257849..304fa7b3f 100644 --- a/sound/songs/se_w063b.s +++ b/sound/songs/se_m_hyper_beam2.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w063b_grp, voicegroup128 - .equ se_w063b_pri, 4 - .equ se_w063b_rev, reverb_set+50 - .equ se_w063b_mvl, 127 - .equ se_w063b_key, 0 - .equ se_w063b_tbs, 1 - .equ se_w063b_exg, 0 - .equ se_w063b_cmp, 1 + .equ se_m_hyper_beam2_grp, voicegroup128 + .equ se_m_hyper_beam2_pri, 4 + .equ se_m_hyper_beam2_rev, reverb_set+50 + .equ se_m_hyper_beam2_mvl, 127 + .equ se_m_hyper_beam2_key, 0 + .equ se_m_hyper_beam2_tbs, 1 + .equ se_m_hyper_beam2_exg, 0 + .equ se_m_hyper_beam2_cmp, 1 .section .rodata - .global se_w063b + .global se_m_hyper_beam2 .align 2 @********************** Track 1 **********************@ -se_w063b_1: - .byte KEYSH , se_w063b_key+0 - .byte TEMPO , 150*se_w063b_tbs/2 +se_m_hyper_beam2_1: + .byte KEYSH , se_m_hyper_beam2_key+0 + .byte TEMPO , 150*se_m_hyper_beam2_tbs/2 .byte VOICE , 45 - .byte VOL , 110*se_w063b_mvl/mxv + .byte VOL , 110*se_m_hyper_beam2_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -76,10 +76,10 @@ se_w063b_1: @********************** Track 2 **********************@ -se_w063b_2: - .byte KEYSH , se_w063b_key+0 +se_m_hyper_beam2_2: + .byte KEYSH , se_m_hyper_beam2_key+0 .byte VOICE , 5 - .byte VOL , 110*se_w063b_mvl/mxv + .byte VOL , 110*se_m_hyper_beam2_mvl/mxv .byte N01 , Cn3 , v032 .byte W02 .byte N01 @@ -88,28 +88,28 @@ se_w063b_2: .byte W02 .byte N01 .byte W04 -se_w063b_2_000: +se_m_hyper_beam2_2_000: .byte N01 , Cn3 , v020 .byte W02 .byte N01 .byte W04 .byte PEND .byte PATT - .word se_w063b_2_000 + .word se_m_hyper_beam2_2_000 .byte FINE @******************************************************@ .align 2 -se_w063b: +se_m_hyper_beam2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w063b_pri @ Priority - .byte se_w063b_rev @ Reverb. + .byte se_m_hyper_beam2_pri @ Priority + .byte se_m_hyper_beam2_rev @ Reverb. - .word se_w063b_grp + .word se_m_hyper_beam2_grp - .word se_w063b_1 - .word se_w063b_2 + .word se_m_hyper_beam2_1 + .word se_m_hyper_beam2_2 .end diff --git a/sound/songs/se_w196.s b/sound/songs/se_m_icy_wind.s index 8a47a8c1b..d15350525 100644 --- a/sound/songs/se_w196.s +++ b/sound/songs/se_m_icy_wind.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w196_grp, voicegroup128 - .equ se_w196_pri, 4 - .equ se_w196_rev, reverb_set+50 - .equ se_w196_mvl, 127 - .equ se_w196_key, 0 - .equ se_w196_tbs, 1 - .equ se_w196_exg, 0 - .equ se_w196_cmp, 1 + .equ se_m_icy_wind_grp, voicegroup128 + .equ se_m_icy_wind_pri, 4 + .equ se_m_icy_wind_rev, reverb_set+50 + .equ se_m_icy_wind_mvl, 127 + .equ se_m_icy_wind_key, 0 + .equ se_m_icy_wind_tbs, 1 + .equ se_m_icy_wind_exg, 0 + .equ se_m_icy_wind_cmp, 1 .section .rodata - .global se_w196 + .global se_m_icy_wind .align 2 @********************** Track 1 **********************@ -se_w196_1: - .byte KEYSH , se_w196_key+0 - .byte TEMPO , 150*se_w196_tbs/2 +se_m_icy_wind_1: + .byte KEYSH , se_m_icy_wind_key+0 + .byte TEMPO , 150*se_m_icy_wind_tbs/2 .byte VOICE , 3 - .byte VOL , 100*se_w196_mvl/mxv + .byte VOL , 100*se_m_icy_wind_mvl/mxv .byte PAN , c_v+0 .byte N01 , Ds4 , v112 .byte W04 @@ -36,10 +36,10 @@ se_w196_1: @********************** Track 2 **********************@ -se_w196_2: - .byte KEYSH , se_w196_key+0 +se_m_icy_wind_2: + .byte KEYSH , se_m_icy_wind_key+0 .byte VOICE , 5 - .byte VOL , 100*se_w196_mvl/mxv + .byte VOL , 100*se_m_icy_wind_mvl/mxv .byte PAN , c_v+0 .byte N01 , Dn4 , v040 .byte W04 @@ -58,15 +58,15 @@ se_w196_2: @******************************************************@ .align 2 -se_w196: +se_m_icy_wind: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w196_pri @ Priority - .byte se_w196_rev @ Reverb. + .byte se_m_icy_wind_pri @ Priority + .byte se_m_icy_wind_rev @ Reverb. - .word se_w196_grp + .word se_m_icy_wind_grp - .word se_w196_1 - .word se_w196_2 + .word se_m_icy_wind_1 + .word se_m_icy_wind_2 .end diff --git a/sound/songs/se_w122.s b/sound/songs/se_m_lick.s index 95eb26ead..1aa0c35a2 100644 --- a/sound/songs/se_w122.s +++ b/sound/songs/se_m_lick.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w122_grp, voicegroup128 - .equ se_w122_pri, 4 - .equ se_w122_rev, reverb_set+50 - .equ se_w122_mvl, 127 - .equ se_w122_key, 0 - .equ se_w122_tbs, 1 - .equ se_w122_exg, 0 - .equ se_w122_cmp, 1 + .equ se_m_lick_grp, voicegroup128 + .equ se_m_lick_pri, 4 + .equ se_m_lick_rev, reverb_set+50 + .equ se_m_lick_mvl, 127 + .equ se_m_lick_key, 0 + .equ se_m_lick_tbs, 1 + .equ se_m_lick_exg, 0 + .equ se_m_lick_cmp, 1 .section .rodata - .global se_w122 + .global se_m_lick .align 2 @********************** Track 1 **********************@ -se_w122_1: - .byte KEYSH , se_w122_key+0 - .byte TEMPO , 150*se_w122_tbs/2 +se_m_lick_1: + .byte KEYSH , se_m_lick_key+0 + .byte TEMPO , 150*se_m_lick_tbs/2 .byte VOICE , 31 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w122_mvl/mxv + .byte VOL , 110*se_m_lick_mvl/mxv .byte BEND , c_v-5 .byte N32 , Cn3 , v127 .byte W01 @@ -68,47 +68,47 @@ se_w122_1: .byte BEND , c_v+16 .byte W02 .byte PAN , c_v-4 - .byte VOL , 102*se_w122_mvl/mxv + .byte VOL , 102*se_m_lick_mvl/mxv .byte BEND , c_v+12 .byte W01 .byte PAN , c_v+0 .byte BEND , c_v+16 .byte W01 .byte PAN , c_v+4 - .byte VOL , 97*se_w122_mvl/mxv + .byte VOL , 97*se_m_lick_mvl/mxv .byte BEND , c_v+18 .byte W01 .byte PAN , c_v+0 .byte BEND , c_v+14 .byte W01 .byte PAN , c_v-4 - .byte VOL , 92*se_w122_mvl/mxv + .byte VOL , 92*se_m_lick_mvl/mxv .byte BEND , c_v+18 .byte W02 .byte PAN , c_v+0 .byte BEND , c_v+20 .byte W01 .byte PAN , c_v+4 - .byte VOL , 88*se_w122_mvl/mxv + .byte VOL , 88*se_m_lick_mvl/mxv .byte BEND , c_v+17 .byte W01 .byte PAN , c_v+0 .byte BEND , c_v+12 .byte W01 .byte PAN , c_v-4 - .byte VOL , 81*se_w122_mvl/mxv + .byte VOL , 81*se_m_lick_mvl/mxv .byte BEND , c_v+16 .byte W01 .byte PAN , c_v+0 - .byte VOL , 64*se_w122_mvl/mxv + .byte VOL , 64*se_m_lick_mvl/mxv .byte BEND , c_v+12 .byte W02 .byte PAN , c_v+4 - .byte VOL , 49*se_w122_mvl/mxv + .byte VOL , 49*se_m_lick_mvl/mxv .byte BEND , c_v+14 .byte W01 .byte PAN , c_v+0 - .byte VOL , 25*se_w122_mvl/mxv + .byte VOL , 25*se_m_lick_mvl/mxv .byte BEND , c_v+11 .byte W05 .byte FINE @@ -116,14 +116,14 @@ se_w122_1: @******************************************************@ .align 2 -se_w122: +se_m_lick: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w122_pri @ Priority - .byte se_w122_rev @ Reverb. + .byte se_m_lick_pri @ Priority + .byte se_m_lick_rev @ Reverb. - .word se_w122_grp + .word se_m_lick_grp - .word se_w122_1 + .word se_m_lick_1 .end diff --git a/sound/songs/se_w199.s b/sound/songs/se_m_lock_on.s index 26ffc82b7..d8e1de5b0 100644 --- a/sound/songs/se_w199.s +++ b/sound/songs/se_m_lock_on.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w199_grp, voicegroup128 - .equ se_w199_pri, 4 - .equ se_w199_rev, reverb_set+50 - .equ se_w199_mvl, 127 - .equ se_w199_key, 0 - .equ se_w199_tbs, 1 - .equ se_w199_exg, 0 - .equ se_w199_cmp, 1 + .equ se_m_lock_on_grp, voicegroup128 + .equ se_m_lock_on_pri, 4 + .equ se_m_lock_on_rev, reverb_set+50 + .equ se_m_lock_on_mvl, 127 + .equ se_m_lock_on_key, 0 + .equ se_m_lock_on_tbs, 1 + .equ se_m_lock_on_exg, 0 + .equ se_m_lock_on_cmp, 1 .section .rodata - .global se_w199 + .global se_m_lock_on .align 2 @********************** Track 1 **********************@ -se_w199_1: - .byte KEYSH , se_w199_key+0 - .byte TEMPO , 150*se_w199_tbs/2 +se_m_lock_on_1: + .byte KEYSH , se_m_lock_on_key+0 + .byte TEMPO , 150*se_m_lock_on_tbs/2 .byte VOICE , 40 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w199_mvl/mxv + .byte VOL , 110*se_m_lock_on_mvl/mxv .byte BEND , c_v+0 .byte N01 , Cn4 , v100 .byte W01 @@ -56,14 +56,14 @@ se_w199_1: @******************************************************@ .align 2 -se_w199: +se_m_lock_on: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w199_pri @ Priority - .byte se_w199_rev @ Reverb. + .byte se_m_lock_on_pri @ Priority + .byte se_m_lock_on_rev @ Reverb. - .word se_w199_grp + .word se_m_lock_on_grp - .word se_w199_1 + .word se_m_lock_on_1 .end diff --git a/sound/songs/se_w118.s b/sound/songs/se_m_metronome.s index 3c4d1404c..ba0a55d8b 100644 --- a/sound/songs/se_w118.s +++ b/sound/songs/se_m_metronome.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w118_grp, voicegroup128 - .equ se_w118_pri, 4 - .equ se_w118_rev, reverb_set+50 - .equ se_w118_mvl, 127 - .equ se_w118_key, 0 - .equ se_w118_tbs, 1 - .equ se_w118_exg, 0 - .equ se_w118_cmp, 1 + .equ se_m_metronome_grp, voicegroup128 + .equ se_m_metronome_pri, 4 + .equ se_m_metronome_rev, reverb_set+50 + .equ se_m_metronome_mvl, 127 + .equ se_m_metronome_key, 0 + .equ se_m_metronome_tbs, 1 + .equ se_m_metronome_exg, 0 + .equ se_m_metronome_cmp, 1 .section .rodata - .global se_w118 + .global se_m_metronome .align 2 @********************** Track 1 **********************@ -se_w118_1: - .byte KEYSH , se_w118_key+0 - .byte TEMPO , 150*se_w118_tbs/2 +se_m_metronome_1: + .byte KEYSH , se_m_metronome_key+0 + .byte TEMPO , 150*se_m_metronome_tbs/2 .byte VOICE , 37 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 115*se_w118_mvl/mxv + .byte VOL , 115*se_m_metronome_mvl/mxv .byte BEND , c_v+0 .byte N15 , En3 , v127 .byte W01 @@ -66,14 +66,14 @@ se_w118_1: @******************************************************@ .align 2 -se_w118: +se_m_metronome: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w118_pri @ Priority - .byte se_w118_rev @ Reverb. + .byte se_m_metronome_pri @ Priority + .byte se_m_metronome_rev @ Reverb. - .word se_w118_grp + .word se_m_metronome_grp - .word se_w118_1 + .word se_m_metronome_1 .end diff --git a/sound/songs/se_w208.s b/sound/songs/se_m_milk_drink.s index b26ce23d7..30a051540 100644 --- a/sound/songs/se_w208.s +++ b/sound/songs/se_m_milk_drink.s @@ -1,42 +1,42 @@ .include "MPlayDef.s" - .equ se_w208_grp, voicegroup128 - .equ se_w208_pri, 4 - .equ se_w208_rev, reverb_set+50 - .equ se_w208_mvl, 127 - .equ se_w208_key, 0 - .equ se_w208_tbs, 1 - .equ se_w208_exg, 0 - .equ se_w208_cmp, 1 + .equ se_m_milk_drink_grp, voicegroup128 + .equ se_m_milk_drink_pri, 4 + .equ se_m_milk_drink_rev, reverb_set+50 + .equ se_m_milk_drink_mvl, 127 + .equ se_m_milk_drink_key, 0 + .equ se_m_milk_drink_tbs, 1 + .equ se_m_milk_drink_exg, 0 + .equ se_m_milk_drink_cmp, 1 .section .rodata - .global se_w208 + .global se_m_milk_drink .align 2 @********************** Track 1 **********************@ -se_w208_1: - .byte KEYSH , se_w208_key+0 - .byte TEMPO , 180*se_w208_tbs/2 +se_m_milk_drink_1: + .byte KEYSH , se_m_milk_drink_key+0 + .byte TEMPO , 180*se_m_milk_drink_tbs/2 .byte VOICE , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 100*se_w208_mvl/mxv + .byte VOL , 100*se_m_milk_drink_mvl/mxv .byte BEND , c_v+0 .byte N06 , An6 , v100 .byte W01 .byte BEND , c_v-11 .byte W01 .byte PAN , c_v+5 - .byte VOL , 90*se_w208_mvl/mxv + .byte VOL , 90*se_m_milk_drink_mvl/mxv .byte BEND , c_v-20 .byte W01 .byte PAN , c_v-6 - .byte VOL , 77*se_w208_mvl/mxv + .byte VOL , 77*se_m_milk_drink_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v+0 - .byte VOL , 37*se_w208_mvl/mxv + .byte VOL , 37*se_m_milk_drink_mvl/mxv .byte BEND , c_v-47 .byte W02 .byte N02 , An6 , v056 @@ -44,7 +44,7 @@ se_w208_1: .byte PAN , c_v+5 .byte W01 .byte c_v-6 - .byte VOL , 100*se_w208_mvl/mxv + .byte VOL , 100*se_m_milk_drink_mvl/mxv .byte BEND , c_v+0 .byte N06 , An6 , v100 .byte W01 @@ -52,15 +52,15 @@ se_w208_1: .byte BEND , c_v-11 .byte W01 .byte PAN , c_v-10 - .byte VOL , 90*se_w208_mvl/mxv + .byte VOL , 90*se_m_milk_drink_mvl/mxv .byte BEND , c_v-20 .byte W02 .byte PAN , c_v+1 - .byte VOL , 77*se_w208_mvl/mxv + .byte VOL , 77*se_m_milk_drink_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v+5 - .byte VOL , 37*se_w208_mvl/mxv + .byte VOL , 37*se_m_milk_drink_mvl/mxv .byte BEND , c_v-47 .byte W01 .byte PAN , c_v-6 @@ -69,7 +69,7 @@ se_w208_1: .byte PAN , c_v+8 .byte W01 .byte c_v-10 - .byte VOL , 100*se_w208_mvl/mxv + .byte VOL , 100*se_m_milk_drink_mvl/mxv .byte BEND , c_v+0 .byte N06 , An6 , v072 .byte W02 @@ -77,15 +77,15 @@ se_w208_1: .byte BEND , c_v-11 .byte W01 .byte PAN , c_v+5 - .byte VOL , 90*se_w208_mvl/mxv + .byte VOL , 90*se_m_milk_drink_mvl/mxv .byte BEND , c_v-20 .byte W01 .byte PAN , c_v-6 - .byte VOL , 77*se_w208_mvl/mxv + .byte VOL , 77*se_m_milk_drink_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v+8 - .byte VOL , 37*se_w208_mvl/mxv + .byte VOL , 37*se_m_milk_drink_mvl/mxv .byte BEND , c_v-47 .byte W01 .byte PAN , c_v-10 @@ -95,10 +95,10 @@ se_w208_1: @********************** Track 2 **********************@ -se_w208_2: - .byte KEYSH , se_w208_key+0 +se_m_milk_drink_2: + .byte KEYSH , se_m_milk_drink_key+0 .byte VOICE , 53 - .byte VOL , 100*se_w208_mvl/mxv + .byte VOL , 100*se_m_milk_drink_mvl/mxv .byte W02 .byte N06 , Fs6 , v040 .byte W04 @@ -115,15 +115,15 @@ se_w208_2: @******************************************************@ .align 2 -se_w208: +se_m_milk_drink: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w208_pri @ Priority - .byte se_w208_rev @ Reverb. + .byte se_m_milk_drink_pri @ Priority + .byte se_m_milk_drink_rev @ Reverb. - .word se_w208_grp + .word se_m_milk_drink_grp - .word se_w208_1 - .word se_w208_2 + .word se_m_milk_drink_1 + .word se_m_milk_drink_2 .end diff --git a/sound/songs/se_w107.s b/sound/songs/se_m_minimize.s index da7bc3d39..565450b2b 100644 --- a/sound/songs/se_w107.s +++ b/sound/songs/se_m_minimize.s @@ -1,58 +1,58 @@ .include "MPlayDef.s" - .equ se_w107_grp, voicegroup128 - .equ se_w107_pri, 4 - .equ se_w107_rev, reverb_set+50 - .equ se_w107_mvl, 127 - .equ se_w107_key, 0 - .equ se_w107_tbs, 1 - .equ se_w107_exg, 0 - .equ se_w107_cmp, 1 + .equ se_m_minimize_grp, voicegroup128 + .equ se_m_minimize_pri, 4 + .equ se_m_minimize_rev, reverb_set+50 + .equ se_m_minimize_mvl, 127 + .equ se_m_minimize_key, 0 + .equ se_m_minimize_tbs, 1 + .equ se_m_minimize_exg, 0 + .equ se_m_minimize_cmp, 1 .section .rodata - .global se_w107 + .global se_m_minimize .align 2 @********************** Track 1 **********************@ -se_w107_1: - .byte KEYSH , se_w107_key+0 - .byte TEMPO , 150*se_w107_tbs/2 +se_m_minimize_1: + .byte KEYSH , se_m_minimize_key+0 + .byte TEMPO , 150*se_m_minimize_tbs/2 .byte VOICE , 45 .byte BENDR , 24 .byte PAN , c_v+0 - .byte VOL , 32*se_w107_mvl/mxv + .byte VOL , 32*se_m_minimize_mvl/mxv .byte MOD , 30 .byte BEND , c_v+39 .byte N06 , Dn4 , v127 .byte W01 .byte BEND , c_v+31 .byte W01 - .byte VOL , 49*se_w107_mvl/mxv + .byte VOL , 49*se_m_minimize_mvl/mxv .byte PAN , c_v+5 .byte BEND , c_v+23 .byte W01 .byte c_v+15 .byte W01 - .byte VOL , 61*se_w107_mvl/mxv + .byte VOL , 61*se_m_minimize_mvl/mxv .byte BEND , c_v+8 .byte W02 .byte PAN , c_v+0 .byte BEND , c_v+35 .byte N06 , Cn4 , v116 .byte W01 - .byte VOL , 71*se_w107_mvl/mxv + .byte VOL , 71*se_m_minimize_mvl/mxv .byte BEND , c_v+27 .byte W01 .byte PAN , c_v-4 .byte BEND , c_v+19 .byte W01 - .byte VOL , 81*se_w107_mvl/mxv + .byte VOL , 81*se_m_minimize_mvl/mxv .byte BEND , c_v+12 .byte W01 .byte c_v+5 .byte W02 - .byte VOL , 95*se_w107_mvl/mxv + .byte VOL , 95*se_m_minimize_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+32 .byte N06 , Bn3 , v112 @@ -92,20 +92,20 @@ se_w107_1: .byte W01 .byte c_v-6 .byte W02 - .byte VOL , 82*se_w107_mvl/mxv + .byte VOL , 82*se_m_minimize_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+21 .byte N06 , Fn3 , v100 .byte W01 .byte BEND , c_v+13 .byte W01 - .byte VOL , 71*se_w107_mvl/mxv + .byte VOL , 71*se_m_minimize_mvl/mxv .byte PAN , c_v-8 .byte BEND , c_v+5 .byte W01 .byte c_v-2 .byte W01 - .byte VOL , 61*se_w107_mvl/mxv + .byte VOL , 61*se_m_minimize_mvl/mxv .byte BEND , c_v-10 .byte W02 .byte PAN , c_v+0 @@ -152,14 +152,14 @@ se_w107_1: @******************************************************@ .align 2 -se_w107: +se_m_minimize: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w107_pri @ Priority - .byte se_w107_rev @ Reverb. + .byte se_m_minimize_pri @ Priority + .byte se_m_minimize_rev @ Reverb. - .word se_w107_grp + .word se_m_minimize_grp - .word se_w107_1 + .word se_m_minimize_1 .end diff --git a/sound/songs/se_w054.s b/sound/songs/se_m_mist.s index 712dc3338..f46eb130a 100644 --- a/sound/songs/se_w054.s +++ b/sound/songs/se_m_mist.s @@ -1,48 +1,48 @@ .include "MPlayDef.s" - .equ se_w054_grp, voicegroup128 - .equ se_w054_pri, 4 - .equ se_w054_rev, reverb_set+50 - .equ se_w054_mvl, 127 - .equ se_w054_key, 0 - .equ se_w054_tbs, 1 - .equ se_w054_exg, 0 - .equ se_w054_cmp, 1 + .equ se_m_mist_grp, voicegroup128 + .equ se_m_mist_pri, 4 + .equ se_m_mist_rev, reverb_set+50 + .equ se_m_mist_mvl, 127 + .equ se_m_mist_key, 0 + .equ se_m_mist_tbs, 1 + .equ se_m_mist_exg, 0 + .equ se_m_mist_cmp, 1 .section .rodata - .global se_w054 + .global se_m_mist .align 2 @********************** Track 1 **********************@ -se_w054_1: - .byte KEYSH , se_w054_key+0 - .byte TEMPO , 150*se_w054_tbs/2 +se_m_mist_1: + .byte KEYSH , se_m_mist_key+0 + .byte TEMPO , 150*se_m_mist_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 7*se_w054_mvl/mxv + .byte VOL , 7*se_m_mist_mvl/mxv .byte BEND , c_v+1 .byte N18 , Cn5 , v052 .byte W01 - .byte VOL , 20*se_w054_mvl/mxv + .byte VOL , 20*se_m_mist_mvl/mxv .byte PAN , c_v+16 .byte BEND , c_v-8 .byte W01 - .byte VOL , 41*se_w054_mvl/mxv + .byte VOL , 41*se_m_mist_mvl/mxv .byte PAN , c_v-14 .byte BEND , c_v-16 .byte W01 - .byte VOL , 70*se_w054_mvl/mxv + .byte VOL , 70*se_m_mist_mvl/mxv .byte PAN , c_v+16 .byte BEND , c_v-8 .byte W01 - .byte VOL , 93*se_w054_mvl/mxv + .byte VOL , 93*se_m_mist_mvl/mxv .byte PAN , c_v-14 .byte BEND , c_v+0 .byte W02 .byte PAN , c_v+0 - .byte VOL , 110*se_w054_mvl/mxv + .byte VOL , 110*se_m_mist_mvl/mxv .byte BEND , c_v+8 .byte W01 .byte PAN , c_v+16 @@ -50,30 +50,30 @@ se_w054_1: .byte W01 .byte PAN , c_v-14 .byte W01 - .byte VOL , 98*se_w054_mvl/mxv + .byte VOL , 98*se_m_mist_mvl/mxv .byte PAN , c_v+16 .byte BEND , c_v+10 .byte W01 - .byte VOL , 85*se_w054_mvl/mxv + .byte VOL , 85*se_m_mist_mvl/mxv .byte PAN , c_v-14 .byte BEND , c_v+4 .byte W02 - .byte VOL , 69*se_w054_mvl/mxv + .byte VOL , 69*se_m_mist_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-7 .byte W01 - .byte VOL , 51*se_w054_mvl/mxv + .byte VOL , 51*se_m_mist_mvl/mxv .byte PAN , c_v+16 .byte BEND , c_v-22 .byte W01 .byte PAN , c_v-14 - .byte VOL , 38*se_w054_mvl/mxv + .byte VOL , 38*se_m_mist_mvl/mxv .byte BEND , c_v-28 .byte W01 - .byte VOL , 17*se_w054_mvl/mxv + .byte VOL , 17*se_m_mist_mvl/mxv .byte BEND , c_v-32 .byte W01 - .byte VOL , 4*se_w054_mvl/mxv + .byte VOL , 4*se_m_mist_mvl/mxv .byte BEND , c_v-38 .byte W08 .byte FINE @@ -81,14 +81,14 @@ se_w054_1: @******************************************************@ .align 2 -se_w054: +se_m_mist: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w054_pri @ Priority - .byte se_w054_rev @ Reverb. + .byte se_m_mist_pri @ Priority + .byte se_m_mist_rev @ Reverb. - .word se_w054_grp + .word se_m_mist_grp - .word se_w054_1 + .word se_m_mist_1 .end diff --git a/sound/songs/se_w236.s b/sound/songs/se_m_moonlight.s index c3bb3d90f..bd4410b32 100644 --- a/sound/songs/se_w236.s +++ b/sound/songs/se_m_moonlight.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w236_grp, voicegroup128 - .equ se_w236_pri, 4 - .equ se_w236_rev, reverb_set+50 - .equ se_w236_mvl, 127 - .equ se_w236_key, 0 - .equ se_w236_tbs, 1 - .equ se_w236_exg, 0 - .equ se_w236_cmp, 1 + .equ se_m_moonlight_grp, voicegroup128 + .equ se_m_moonlight_pri, 4 + .equ se_m_moonlight_rev, reverb_set+50 + .equ se_m_moonlight_mvl, 127 + .equ se_m_moonlight_key, 0 + .equ se_m_moonlight_tbs, 1 + .equ se_m_moonlight_exg, 0 + .equ se_m_moonlight_cmp, 1 .section .rodata - .global se_w236 + .global se_m_moonlight .align 2 @********************** Track 1 **********************@ -se_w236_1: - .byte KEYSH , se_w236_key+0 - .byte TEMPO , 150*se_w236_tbs/2 +se_m_moonlight_1: + .byte KEYSH , se_m_moonlight_key+0 + .byte TEMPO , 150*se_m_moonlight_tbs/2 .byte VOICE , 46 - .byte VOL , 100*se_w236_mvl/mxv + .byte VOL , 100*se_m_moonlight_mvl/mxv .byte BENDR , 4 .byte PAN , c_v+0 .byte MOD , 6 @@ -32,7 +32,7 @@ se_w236_1: .byte W01 .byte N20 , Gn6 , v100 .byte W21 -se_w236_1_000: +se_m_moonlight_1_000: .byte N01 , Ds6 , v056 .byte W01 .byte Dn6 @@ -50,7 +50,7 @@ se_w236_1_000: .byte c_v-4 .byte W04 .byte PEND -se_w236_1_001: +se_m_moonlight_1_001: .byte PAN , c_v+0 .byte N01 , Gs5 , v092 .byte W01 @@ -61,7 +61,7 @@ se_w236_1_001: .byte N20 , Cn6 , v100 .byte W21 .byte PEND -se_w236_1_002: +se_m_moonlight_1_002: .byte PAN , c_v+16 .byte N01 , Gs5 , v056 .byte W01 @@ -72,7 +72,7 @@ se_w236_1_002: .byte N20 , Cn6 , v064 .byte W21 .byte PEND -se_w236_1_003: +se_m_moonlight_1_003: .byte PAN , c_v-16 .byte N01 , Gs5 , v040 .byte W01 @@ -83,7 +83,7 @@ se_w236_1_003: .byte N20 , Cn6 .byte W21 .byte PEND -se_w236_1_004: +se_m_moonlight_1_004: .byte PAN , c_v+32 .byte N01 , Gs5 , v020 .byte W01 @@ -105,24 +105,24 @@ se_w236_1_004: .byte N20 , Gn6 , v100 .byte W21 .byte PATT - .word se_w236_1_000 + .word se_m_moonlight_1_000 .byte PATT - .word se_w236_1_001 + .word se_m_moonlight_1_001 .byte PATT - .word se_w236_1_002 + .word se_m_moonlight_1_002 .byte PATT - .word se_w236_1_003 + .word se_m_moonlight_1_003 .byte PATT - .word se_w236_1_004 + .word se_m_moonlight_1_004 .byte FINE @********************** Track 2 **********************@ -se_w236_2: - .byte KEYSH , se_w236_key+0 +se_m_moonlight_2: + .byte KEYSH , se_m_moonlight_key+0 .byte VOICE , 55 .byte PAN , c_v+0 - .byte VOL , 39*se_w236_mvl/mxv + .byte VOL , 39*se_m_moonlight_mvl/mxv .byte BEND , c_v-4 .byte W10 .byte N01 , Ds6 , v112 @@ -135,7 +135,7 @@ se_w236_2: .byte W05 .byte Gn6 , v096 .byte W05 -se_w236_2_000: +se_m_moonlight_2_000: .byte PAN , c_v+50 .byte N04 , Gn6 , v080 .byte W04 @@ -149,7 +149,7 @@ se_w236_2_000: .byte N04 , Gn6 , v032 .byte W10 .byte PEND -se_w236_2_001: +se_m_moonlight_2_001: .byte PAN , c_v+0 .byte W10 .byte N01 , Gs5 , v112 @@ -163,7 +163,7 @@ se_w236_2_001: .byte Cn6 , v096 .byte W05 .byte PEND -se_w236_2_002: +se_m_moonlight_2_002: .byte PAN , c_v+50 .byte N04 , Cn6 , v080 .byte W04 @@ -192,11 +192,11 @@ se_w236_2_002: .byte Gn6 , v096 .byte W05 .byte PATT - .word se_w236_2_000 + .word se_m_moonlight_2_000 .byte PATT - .word se_w236_2_001 + .word se_m_moonlight_2_001 .byte PATT - .word se_w236_2_002 + .word se_m_moonlight_2_002 .byte W24 .byte W24 .byte FINE @@ -204,15 +204,15 @@ se_w236_2_002: @******************************************************@ .align 2 -se_w236: +se_m_moonlight: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w236_pri @ Priority - .byte se_w236_rev @ Reverb. + .byte se_m_moonlight_pri @ Priority + .byte se_m_moonlight_rev @ Reverb. - .word se_w236_grp + .word se_m_moonlight_grp - .word se_w236_1 - .word se_w236_2 + .word se_m_moonlight_1 + .word se_m_moonlight_2 .end diff --git a/sound/songs/se_w234.s b/sound/songs/se_m_morning_sun.s index 4f07ef30a..ac7667246 100644 --- a/sound/songs/se_w234.s +++ b/sound/songs/se_m_morning_sun.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w234_grp, voicegroup128 - .equ se_w234_pri, 5 - .equ se_w234_rev, reverb_set+50 - .equ se_w234_mvl, 127 - .equ se_w234_key, 0 - .equ se_w234_tbs, 1 - .equ se_w234_exg, 0 - .equ se_w234_cmp, 1 + .equ se_m_morning_sun_grp, voicegroup128 + .equ se_m_morning_sun_pri, 5 + .equ se_m_morning_sun_rev, reverb_set+50 + .equ se_m_morning_sun_mvl, 127 + .equ se_m_morning_sun_key, 0 + .equ se_m_morning_sun_tbs, 1 + .equ se_m_morning_sun_exg, 0 + .equ se_m_morning_sun_cmp, 1 .section .rodata - .global se_w234 + .global se_m_morning_sun .align 2 @********************** Track 1 **********************@ -se_w234_1: - .byte KEYSH , se_w234_key+0 - .byte TEMPO , 150*se_w234_tbs/2 +se_m_morning_sun_1: + .byte KEYSH , se_m_morning_sun_key+0 + .byte TEMPO , 150*se_m_morning_sun_tbs/2 .byte VOICE , 46 - .byte VOL , 95*se_w234_mvl/mxv + .byte VOL , 95*se_m_morning_sun_mvl/mxv .byte BENDR , 2 .byte PAN , c_v+0 .byte BEND , c_v+15 @@ -72,11 +72,11 @@ se_w234_1: @********************** Track 2 **********************@ -se_w234_2: - .byte KEYSH , se_w234_key+0 +se_m_morning_sun_2: + .byte KEYSH , se_m_morning_sun_key+0 .byte VOICE , 53 .byte BENDR , 2 - .byte VOL , 43*se_w234_mvl/mxv + .byte VOL , 43*se_m_morning_sun_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+15 .byte N06 , Gs6 , v108 @@ -121,15 +121,15 @@ se_w234_2: @******************************************************@ .align 2 -se_w234: +se_m_morning_sun: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w234_pri @ Priority - .byte se_w234_rev @ Reverb. + .byte se_m_morning_sun_pri @ Priority + .byte se_m_morning_sun_rev @ Reverb. - .word se_w234_grp + .word se_m_morning_sun_grp - .word se_w234_1 - .word se_w234_2 + .word se_m_morning_sun_1 + .word se_m_morning_sun_2 .end diff --git a/sound/songs/se_w171.s b/sound/songs/se_m_nightmare.s index a953faa50..825bfaea2 100644 --- a/sound/songs/se_w171.s +++ b/sound/songs/se_m_nightmare.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w171_grp, voicegroup128 - .equ se_w171_pri, 4 - .equ se_w171_rev, reverb_set+50 - .equ se_w171_mvl, 127 - .equ se_w171_key, 0 - .equ se_w171_tbs, 1 - .equ se_w171_exg, 0 - .equ se_w171_cmp, 1 + .equ se_m_nightmare_grp, voicegroup128 + .equ se_m_nightmare_pri, 4 + .equ se_m_nightmare_rev, reverb_set+50 + .equ se_m_nightmare_mvl, 127 + .equ se_m_nightmare_key, 0 + .equ se_m_nightmare_tbs, 1 + .equ se_m_nightmare_exg, 0 + .equ se_m_nightmare_cmp, 1 .section .rodata - .global se_w171 + .global se_m_nightmare .align 2 @********************** Track 1 **********************@ -se_w171_1: - .byte KEYSH , se_w171_key+0 - .byte TEMPO , 220*se_w171_tbs/2 +se_m_nightmare_1: + .byte KEYSH , se_m_nightmare_key+0 + .byte TEMPO , 220*se_m_nightmare_tbs/2 .byte VOICE , 3 - .byte VOL , 110*se_w171_mvl/mxv + .byte VOL , 110*se_m_nightmare_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -65,12 +65,12 @@ se_w171_1: @********************** Track 2 **********************@ -se_w171_2: - .byte KEYSH , se_w171_key+0 +se_m_nightmare_2: + .byte KEYSH , se_m_nightmare_key+0 .byte VOICE , 20 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 110*se_w171_mvl/mxv + .byte VOL , 110*se_m_nightmare_mvl/mxv .byte PAN , c_v-7 .byte BEND , c_v+55 .byte N03 , Cn2 , v100 @@ -132,15 +132,15 @@ se_w171_2: @******************************************************@ .align 2 -se_w171: +se_m_nightmare: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w171_pri @ Priority - .byte se_w171_rev @ Reverb. + .byte se_m_nightmare_pri @ Priority + .byte se_m_nightmare_rev @ Reverb. - .word se_w171_grp + .word se_m_nightmare_grp - .word se_w171_1 - .word se_w171_2 + .word se_m_nightmare_1 + .word se_m_nightmare_2 .end diff --git a/sound/songs/se_m_perish_song.s b/sound/songs/se_m_perish_song.s new file mode 100644 index 000000000..af30e2457 --- /dev/null +++ b/sound/songs/se_m_perish_song.s @@ -0,0 +1,221 @@ + .include "MPlayDef.s" + + .equ se_m_perish_song_grp, voicegroup128 + .equ se_m_perish_song_pri, 4 + .equ se_m_perish_song_rev, reverb_set+50 + .equ se_m_perish_song_mvl, 127 + .equ se_m_perish_song_key, 0 + .equ se_m_perish_song_tbs, 1 + .equ se_m_perish_song_exg, 0 + .equ se_m_perish_song_cmp, 1 + + .section .rodata + .global se_m_perish_song + .align 2 + +@********************** Track 1 **********************@ + +se_m_perish_song_1: + .byte KEYSH , se_m_perish_song_key+0 + .byte TEMPO , 100*se_m_perish_song_tbs/2 + .byte VOICE , 73 + .byte BENDR , 12 + .byte LFOS , 40 + .byte PAN , c_v+7 + .byte VOL , 25*se_m_perish_song_mvl/mxv + .byte BEND , c_v+0 + .byte W03 + .byte VOL , 29*se_m_perish_song_mvl/mxv + .byte W03 + .byte 33*se_m_perish_song_mvl/mxv + .byte N48 , An3 , v112 + .byte W03 + .byte VOL , 40*se_m_perish_song_mvl/mxv + .byte W01 + .byte PAN , c_v+4 + .byte W02 +se_m_perish_song_1_000: + .byte VOL , 45*se_m_perish_song_mvl/mxv + .byte MOD , 8 + .byte W03 + .byte VOL , 51*se_m_perish_song_mvl/mxv + .byte W03 + .byte PEND +se_m_perish_song_1_001: + .byte VOL , 56*se_m_perish_song_mvl/mxv + .byte PAN , c_v+0 + .byte W03 + .byte VOL , 62*se_m_perish_song_mvl/mxv + .byte W03 + .byte PEND +se_m_perish_song_1_002: + .byte VOL , 72*se_m_perish_song_mvl/mxv + .byte PAN , c_v-4 + .byte W03 + .byte VOL , 81*se_m_perish_song_mvl/mxv + .byte W03 + .byte PEND +se_m_perish_song_1_003: + .byte VOL , 92*se_m_perish_song_mvl/mxv + .byte PAN , c_v-8 + .byte W03 + .byte VOL , 100*se_m_perish_song_mvl/mxv + .byte W03 + .byte PEND + .byte PAN , c_v-4 + .byte W06 + .byte VOL , 82*se_m_perish_song_mvl/mxv + .byte PAN , c_v+0 + .byte W03 + .byte VOL , 52*se_m_perish_song_mvl/mxv + .byte W03 + .byte 25*se_m_perish_song_mvl/mxv + .byte MOD , 0 + .byte PAN , c_v+4 + .byte W03 + .byte VOL , 29*se_m_perish_song_mvl/mxv + .byte W01 + .byte PAN , c_v+7 + .byte W02 + .byte VOL , 33*se_m_perish_song_mvl/mxv + .byte N72 , Gs3 , v112 + .byte W03 + .byte VOL , 40*se_m_perish_song_mvl/mxv + .byte W01 + .byte PAN , c_v+4 + .byte W02 + .byte PATT + .word se_m_perish_song_1_000 + .byte PATT + .word se_m_perish_song_1_001 + .byte PATT + .word se_m_perish_song_1_002 + .byte PATT + .word se_m_perish_song_1_003 + .byte PAN , c_v-4 + .byte W06 + .byte c_v+0 + .byte W06 + .byte c_v+4 + .byte W03 + .byte VOL , 87*se_m_perish_song_mvl/mxv + .byte W03 + .byte 75*se_m_perish_song_mvl/mxv + .byte PAN , c_v+7 + .byte W03 + .byte VOL , 62*se_m_perish_song_mvl/mxv + .byte W03 + .byte 48*se_m_perish_song_mvl/mxv + .byte PAN , c_v+4 + .byte W03 + .byte VOL , 33*se_m_perish_song_mvl/mxv + .byte W03 + .byte 25*se_m_perish_song_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W02 + .byte VOL , 10*se_m_perish_song_mvl/mxv + .byte W03 + .byte W01 + .byte PAN , c_v-4 + .byte W05 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_perish_song_2: + .byte KEYSH , se_m_perish_song_key+0 + .byte VOICE , 73 + .byte VOL , 25*se_m_perish_song_mvl/mxv + .byte PAN , c_v-17 + .byte N48 , Cn4 , v100 + .byte W03 + .byte VOL , 29*se_m_perish_song_mvl/mxv + .byte W03 + .byte 33*se_m_perish_song_mvl/mxv + .byte W03 + .byte 40*se_m_perish_song_mvl/mxv + .byte W03 +se_m_perish_song_2_000: + .byte VOL , 45*se_m_perish_song_mvl/mxv + .byte MOD , 8 + .byte W03 + .byte VOL , 51*se_m_perish_song_mvl/mxv + .byte W03 + .byte PEND + .byte 56*se_m_perish_song_mvl/mxv + .byte W03 + .byte 62*se_m_perish_song_mvl/mxv + .byte W03 + .byte 72*se_m_perish_song_mvl/mxv + .byte W03 + .byte 81*se_m_perish_song_mvl/mxv + .byte W03 + .byte 92*se_m_perish_song_mvl/mxv + .byte W03 + .byte 100*se_m_perish_song_mvl/mxv + .byte W03 + .byte W06 + .byte 82*se_m_perish_song_mvl/mxv + .byte W03 + .byte 52*se_m_perish_song_mvl/mxv + .byte W03 + .byte 25*se_m_perish_song_mvl/mxv + .byte MOD , 0 + .byte N72 , Bn3 , v100 + .byte W03 + .byte VOL , 29*se_m_perish_song_mvl/mxv + .byte W03 + .byte 33*se_m_perish_song_mvl/mxv + .byte W03 + .byte 40*se_m_perish_song_mvl/mxv + .byte W03 + .byte PATT + .word se_m_perish_song_2_000 + .byte VOL , 56*se_m_perish_song_mvl/mxv + .byte W03 + .byte 62*se_m_perish_song_mvl/mxv + .byte W03 + .byte 72*se_m_perish_song_mvl/mxv + .byte W03 + .byte 81*se_m_perish_song_mvl/mxv + .byte W03 + .byte 92*se_m_perish_song_mvl/mxv + .byte W03 + .byte 100*se_m_perish_song_mvl/mxv + .byte W03 + .byte W06 + .byte W06 + .byte W03 + .byte 87*se_m_perish_song_mvl/mxv + .byte W03 + .byte 75*se_m_perish_song_mvl/mxv + .byte W03 + .byte 62*se_m_perish_song_mvl/mxv + .byte W03 + .byte 48*se_m_perish_song_mvl/mxv + .byte W03 + .byte 33*se_m_perish_song_mvl/mxv + .byte W03 + .byte 25*se_m_perish_song_mvl/mxv + .byte W03 + .byte 10*se_m_perish_song_mvl/mxv + .byte W03 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_perish_song: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_perish_song_pri @ Priority + .byte se_m_perish_song_rev @ Reverb. + + .word se_m_perish_song_grp + + .word se_m_perish_song_1 + .word se_m_perish_song_2 + + .end diff --git a/sound/songs/se_w080.s b/sound/songs/se_m_petal_dance.s index 0027a0d65..c8ad2810d 100644 --- a/sound/songs/se_w080.s +++ b/sound/songs/se_m_petal_dance.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w080_grp, voicegroup128 - .equ se_w080_pri, 4 - .equ se_w080_rev, reverb_set+50 - .equ se_w080_mvl, 127 - .equ se_w080_key, 0 - .equ se_w080_tbs, 1 - .equ se_w080_exg, 0 - .equ se_w080_cmp, 1 + .equ se_m_petal_dance_grp, voicegroup128 + .equ se_m_petal_dance_pri, 4 + .equ se_m_petal_dance_rev, reverb_set+50 + .equ se_m_petal_dance_mvl, 127 + .equ se_m_petal_dance_key, 0 + .equ se_m_petal_dance_tbs, 1 + .equ se_m_petal_dance_exg, 0 + .equ se_m_petal_dance_cmp, 1 .section .rodata - .global se_w080 + .global se_m_petal_dance .align 2 @********************** Track 1 **********************@ -se_w080_1: - .byte KEYSH , se_w080_key+0 - .byte TEMPO , 150*se_w080_tbs/2 +se_m_petal_dance_1: + .byte KEYSH , se_m_petal_dance_key+0 + .byte TEMPO , 150*se_m_petal_dance_tbs/2 .byte VOICE , 46 - .byte VOL , 95*se_w080_mvl/mxv + .byte VOL , 95*se_m_petal_dance_mvl/mxv .byte BENDR , 2 .byte PAN , c_v+0 .byte BEND , c_v+15 @@ -112,11 +112,11 @@ se_w080_1: @********************** Track 2 **********************@ -se_w080_2: - .byte KEYSH , se_w080_key+0 +se_m_petal_dance_2: + .byte KEYSH , se_m_petal_dance_key+0 .byte VOICE , 53 .byte BENDR , 2 - .byte VOL , 43*se_w080_mvl/mxv + .byte VOL , 43*se_m_petal_dance_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+15 .byte N06 , En6 , v108 @@ -191,15 +191,15 @@ se_w080_2: @******************************************************@ .align 2 -se_w080: +se_m_petal_dance: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w080_pri @ Priority - .byte se_w080_rev @ Reverb. + .byte se_m_petal_dance_pri @ Priority + .byte se_m_petal_dance_rev @ Reverb. - .word se_w080_grp + .word se_m_petal_dance_grp - .word se_w080_1 - .word se_w080_2 + .word se_m_petal_dance_1 + .word se_m_petal_dance_2 .end diff --git a/sound/songs/se_m_poison_powder.s b/sound/songs/se_m_poison_powder.s new file mode 100644 index 000000000..f48637385 --- /dev/null +++ b/sound/songs/se_m_poison_powder.s @@ -0,0 +1,58 @@ + .include "MPlayDef.s" + + .equ se_m_poison_powder_grp, voicegroup128 + .equ se_m_poison_powder_pri, 4 + .equ se_m_poison_powder_rev, reverb_set+50 + .equ se_m_poison_powder_mvl, 127 + .equ se_m_poison_powder_key, 0 + .equ se_m_poison_powder_tbs, 1 + .equ se_m_poison_powder_exg, 0 + .equ se_m_poison_powder_cmp, 1 + + .section .rodata + .global se_m_poison_powder + .align 2 + +@********************** Track 1 **********************@ + +se_m_poison_powder_1: + .byte KEYSH , se_m_poison_powder_key+0 + .byte TEMPO , 150*se_m_poison_powder_tbs/2 + .byte VOICE , 18 + .byte BENDR , 12 + .byte VOL , 55*se_m_poison_powder_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+1 + .byte N01 , Cn6 , v100 + .byte W01 + .byte VOL , 110*se_m_poison_powder_mvl/mxv + .byte W01 + .byte VOICE , 36 + .byte VOL , 55*se_m_poison_powder_mvl/mxv + .byte N02 , Gn6 , v080 + .byte W01 + .byte VOL , 110*se_m_poison_powder_mvl/mxv + .byte W04 + .byte PAN , c_v+20 + .byte N01 , Gn6 , v024 + .byte W03 + .byte Gn6 , v016 + .byte W02 + .byte PAN , c_v-21 + .byte W12 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_poison_powder: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_poison_powder_pri @ Priority + .byte se_m_poison_powder_rev @ Reverb. + + .word se_m_poison_powder_grp + + .word se_m_poison_powder_1 + + .end diff --git a/sound/songs/se_w060.s b/sound/songs/se_m_psybeam.s index 520720429..c7f68cffd 100644 --- a/sound/songs/se_w060.s +++ b/sound/songs/se_m_psybeam.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w060_grp, voicegroup128 - .equ se_w060_pri, 4 - .equ se_w060_rev, reverb_set+50 - .equ se_w060_mvl, 127 - .equ se_w060_key, 0 - .equ se_w060_tbs, 1 - .equ se_w060_exg, 0 - .equ se_w060_cmp, 1 + .equ se_m_psybeam_grp, voicegroup128 + .equ se_m_psybeam_pri, 4 + .equ se_m_psybeam_rev, reverb_set+50 + .equ se_m_psybeam_mvl, 127 + .equ se_m_psybeam_key, 0 + .equ se_m_psybeam_tbs, 1 + .equ se_m_psybeam_exg, 0 + .equ se_m_psybeam_cmp, 1 .section .rodata - .global se_w060 + .global se_m_psybeam .align 2 @********************** Track 1 **********************@ -se_w060_1: - .byte KEYSH , se_w060_key+0 - .byte TEMPO , 190*se_w060_tbs/2 +se_m_psybeam_1: + .byte KEYSH , se_m_psybeam_key+0 + .byte TEMPO , 190*se_m_psybeam_tbs/2 .byte VOICE , 45 .byte BENDR , 8 .byte PAN , c_v+0 - .byte VOL , 38*se_w060_mvl/mxv + .byte VOL , 38*se_m_psybeam_mvl/mxv .byte MOD , 30 .byte BEND , c_v+1 .byte N42 , As2 , v120 @@ -29,26 +29,26 @@ se_w060_1: .byte PAN , c_v+3 .byte W01 .byte c_v+5 - .byte VOL , 57*se_w060_mvl/mxv + .byte VOL , 57*se_m_psybeam_mvl/mxv .byte W01 .byte PAN , c_v+9 .byte W01 - .byte VOL , 71*se_w060_mvl/mxv + .byte VOL , 71*se_m_psybeam_mvl/mxv .byte W02 .byte PAN , c_v+5 .byte W01 .byte c_v+1 - .byte VOL , 82*se_w060_mvl/mxv + .byte VOL , 82*se_m_psybeam_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte W01 .byte c_v-3 - .byte VOL , 94*se_w060_mvl/mxv + .byte VOL , 94*se_m_psybeam_mvl/mxv .byte W01 .byte PAN , c_v-6 .byte W02 .byte c_v-10 - .byte VOL , 110*se_w060_mvl/mxv + .byte VOL , 110*se_m_psybeam_mvl/mxv .byte W02 .byte PAN , c_v-6 .byte W01 @@ -66,79 +66,79 @@ se_w060_1: .byte c_v+5 .byte W02 .byte c_v+1 - .byte VOL , 95*se_w060_mvl/mxv + .byte VOL , 95*se_m_psybeam_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte W01 .byte c_v-3 - .byte VOL , 83*se_w060_mvl/mxv + .byte VOL , 83*se_m_psybeam_mvl/mxv .byte W01 .byte PAN , c_v-6 .byte W01 .byte c_v-10 - .byte VOL , 71*se_w060_mvl/mxv + .byte VOL , 71*se_m_psybeam_mvl/mxv .byte W02 .byte W01 .byte PAN , c_v-6 - .byte VOL , 56*se_w060_mvl/mxv + .byte VOL , 56*se_m_psybeam_mvl/mxv .byte W01 .byte PAN , c_v-3 .byte W01 - .byte VOL , 38*se_w060_mvl/mxv + .byte VOL , 38*se_m_psybeam_mvl/mxv .byte W03 .byte PAN , c_v+0 .byte FINE @********************** Track 2 **********************@ -se_w060_2: - .byte KEYSH , se_w060_key+0 +se_m_psybeam_2: + .byte KEYSH , se_m_psybeam_key+0 .byte VOICE , 47 .byte BENDR , 8 .byte PAN , c_v+0 - .byte VOL , 38*se_w060_mvl/mxv + .byte VOL , 38*se_m_psybeam_mvl/mxv .byte MOD , 30 .byte BEND , c_v+1 .byte N42 , As1 , v040 .byte W02 - .byte VOL , 57*se_w060_mvl/mxv + .byte VOL , 57*se_m_psybeam_mvl/mxv .byte W02 - .byte 71*se_w060_mvl/mxv + .byte 71*se_m_psybeam_mvl/mxv .byte W02 .byte W01 - .byte 82*se_w060_mvl/mxv + .byte 82*se_m_psybeam_mvl/mxv .byte W02 - .byte 94*se_w060_mvl/mxv + .byte 94*se_m_psybeam_mvl/mxv .byte W03 - .byte 110*se_w060_mvl/mxv + .byte 110*se_m_psybeam_mvl/mxv .byte W06 .byte W06 .byte W06 - .byte 95*se_w060_mvl/mxv + .byte 95*se_m_psybeam_mvl/mxv .byte W02 - .byte 83*se_w060_mvl/mxv + .byte 83*se_m_psybeam_mvl/mxv .byte W02 - .byte 71*se_w060_mvl/mxv + .byte 71*se_m_psybeam_mvl/mxv .byte W02 .byte W01 - .byte 56*se_w060_mvl/mxv + .byte 56*se_m_psybeam_mvl/mxv .byte W02 - .byte 38*se_w060_mvl/mxv + .byte 38*se_m_psybeam_mvl/mxv .byte W03 .byte FINE @******************************************************@ .align 2 -se_w060: +se_m_psybeam: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w060_pri @ Priority - .byte se_w060_rev @ Reverb. + .byte se_m_psybeam_pri @ Priority + .byte se_m_psybeam_rev @ Reverb. - .word se_w060_grp + .word se_m_psybeam_grp - .word se_w060_1 - .word se_w060_2 + .word se_m_psybeam_1 + .word se_m_psybeam_2 .end diff --git a/sound/songs/se_w060b.s b/sound/songs/se_m_psybeam2.s index 45dc69634..e26a844c9 100644 --- a/sound/songs/se_w060b.s +++ b/sound/songs/se_m_psybeam2.s @@ -1,43 +1,43 @@ .include "MPlayDef.s" - .equ se_w060b_grp, voicegroup128 - .equ se_w060b_pri, 4 - .equ se_w060b_rev, reverb_set+50 - .equ se_w060b_mvl, 127 - .equ se_w060b_key, 0 - .equ se_w060b_tbs, 1 - .equ se_w060b_exg, 0 - .equ se_w060b_cmp, 1 + .equ se_m_psybeam2_grp, voicegroup128 + .equ se_m_psybeam2_pri, 4 + .equ se_m_psybeam2_rev, reverb_set+50 + .equ se_m_psybeam2_mvl, 127 + .equ se_m_psybeam2_key, 0 + .equ se_m_psybeam2_tbs, 1 + .equ se_m_psybeam2_exg, 0 + .equ se_m_psybeam2_cmp, 1 .section .rodata - .global se_w060b + .global se_m_psybeam2 .align 2 @********************** Track 1 **********************@ -se_w060b_1: - .byte KEYSH , se_w060b_key+0 - .byte TEMPO , 190*se_w060b_tbs/2 +se_m_psybeam2_1: + .byte KEYSH , se_m_psybeam2_key+0 + .byte TEMPO , 190*se_m_psybeam2_tbs/2 .byte VOICE , 45 .byte BENDR , 8 - .byte VOL , 36*se_w060b_mvl/mxv + .byte VOL , 36*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-44 .byte N12 , Gs2 , v127 .byte W01 - .byte VOL , 52*se_w060b_mvl/mxv + .byte VOL , 52*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v-20 .byte W01 - .byte VOL , 67*se_w060b_mvl/mxv + .byte VOL , 67*se_m_psybeam2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+17 .byte W01 - .byte VOL , 78*se_w060b_mvl/mxv + .byte VOL , 78*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+27 .byte W01 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+44 .byte W02 @@ -47,42 +47,42 @@ se_w060b_1: .byte PAN , c_v+0 .byte BEND , c_v+44 .byte W01 - .byte VOL , 86*se_w060b_mvl/mxv + .byte VOL , 86*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+28 .byte W01 - .byte VOL , 55*se_w060b_mvl/mxv + .byte VOL , 55*se_m_psybeam2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+17 .byte W01 - .byte VOL , 33*se_w060b_mvl/mxv + .byte VOL , 33*se_m_psybeam2_mvl/mxv .byte BEND , c_v+5 .byte W02 .byte VOICE , 37 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte N02 , Gs3 , v080 .byte W01 .byte BEND , c_v+16 .byte W01 .byte VOICE , 45 - .byte VOL , 36*se_w060b_mvl/mxv + .byte VOL , 36*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-44 .byte N12 , As2 , v127 .byte W01 - .byte VOL , 52*se_w060b_mvl/mxv + .byte VOL , 52*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v-20 .byte W01 - .byte VOL , 67*se_w060b_mvl/mxv + .byte VOL , 67*se_m_psybeam2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+17 .byte W02 - .byte VOL , 78*se_w060b_mvl/mxv + .byte VOL , 78*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+27 .byte W01 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte PAN , c_v+11 .byte BEND , c_v+44 .byte W01 @@ -92,41 +92,41 @@ se_w060b_1: .byte PAN , c_v+0 .byte BEND , c_v+44 .byte W01 - .byte VOL , 86*se_w060b_mvl/mxv + .byte VOL , 86*se_m_psybeam2_mvl/mxv .byte PAN , c_v+11 .byte BEND , c_v+28 .byte W02 - .byte VOL , 55*se_w060b_mvl/mxv + .byte VOL , 55*se_m_psybeam2_mvl/mxv .byte PAN , c_v-11 .byte BEND , c_v+17 .byte W01 - .byte VOL , 33*se_w060b_mvl/mxv + .byte VOL , 33*se_m_psybeam2_mvl/mxv .byte BEND , c_v+5 .byte W01 .byte VOICE , 37 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte N02 , As3 , v056 .byte W01 .byte BEND , c_v+16 .byte W01 .byte VOICE , 45 - .byte VOL , 36*se_w060b_mvl/mxv + .byte VOL , 36*se_m_psybeam2_mvl/mxv .byte BEND , c_v-44 .byte N12 , Gs2 , v080 .byte W02 - .byte VOL , 52*se_w060b_mvl/mxv + .byte VOL , 52*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-20 .byte W01 - .byte VOL , 67*se_w060b_mvl/mxv + .byte VOL , 67*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+17 .byte W01 - .byte VOL , 78*se_w060b_mvl/mxv + .byte VOL , 78*se_m_psybeam2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+27 .byte W01 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+44 .byte W01 @@ -136,42 +136,42 @@ se_w060b_1: .byte PAN , c_v-6 .byte BEND , c_v+44 .byte W01 - .byte VOL , 86*se_w060b_mvl/mxv + .byte VOL , 86*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+28 .byte W01 - .byte VOL , 55*se_w060b_mvl/mxv + .byte VOL , 55*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+17 .byte W01 - .byte VOL , 33*se_w060b_mvl/mxv + .byte VOL , 33*se_m_psybeam2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+5 .byte W01 .byte VOICE , 37 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte N02 , Gs3 , v024 .byte W02 .byte BEND , c_v+16 .byte W01 .byte VOICE , 45 - .byte VOL , 36*se_w060b_mvl/mxv + .byte VOL , 36*se_m_psybeam2_mvl/mxv .byte BEND , c_v-44 .byte N12 , As2 , v040 .byte W01 - .byte VOL , 52*se_w060b_mvl/mxv + .byte VOL , 52*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-20 .byte W01 - .byte VOL , 67*se_w060b_mvl/mxv + .byte VOL , 67*se_m_psybeam2_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v+17 .byte W01 - .byte VOL , 78*se_w060b_mvl/mxv + .byte VOL , 78*se_m_psybeam2_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+27 .byte W02 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+44 .byte W01 @@ -181,19 +181,19 @@ se_w060b_1: .byte PAN , c_v-11 .byte BEND , c_v+44 .byte W01 - .byte VOL , 86*se_w060b_mvl/mxv + .byte VOL , 86*se_m_psybeam2_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+28 .byte W01 - .byte VOL , 55*se_w060b_mvl/mxv + .byte VOL , 55*se_m_psybeam2_mvl/mxv .byte PAN , c_v+11 .byte BEND , c_v+17 .byte W02 - .byte VOL , 33*se_w060b_mvl/mxv + .byte VOL , 33*se_m_psybeam2_mvl/mxv .byte BEND , c_v+5 .byte W01 .byte VOICE , 37 - .byte VOL , 105*se_w060b_mvl/mxv + .byte VOL , 105*se_m_psybeam2_mvl/mxv .byte N02 , As3 , v016 .byte W01 .byte BEND , c_v+16 @@ -203,14 +203,14 @@ se_w060b_1: @******************************************************@ .align 2 -se_w060b: +se_m_psybeam2: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w060b_pri @ Priority - .byte se_w060b_rev @ Reverb. + .byte se_m_psybeam2_pri @ Priority + .byte se_m_psybeam2_rev @ Reverb. - .word se_w060b_grp + .word se_m_psybeam2_grp - .word se_w060b_1 + .word se_m_psybeam2_1 .end diff --git a/sound/songs/se_m_rain_dance.s b/sound/songs/se_m_rain_dance.s new file mode 100644 index 000000000..810be0663 --- /dev/null +++ b/sound/songs/se_m_rain_dance.s @@ -0,0 +1,116 @@ + .include "MPlayDef.s" + + .equ se_m_rain_dance_grp, voicegroup128 + .equ se_m_rain_dance_pri, 4 + .equ se_m_rain_dance_rev, reverb_set+50 + .equ se_m_rain_dance_mvl, 127 + .equ se_m_rain_dance_key, 0 + .equ se_m_rain_dance_tbs, 1 + .equ se_m_rain_dance_exg, 0 + .equ se_m_rain_dance_cmp, 1 + + .section .rodata + .global se_m_rain_dance + .align 2 + +@********************** Track 1 **********************@ + +se_m_rain_dance_1: + .byte KEYSH , se_m_rain_dance_key+0 + .byte TEMPO , 220*se_m_rain_dance_tbs/2 + .byte VOICE , 36 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 20*se_m_rain_dance_mvl/mxv + .byte BEND , c_v+0 + .byte TIE , Gn3 , v064 + .byte W03 + .byte VOL , 37*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 53*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 60*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 71*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 81*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 93*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 110*se_m_rain_dance_mvl/mxv + .byte W03 + .byte PAN , c_v+3 + .byte W06 + .byte c_v+11 + .byte W12 + .byte c_v+20 + .byte W06 + .byte c_v+25 + .byte W12 + .byte c_v+14 + .byte W06 + .byte c_v+8 + .byte W06 + .byte W06 + .byte c_v-3 + .byte W12 + .byte c_v-16 + .byte W06 + .byte W06 + .byte c_v-26 + .byte W12 + .byte c_v-16 + .byte W06 + .byte VOL , 104*se_m_rain_dance_mvl/mxv + .byte PAN , c_v-5 + .byte W03 + .byte VOL , 101*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 98*se_m_rain_dance_mvl/mxv + .byte PAN , c_v+6 + .byte W03 + .byte VOL , 93*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 90*se_m_rain_dance_mvl/mxv + .byte PAN , c_v+14 + .byte W03 + .byte VOL , 86*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 83*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 77*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 73*se_m_rain_dance_mvl/mxv + .byte PAN , c_v+24 + .byte W03 + .byte VOL , 66*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 58*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 44*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 32*se_m_rain_dance_mvl/mxv + .byte PAN , c_v+15 + .byte W03 + .byte VOL , 16*se_m_rain_dance_mvl/mxv + .byte W03 + .byte 1*se_m_rain_dance_mvl/mxv + .byte PAN , c_v+4 + .byte W06 + .byte EOT + .byte FINE + +@******************************************************@ + .align 2 + +se_m_rain_dance: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_rain_dance_pri @ Priority + .byte se_m_rain_dance_rev @ Reverb. + + .word se_m_rain_dance_grp + + .word se_m_rain_dance_1 + + .end diff --git a/sound/songs/se_w115.s b/sound/songs/se_m_reflect.s index 4f9bfb71a..56699c65e 100644 --- a/sound/songs/se_w115.s +++ b/sound/songs/se_m_reflect.s @@ -1,99 +1,99 @@ .include "MPlayDef.s" - .equ se_w115_grp, voicegroup128 - .equ se_w115_pri, 4 - .equ se_w115_rev, reverb_set+50 - .equ se_w115_mvl, 127 - .equ se_w115_key, 0 - .equ se_w115_tbs, 1 - .equ se_w115_exg, 0 - .equ se_w115_cmp, 1 + .equ se_m_reflect_grp, voicegroup128 + .equ se_m_reflect_pri, 4 + .equ se_m_reflect_rev, reverb_set+50 + .equ se_m_reflect_mvl, 127 + .equ se_m_reflect_key, 0 + .equ se_m_reflect_tbs, 1 + .equ se_m_reflect_exg, 0 + .equ se_m_reflect_cmp, 1 .section .rodata - .global se_w115 + .global se_m_reflect .align 2 @********************** Track 1 **********************@ -se_w115_1: - .byte KEYSH , se_w115_key+0 - .byte TEMPO , 150*se_w115_tbs/2 +se_m_reflect_1: + .byte KEYSH , se_m_reflect_key+0 + .byte TEMPO , 150*se_m_reflect_tbs/2 .byte VOICE , 19 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v+6 .byte N06 , Gn6 , v080 .byte W01 .byte BEND , c_v-4 .byte W01 .byte PAN , c_v+5 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-14 .byte W01 .byte PAN , c_v-6 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-31 .byte W01 .byte PAN , c_v+0 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-41 .byte W02 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v+0 .byte N06 , Gn6 , v072 .byte W01 .byte BEND , c_v-11 .byte W01 .byte PAN , c_v+5 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-20 .byte W01 .byte PAN , c_v-6 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v+0 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-47 .byte W02 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v-1 .byte N06 , Gn6 , v068 .byte W01 .byte BEND , c_v-11 .byte W01 .byte PAN , c_v+5 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-21 .byte W01 .byte PAN , c_v-6 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-38 .byte W01 .byte PAN , c_v+0 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-48 .byte W02 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v-1 .byte N06 , Gn6 , v060 .byte W01 .byte BEND , c_v-11 .byte W01 .byte PAN , c_v+5 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-21 .byte W01 .byte PAN , c_v-6 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-38 .byte W01 .byte PAN , c_v+0 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-48 .byte W02 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v-2 .byte N06 , Gn6 , v052 .byte W01 @@ -101,19 +101,19 @@ se_w115_1: .byte BEND , c_v-12 .byte W01 .byte PAN , c_v-6 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-22 .byte W01 .byte PAN , c_v+8 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-39 .byte W01 .byte PAN , c_v-10 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-49 .byte W02 .byte PAN , c_v+0 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v-2 .byte N06 , Gn6 , v048 .byte W01 @@ -121,18 +121,18 @@ se_w115_1: .byte BEND , c_v-12 .byte W01 .byte PAN , c_v-6 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-22 .byte W01 .byte PAN , c_v+8 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-39 .byte W01 .byte PAN , c_v-10 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-49 .byte W02 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v-2 .byte N06 , Gn6 , v040 .byte W01 @@ -140,19 +140,19 @@ se_w115_1: .byte BEND , c_v-13 .byte W01 .byte PAN , c_v-6 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-22 .byte W01 .byte PAN , c_v+8 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-39 .byte W01 .byte PAN , c_v-10 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-49 .byte W02 .byte PAN , c_v+0 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte BEND , c_v-2 .byte N06 , Gn6 , v032 .byte W01 @@ -160,15 +160,15 @@ se_w115_1: .byte BEND , c_v-13 .byte W01 .byte PAN , c_v-6 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte BEND , c_v-22 .byte W01 .byte PAN , c_v+8 - .byte VOL , 60*se_w115_mvl/mxv + .byte VOL , 60*se_m_reflect_mvl/mxv .byte BEND , c_v-39 .byte W01 .byte PAN , c_v-10 - .byte VOL , 20*se_w115_mvl/mxv + .byte VOL , 20*se_m_reflect_mvl/mxv .byte BEND , c_v-49 .byte W02 .byte W06 @@ -176,92 +176,92 @@ se_w115_1: @********************** Track 2 **********************@ -se_w115_2: - .byte KEYSH , se_w115_key+0 +se_m_reflect_2: + .byte KEYSH , se_m_reflect_key+0 .byte VOICE , 53 .byte PAN , c_v+0 - .byte VOL , 90*se_w115_mvl/mxv + .byte VOL , 90*se_m_reflect_mvl/mxv .byte W02 .byte N06 , En6 , v064 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 - .byte 60*se_w115_mvl/mxv + .byte 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W01 - .byte 90*se_w115_mvl/mxv + .byte 90*se_m_reflect_mvl/mxv .byte N06 , En6 , v056 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 -se_w115_2_000: - .byte VOL , 60*se_w115_mvl/mxv +se_m_reflect_2_000: + .byte VOL , 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W01 - .byte 90*se_w115_mvl/mxv + .byte 90*se_m_reflect_mvl/mxv .byte N06 , En6 , v052 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 .byte PEND .byte PATT - .word se_w115_2_000 - .byte VOL , 60*se_w115_mvl/mxv + .word se_m_reflect_2_000 + .byte VOL , 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W01 - .byte 90*se_w115_mvl/mxv + .byte 90*se_m_reflect_mvl/mxv .byte N06 , En6 , v048 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 - .byte 60*se_w115_mvl/mxv + .byte 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W01 - .byte 90*se_w115_mvl/mxv + .byte 90*se_m_reflect_mvl/mxv .byte N06 , En6 , v044 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 - .byte 60*se_w115_mvl/mxv + .byte 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W01 - .byte 90*se_w115_mvl/mxv + .byte 90*se_m_reflect_mvl/mxv .byte N06 , En6 , v040 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 - .byte 60*se_w115_mvl/mxv + .byte 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W01 - .byte 90*se_w115_mvl/mxv + .byte 90*se_m_reflect_mvl/mxv .byte N06 , En6 , v036 .byte W02 - .byte VOL , 74*se_w115_mvl/mxv + .byte VOL , 74*se_m_reflect_mvl/mxv .byte W02 - .byte 60*se_w115_mvl/mxv + .byte 60*se_m_reflect_mvl/mxv .byte W01 - .byte 20*se_w115_mvl/mxv + .byte 20*se_m_reflect_mvl/mxv .byte W05 .byte FINE @******************************************************@ .align 2 -se_w115: +se_m_reflect: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w115_pri @ Priority - .byte se_w115_rev @ Reverb. + .byte se_m_reflect_pri @ Priority + .byte se_m_reflect_rev @ Reverb. - .word se_w115_grp + .word se_m_reflect_grp - .word se_w115_1 - .word se_w115_2 + .word se_m_reflect_1 + .word se_m_reflect_2 .end diff --git a/sound/songs/se_w179.s b/sound/songs/se_m_reversal.s index 9ea055b44..609c399f5 100644 --- a/sound/songs/se_w179.s +++ b/sound/songs/se_m_reversal.s @@ -1,33 +1,33 @@ .include "MPlayDef.s" - .equ se_w179_grp, voicegroup128 - .equ se_w179_pri, 4 - .equ se_w179_rev, reverb_set+50 - .equ se_w179_mvl, 127 - .equ se_w179_key, 0 - .equ se_w179_tbs, 1 - .equ se_w179_exg, 0 - .equ se_w179_cmp, 1 + .equ se_m_reversal_grp, voicegroup128 + .equ se_m_reversal_pri, 4 + .equ se_m_reversal_rev, reverb_set+50 + .equ se_m_reversal_mvl, 127 + .equ se_m_reversal_key, 0 + .equ se_m_reversal_tbs, 1 + .equ se_m_reversal_exg, 0 + .equ se_m_reversal_cmp, 1 .section .rodata - .global se_w179 + .global se_m_reversal .align 2 @********************** Track 1 **********************@ -se_w179_1: - .byte KEYSH , se_w179_key+0 - .byte TEMPO , 150*se_w179_tbs/2 +se_m_reversal_1: + .byte KEYSH , se_m_reversal_key+0 + .byte TEMPO , 150*se_m_reversal_tbs/2 .byte VOICE , 19 .byte BENDR , 24 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v+0 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte N03 , Cn5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -36,14 +36,14 @@ se_w179_1: .byte N01 , Gn4 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-33 .byte N03 , Cs5 , v092 .byte W02 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -52,14 +52,14 @@ se_w179_1: .byte N01 , Gs4 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-33 .byte N03 , Dn5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W02 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -68,14 +68,14 @@ se_w179_1: .byte N01 , An4 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-33 .byte N03 , Ds5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W02 .byte VOICE , 22 @@ -84,14 +84,14 @@ se_w179_1: .byte N01 , As4 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-33 .byte N03 , En5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -100,14 +100,14 @@ se_w179_1: .byte N01 , Bn4 , v127 .byte W02 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-33 .byte N03 , Fn5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -116,14 +116,14 @@ se_w179_1: .byte N01 , Cn5 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-33 .byte N03 , Fs5 , v092 .byte W02 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -132,14 +132,14 @@ se_w179_1: .byte N01 , Cs5 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-33 .byte N03 , Gn5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W02 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -148,14 +148,14 @@ se_w179_1: .byte N01 , Dn5 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-33 .byte N03 , Gs5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W02 .byte VOICE , 22 @@ -164,14 +164,14 @@ se_w179_1: .byte N01 , Ds5 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-33 .byte N03 , An5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -180,14 +180,14 @@ se_w179_1: .byte N01 , En5 , v127 .byte W02 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-33 .byte N03 , As5 , v092 .byte W01 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -196,14 +196,14 @@ se_w179_1: .byte N01 , Fn5 , v127 .byte W01 .byte VOICE , 19 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-33 .byte N03 , Bn5 , v092 .byte W02 - .byte VOL , 72*se_w179_mvl/mxv + .byte VOL , 72*se_m_reversal_mvl/mxv .byte W01 - .byte 40*se_w179_mvl/mxv + .byte 40*se_m_reversal_mvl/mxv .byte BEND , c_v+31 .byte W01 .byte VOICE , 22 @@ -218,10 +218,10 @@ se_w179_1: @********************** Track 2 **********************@ -se_w179_2: - .byte KEYSH , se_w179_key+0 +se_m_reversal_2: + .byte KEYSH , se_m_reversal_key+0 .byte VOICE , 17 - .byte VOL , 100*se_w179_mvl/mxv + .byte VOL , 100*se_m_reversal_mvl/mxv .byte W02 .byte BEND , c_v+31 .byte N03 , Cn5 , v040 @@ -322,15 +322,15 @@ se_w179_2: @******************************************************@ .align 2 -se_w179: +se_m_reversal: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w179_pri @ Priority - .byte se_w179_rev @ Reverb. + .byte se_m_reversal_pri @ Priority + .byte se_m_reversal_rev @ Reverb. - .word se_w179_grp + .word se_m_reversal_grp - .word se_w179_1 - .word se_w179_2 + .word se_m_reversal_1 + .word se_m_reversal_2 .end diff --git a/sound/songs/se_w088.s b/sound/songs/se_m_rock_throw.s index 9eceb812d..71dddd447 100644 --- a/sound/songs/se_w088.s +++ b/sound/songs/se_m_rock_throw.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w088_grp, voicegroup128 - .equ se_w088_pri, 4 - .equ se_w088_rev, reverb_set+50 - .equ se_w088_mvl, 127 - .equ se_w088_key, 0 - .equ se_w088_tbs, 1 - .equ se_w088_exg, 0 - .equ se_w088_cmp, 1 + .equ se_m_rock_throw_grp, voicegroup128 + .equ se_m_rock_throw_pri, 4 + .equ se_m_rock_throw_rev, reverb_set+50 + .equ se_m_rock_throw_mvl, 127 + .equ se_m_rock_throw_key, 0 + .equ se_m_rock_throw_tbs, 1 + .equ se_m_rock_throw_exg, 0 + .equ se_m_rock_throw_cmp, 1 .section .rodata - .global se_w088 + .global se_m_rock_throw .align 2 @********************** Track 1 **********************@ -se_w088_1: - .byte KEYSH , se_w088_key+0 - .byte TEMPO , 150*se_w088_tbs/2 +se_m_rock_throw_1: + .byte KEYSH , se_m_rock_throw_key+0 + .byte TEMPO , 150*se_m_rock_throw_tbs/2 .byte VOICE , 26 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 105*se_w088_mvl/mxv + .byte VOL , 105*se_m_rock_throw_mvl/mxv .byte BEND , c_v+0 .byte N06 , En3 , v127 .byte W03 @@ -52,14 +52,14 @@ se_w088_1: @******************************************************@ .align 2 -se_w088: +se_m_rock_throw: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w088_pri @ Priority - .byte se_w088_rev @ Reverb. + .byte se_m_rock_throw_pri @ Priority + .byte se_m_rock_throw_rev @ Reverb. - .word se_w088_grp + .word se_m_rock_throw_grp - .word se_w088_1 + .word se_m_rock_throw_1 .end diff --git a/sound/songs/se_m_sacred_fire.s b/sound/songs/se_m_sacred_fire.s new file mode 100644 index 000000000..5e6c864e2 --- /dev/null +++ b/sound/songs/se_m_sacred_fire.s @@ -0,0 +1,105 @@ + .include "MPlayDef.s" + + .equ se_m_sacred_fire_grp, voicegroup128 + .equ se_m_sacred_fire_pri, 4 + .equ se_m_sacred_fire_rev, reverb_set+50 + .equ se_m_sacred_fire_mvl, 127 + .equ se_m_sacred_fire_key, 0 + .equ se_m_sacred_fire_tbs, 1 + .equ se_m_sacred_fire_exg, 0 + .equ se_m_sacred_fire_cmp, 1 + + .section .rodata + .global se_m_sacred_fire + .align 2 + +@********************** Track 1 **********************@ + +se_m_sacred_fire_1: + .byte KEYSH , se_m_sacred_fire_key+0 + .byte TEMPO , 150*se_m_sacred_fire_tbs/2 + .byte VOICE , 29 + .byte BENDR , 12 + .byte VOL , 110*se_m_sacred_fire_mvl/mxv + .byte PAN , c_v+5 + .byte BEND , c_v+0 + .byte N04 , Cn3 , v127 + .byte W03 + .byte PAN , c_v+0 + .byte W01 + .byte N18 , Gn4 + .byte W02 + .byte PAN , c_v-5 + .byte W01 + .byte VOL , 98*se_m_sacred_fire_mvl/mxv + .byte BEND , c_v+2 + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 83*se_m_sacred_fire_mvl/mxv + .byte BEND , c_v+6 + .byte W02 + .byte PAN , c_v+5 + .byte W01 + .byte BEND , c_v+9 + .byte W01 + .byte VOL , 63*se_m_sacred_fire_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W01 + .byte BEND , c_v+13 + .byte W02 + .byte VOL , 44*se_m_sacred_fire_mvl/mxv + .byte PAN , c_v-5 + .byte W02 + .byte VOL , 28*se_m_sacred_fire_mvl/mxv + .byte BEND , c_v+20 + .byte W01 + .byte PAN , c_v-2 + .byte W01 + .byte VOL , 12*se_m_sacred_fire_mvl/mxv + .byte W02 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_sacred_fire_2: + .byte KEYSH , se_m_sacred_fire_key+0 + .byte VOICE , 27 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_sacred_fire_mvl/mxv + .byte N01 , Gn2 , v032 + .byte W02 + .byte N01 + .byte W02 + .byte N18 + .byte W03 + .byte VOL , 98*se_m_sacred_fire_mvl/mxv + .byte W03 + .byte 83*se_m_sacred_fire_mvl/mxv + .byte W04 + .byte 63*se_m_sacred_fire_mvl/mxv + .byte W04 + .byte 44*se_m_sacred_fire_mvl/mxv + .byte W02 + .byte 28*se_m_sacred_fire_mvl/mxv + .byte W02 + .byte 12*se_m_sacred_fire_mvl/mxv + .byte W02 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_sacred_fire: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_sacred_fire_pri @ Priority + .byte se_m_sacred_fire_rev @ Reverb. + + .word se_m_sacred_fire_grp + + .word se_m_sacred_fire_1 + .word se_m_sacred_fire_2 + + .end diff --git a/sound/songs/se_m_sacred_fire2.s b/sound/songs/se_m_sacred_fire2.s new file mode 100644 index 000000000..f255e712a --- /dev/null +++ b/sound/songs/se_m_sacred_fire2.s @@ -0,0 +1,180 @@ + .include "MPlayDef.s" + + .equ se_m_sacred_fire2_grp, voicegroup128 + .equ se_m_sacred_fire2_pri, 4 + .equ se_m_sacred_fire2_rev, reverb_set+50 + .equ se_m_sacred_fire2_mvl, 127 + .equ se_m_sacred_fire2_key, 0 + .equ se_m_sacred_fire2_tbs, 1 + .equ se_m_sacred_fire2_exg, 0 + .equ se_m_sacred_fire2_cmp, 1 + + .section .rodata + .global se_m_sacred_fire2 + .align 2 + +@********************** Track 1 **********************@ + +se_m_sacred_fire2_1: + .byte KEYSH , se_m_sacred_fire2_key+0 + .byte TEMPO , 150*se_m_sacred_fire2_tbs/2 + .byte VOICE , 29 + .byte BENDR , 12 + .byte VOL , 22*se_m_sacred_fire2_mvl/mxv + .byte PAN , c_v+5 + .byte BEND , c_v+0 + .byte N96 , Gn3 , v127 + .byte W01 + .byte VOL , 49*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte 71*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte VOL , 95*se_m_sacred_fire2_mvl/mxv + .byte BEND , c_v+8 + .byte W01 + .byte VOL , 110*se_m_sacred_fire2_mvl/mxv + .byte W02 + .byte PAN , c_v-5 + .byte BEND , c_v+16 + .byte W03 + .byte VOL , 97*se_m_sacred_fire2_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+7 + .byte W03 + .byte PAN , c_v+5 + .byte BEND , c_v+0 + .byte W01 + .byte VOL , 84*se_m_sacred_fire2_mvl/mxv + .byte W02 + .byte PAN , c_v+0 + .byte BEND , c_v-9 + .byte W03 + .byte VOL , 76*se_m_sacred_fire2_mvl/mxv + .byte PAN , c_v-5 + .byte BEND , c_v-24 + .byte W03 + .byte PAN , c_v-2 + .byte BEND , c_v-46 + .byte W03 + .byte VOL , 84*se_m_sacred_fire2_mvl/mxv + .byte PAN , c_v+5 + .byte W03 + .byte c_v+0 + .byte W01 + .byte VOL , 92*se_m_sacred_fire2_mvl/mxv + .byte W02 + .byte PAN , c_v-5 + .byte W01 + .byte BEND , c_v-32 + .byte W02 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 86*se_m_sacred_fire2_mvl/mxv + .byte W02 + .byte PAN , c_v+5 + .byte W02 + .byte BEND , c_v-18 + .byte W01 + .byte VOL , 78*se_m_sacred_fire2_mvl/mxv + .byte PAN , c_v+0 + .byte W03 + .byte c_v-5 + .byte W02 + .byte VOL , 71*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte PAN , c_v-2 + .byte W03 + .byte c_v+5 + .byte W03 + .byte c_v+0 + .byte VOL , 78*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte PAN , c_v-5 + .byte W02 + .byte VOL , 86*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W03 + .byte c_v+5 + .byte W02 + .byte VOL , 90*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W03 + .byte c_v-5 + .byte W03 + .byte c_v-2 + .byte W01 + .byte VOL , 80*se_m_sacred_fire2_mvl/mxv + .byte W02 + .byte PAN , c_v+5 + .byte W03 + .byte c_v+0 + .byte W01 + .byte VOL , 86*se_m_sacred_fire2_mvl/mxv + .byte W02 + .byte PAN , c_v-5 + .byte W03 + .byte c_v+0 + .byte VOL , 83*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte PAN , c_v+5 + .byte VOL , 63*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte 37*se_m_sacred_fire2_mvl/mxv + .byte PAN , c_v+0 + .byte W03 + .byte c_v-5 + .byte VOL , 13*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte PAN , c_v-2 + .byte W03 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_sacred_fire2_2: + .byte KEYSH , se_m_sacred_fire2_key+0 + .byte VOICE , 27 + .byte VOL , 22*se_m_sacred_fire2_mvl/mxv + .byte N96 , Gn2 , v032 + .byte W01 + .byte VOL , 49*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte 71*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte 95*se_m_sacred_fire2_mvl/mxv + .byte W01 + .byte 110*se_m_sacred_fire2_mvl/mxv + .byte W05 + .byte 97*se_m_sacred_fire2_mvl/mxv + .byte W15 + .byte W24 + .byte W24 + .byte W09 + .byte 83*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte 63*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte 37*se_m_sacred_fire2_mvl/mxv + .byte W03 + .byte 13*se_m_sacred_fire2_mvl/mxv + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_sacred_fire2: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_sacred_fire2_pri @ Priority + .byte se_m_sacred_fire2_rev @ Reverb. + + .word se_m_sacred_fire2_grp + + .word se_m_sacred_fire2_1 + .word se_m_sacred_fire2_2 + + .end diff --git a/sound/songs/se_w328.s b/sound/songs/se_m_sand_tomb.s index 6b5a2d923..8edf0abf8 100644 --- a/sound/songs/se_w328.s +++ b/sound/songs/se_m_sand_tomb.s @@ -1,45 +1,45 @@ .include "MPlayDef.s" - .equ se_w328_grp, voicegroup128 - .equ se_w328_pri, 4 - .equ se_w328_rev, reverb_set+50 - .equ se_w328_mvl, 127 - .equ se_w328_key, 0 - .equ se_w328_tbs, 1 - .equ se_w328_exg, 0 - .equ se_w328_cmp, 1 + .equ se_m_sand_tomb_grp, voicegroup128 + .equ se_m_sand_tomb_pri, 4 + .equ se_m_sand_tomb_rev, reverb_set+50 + .equ se_m_sand_tomb_mvl, 127 + .equ se_m_sand_tomb_key, 0 + .equ se_m_sand_tomb_tbs, 1 + .equ se_m_sand_tomb_exg, 0 + .equ se_m_sand_tomb_cmp, 1 .section .rodata - .global se_w328 + .global se_m_sand_tomb .align 2 @********************** Track 1 **********************@ -se_w328_1: - .byte KEYSH , se_w328_key+0 - .byte TEMPO , 150*se_w328_tbs/2 +se_m_sand_tomb_1: + .byte KEYSH , se_m_sand_tomb_key+0 + .byte TEMPO , 150*se_m_sand_tomb_tbs/2 .byte VOICE , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 64*se_w328_mvl/mxv + .byte VOL , 64*se_m_sand_tomb_mvl/mxv .byte BEND , c_v+0 .byte N96 , En2 , v127 .byte W03 - .byte VOL , 79*se_w328_mvl/mxv + .byte VOL , 79*se_m_sand_tomb_mvl/mxv .byte BEND , c_v+22 .byte W02 .byte c_v+8 .byte W01 - .byte VOL , 84*se_w328_mvl/mxv + .byte VOL , 84*se_m_sand_tomb_mvl/mxv .byte PAN , c_v-4 .byte W03 - .byte VOL , 91*se_w328_mvl/mxv + .byte VOL , 91*se_m_sand_tomb_mvl/mxv .byte BEND , c_v+0 .byte W03 - .byte VOL , 100*se_w328_mvl/mxv + .byte VOL , 100*se_m_sand_tomb_mvl/mxv .byte PAN , c_v-8 .byte W03 - .byte VOL , 110*se_w328_mvl/mxv + .byte VOL , 110*se_m_sand_tomb_mvl/mxv .byte W03 .byte PAN , c_v-12 .byte W06 @@ -82,46 +82,46 @@ se_w328_1: .byte PAN , c_v-11 .byte W03 .byte c_v-17 - .byte VOL , 98*se_w328_mvl/mxv + .byte VOL , 98*se_m_sand_tomb_mvl/mxv .byte BEND , c_v+0 .byte W03 - .byte VOL , 90*se_w328_mvl/mxv + .byte VOL , 90*se_m_sand_tomb_mvl/mxv .byte BEND , c_v-7 .byte W03 .byte PAN , c_v-9 .byte BEND , c_v-12 .byte W01 - .byte VOL , 80*se_w328_mvl/mxv + .byte VOL , 80*se_m_sand_tomb_mvl/mxv .byte W02 .byte BEND , c_v-20 .byte W01 - .byte VOL , 71*se_w328_mvl/mxv + .byte VOL , 71*se_m_sand_tomb_mvl/mxv .byte W02 .byte PAN , c_v-3 .byte W02 - .byte VOL , 58*se_w328_mvl/mxv + .byte VOL , 58*se_m_sand_tomb_mvl/mxv .byte W01 .byte PAN , c_v+6 .byte BEND , c_v-13 .byte W03 .byte PAN , c_v+10 - .byte VOL , 45*se_w328_mvl/mxv + .byte VOL , 45*se_m_sand_tomb_mvl/mxv .byte W02 - .byte 27*se_w328_mvl/mxv + .byte 27*se_m_sand_tomb_mvl/mxv .byte W01 .byte BEND , c_v-6 .byte W01 - .byte VOL , 11*se_w328_mvl/mxv + .byte VOL , 11*se_m_sand_tomb_mvl/mxv .byte W02 .byte FINE @********************** Track 2 **********************@ -se_w328_2: - .byte KEYSH , se_w328_key+0 +se_m_sand_tomb_2: + .byte KEYSH , se_m_sand_tomb_key+0 .byte VOICE , 57 .byte PAN , c_v+0 - .byte VOL , 110*se_w328_mvl/mxv + .byte VOL , 110*se_m_sand_tomb_mvl/mxv .byte N03 , Cn3 , v100 .byte W03 .byte En3 , v080 @@ -183,15 +183,15 @@ se_w328_2: @******************************************************@ .align 2 -se_w328: +se_m_sand_tomb: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w328_pri @ Priority - .byte se_w328_rev @ Reverb. + .byte se_m_sand_tomb_pri @ Priority + .byte se_m_sand_tomb_rev @ Reverb. - .word se_w328_grp + .word se_m_sand_tomb_grp - .word se_w328_1 - .word se_w328_2 + .word se_m_sand_tomb_1 + .word se_m_sand_tomb_2 .end diff --git a/sound/songs/se_w201.s b/sound/songs/se_m_sandstorm.s index b6a6aaff5..9674cd043 100644 --- a/sound/songs/se_w201.s +++ b/sound/songs/se_m_sandstorm.s @@ -1,58 +1,58 @@ .include "MPlayDef.s" - .equ se_w201_grp, voicegroup128 - .equ se_w201_pri, 4 - .equ se_w201_rev, reverb_set+50 - .equ se_w201_mvl, 127 - .equ se_w201_key, 0 - .equ se_w201_tbs, 1 - .equ se_w201_exg, 0 - .equ se_w201_cmp, 1 + .equ se_m_sandstorm_grp, voicegroup128 + .equ se_m_sandstorm_pri, 4 + .equ se_m_sandstorm_rev, reverb_set+50 + .equ se_m_sandstorm_mvl, 127 + .equ se_m_sandstorm_key, 0 + .equ se_m_sandstorm_tbs, 1 + .equ se_m_sandstorm_exg, 0 + .equ se_m_sandstorm_cmp, 1 .section .rodata - .global se_w201 + .global se_m_sandstorm .align 2 @********************** Track 1 **********************@ -se_w201_1: - .byte KEYSH , se_w201_key+0 - .byte TEMPO , 200*se_w201_tbs/2 +se_m_sandstorm_1: + .byte KEYSH , se_m_sandstorm_key+0 + .byte TEMPO , 200*se_m_sandstorm_tbs/2 .byte VOICE , 2 .byte BENDR , 12 .byte PAN , c_v-48 - .byte VOL , 11*se_w201_mvl/mxv + .byte VOL , 11*se_m_sandstorm_mvl/mxv .byte BEND , c_v+0 .byte TIE , En3 , v127 .byte W03 - .byte VOL , 17*se_w201_mvl/mxv + .byte VOL , 17*se_m_sandstorm_mvl/mxv .byte BEND , c_v+22 .byte W02 .byte c_v+8 .byte W01 - .byte VOL , 24*se_w201_mvl/mxv + .byte VOL , 24*se_m_sandstorm_mvl/mxv .byte W03 - .byte 32*se_w201_mvl/mxv + .byte 32*se_m_sandstorm_mvl/mxv .byte BEND , c_v+0 .byte W03 - .byte VOL , 52*se_w201_mvl/mxv + .byte VOL , 52*se_m_sandstorm_mvl/mxv .byte W03 - .byte 65*se_w201_mvl/mxv + .byte 65*se_m_sandstorm_mvl/mxv .byte W03 - .byte 76*se_w201_mvl/mxv + .byte 76*se_m_sandstorm_mvl/mxv .byte W02 - .byte 88*se_w201_mvl/mxv + .byte 88*se_m_sandstorm_mvl/mxv .byte PAN , c_v-43 .byte W02 - .byte VOL , 98*se_w201_mvl/mxv + .byte VOL , 98*se_m_sandstorm_mvl/mxv .byte W02 .byte BEND , c_v+0 .byte W02 - .byte VOL , 111*se_w201_mvl/mxv + .byte VOL , 111*se_m_sandstorm_mvl/mxv .byte W01 .byte BEND , c_v-7 .byte W01 - .byte VOL , 127*se_w201_mvl/mxv + .byte VOL , 127*se_m_sandstorm_mvl/mxv .byte W02 .byte BEND , c_v-12 .byte W02 @@ -134,31 +134,31 @@ se_w201_1: .byte W03 .byte c_v+7 .byte W04 - .byte VOL , 114*se_w201_mvl/mxv + .byte VOL , 114*se_m_sandstorm_mvl/mxv .byte W02 .byte BEND , c_v+0 .byte W01 .byte PAN , c_v+48 .byte W01 - .byte VOL , 104*se_w201_mvl/mxv + .byte VOL , 104*se_m_sandstorm_mvl/mxv .byte W01 .byte BEND , c_v-7 .byte W03 - .byte VOL , 93*se_w201_mvl/mxv + .byte VOL , 93*se_m_sandstorm_mvl/mxv .byte BEND , c_v-12 .byte W03 - .byte VOL , 82*se_w201_mvl/mxv + .byte VOL , 82*se_m_sandstorm_mvl/mxv .byte BEND , c_v-20 .byte W04 - .byte VOL , 67*se_w201_mvl/mxv + .byte VOL , 67*se_m_sandstorm_mvl/mxv .byte W02 .byte BEND , c_v-13 .byte W01 - .byte VOL , 52*se_w201_mvl/mxv + .byte VOL , 52*se_m_sandstorm_mvl/mxv .byte W03 - .byte 32*se_w201_mvl/mxv + .byte 32*se_m_sandstorm_mvl/mxv .byte W02 - .byte 13*se_w201_mvl/mxv + .byte 13*se_m_sandstorm_mvl/mxv .byte BEND , c_v-6 .byte W03 .byte EOT @@ -166,11 +166,11 @@ se_w201_1: @********************** Track 2 **********************@ -se_w201_2: - .byte KEYSH , se_w201_key+0 +se_m_sandstorm_2: + .byte KEYSH , se_m_sandstorm_key+0 .byte VOICE , 57 .byte PAN , c_v+0 - .byte VOL , 60*se_w201_mvl/mxv + .byte VOL , 60*se_m_sandstorm_mvl/mxv .byte N03 , Cn3 , v100 .byte W03 .byte En3 , v080 @@ -185,7 +185,7 @@ se_w201_2: .byte W03 .byte Cn3 , v100 .byte W03 -se_w201_2_000: +se_m_sandstorm_2_000: .byte W01 .byte N03 , En3 , v080 .byte W03 @@ -230,7 +230,7 @@ se_w201_2_000: .byte Cn3 , v100 .byte W03 .byte PATT - .word se_w201_2_000 + .word se_m_sandstorm_2_000 .byte W02 .byte N03 , Cn3 , v076 .byte W04 @@ -276,15 +276,15 @@ se_w201_2_000: @******************************************************@ .align 2 -se_w201: +se_m_sandstorm: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w201_pri @ Priority - .byte se_w201_rev @ Reverb. + .byte se_m_sandstorm_pri @ Priority + .byte se_m_sandstorm_rev @ Reverb. - .word se_w201_grp + .word se_m_sandstorm_grp - .word se_w201_1 - .word se_w201_2 + .word se_m_sandstorm_1 + .word se_m_sandstorm_2 .end diff --git a/sound/songs/se_w103.s b/sound/songs/se_m_screech.s index d35ec99ad..378cf7128 100644 --- a/sound/songs/se_w103.s +++ b/sound/songs/se_m_screech.s @@ -1,24 +1,24 @@ .include "MPlayDef.s" - .equ se_w103_grp, voicegroup128 - .equ se_w103_pri, 4 - .equ se_w103_rev, reverb_set+50 - .equ se_w103_mvl, 127 - .equ se_w103_key, 0 - .equ se_w103_tbs, 1 - .equ se_w103_exg, 0 - .equ se_w103_cmp, 1 + .equ se_m_screech_grp, voicegroup128 + .equ se_m_screech_pri, 4 + .equ se_m_screech_rev, reverb_set+50 + .equ se_m_screech_mvl, 127 + .equ se_m_screech_key, 0 + .equ se_m_screech_tbs, 1 + .equ se_m_screech_exg, 0 + .equ se_m_screech_cmp, 1 .section .rodata - .global se_w103 + .global se_m_screech .align 2 @********************** Track 1 **********************@ -se_w103_1: - .byte VOL , 110*se_w103_mvl/mxv - .byte KEYSH , se_w103_key+0 - .byte TEMPO , 150*se_w103_tbs/2 +se_m_screech_1: + .byte VOL , 110*se_m_screech_mvl/mxv + .byte KEYSH , se_m_screech_key+0 + .byte TEMPO , 150*se_m_screech_tbs/2 .byte VOICE , 44 .byte BENDR , 2 .byte PAN , c_v+0 @@ -28,27 +28,27 @@ se_w103_1: .byte PAN , c_v-5 .byte W01 .byte c_v-10 - .byte VOL , 15*se_w103_mvl/mxv + .byte VOL , 15*se_m_screech_mvl/mxv .byte W01 .byte PAN , c_v-4 - .byte VOL , 41*se_w103_mvl/mxv + .byte VOL , 41*se_m_screech_mvl/mxv .byte W01 .byte PAN , c_v+0 - .byte VOL , 69*se_w103_mvl/mxv + .byte VOL , 69*se_m_screech_mvl/mxv .byte W02 .byte PAN , c_v+4 .byte W01 .byte c_v+10 - .byte VOL , 84*se_w103_mvl/mxv + .byte VOL , 84*se_m_screech_mvl/mxv .byte W01 .byte PAN , c_v+4 .byte W01 - .byte VOL , 97*se_w103_mvl/mxv + .byte VOL , 97*se_m_screech_mvl/mxv .byte PAN , c_v+0 .byte W01 .byte c_v-5 .byte W02 - .byte VOL , 110*se_w103_mvl/mxv + .byte VOL , 110*se_m_screech_mvl/mxv .byte PAN , c_v-10 .byte W01 .byte c_v-4 @@ -59,13 +59,13 @@ se_w103_1: .byte W01 .byte c_v+10 .byte W02 - .byte VOL , 100*se_w103_mvl/mxv + .byte VOL , 100*se_m_screech_mvl/mxv .byte PAN , c_v+4 .byte W01 - .byte VOL , 84*se_w103_mvl/mxv + .byte VOL , 84*se_m_screech_mvl/mxv .byte PAN , c_v+0 .byte W01 - .byte VOL , 55*se_w103_mvl/mxv + .byte VOL , 55*se_m_screech_mvl/mxv .byte W02 .byte BEND , c_v+0 .byte W02 @@ -73,9 +73,9 @@ se_w103_1: @********************** Track 2 **********************@ -se_w103_2: - .byte VOL , 110*se_w103_mvl/mxv - .byte KEYSH , se_w103_key+0 +se_m_screech_2: + .byte VOL , 110*se_m_screech_mvl/mxv + .byte KEYSH , se_m_screech_key+0 .byte VOICE , 42 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -98,15 +98,15 @@ se_w103_2: @******************************************************@ .align 2 -se_w103: +se_m_screech: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w103_pri @ Priority - .byte se_w103_rev @ Reverb. + .byte se_m_screech_pri @ Priority + .byte se_m_screech_rev @ Reverb. - .word se_w103_grp + .word se_m_screech_grp - .word se_w103_1 - .word se_w103_2 + .word se_m_screech_1 + .word se_m_screech_2 .end diff --git a/sound/songs/se_m_self_destruct.s b/sound/songs/se_m_self_destruct.s new file mode 100644 index 000000000..f2ab617ca --- /dev/null +++ b/sound/songs/se_m_self_destruct.s @@ -0,0 +1,74 @@ + .include "MPlayDef.s" + + .equ se_m_self_destruct_grp, voicegroup128 + .equ se_m_self_destruct_pri, 4 + .equ se_m_self_destruct_rev, reverb_set+50 + .equ se_m_self_destruct_mvl, 127 + .equ se_m_self_destruct_key, 0 + .equ se_m_self_destruct_tbs, 1 + .equ se_m_self_destruct_exg, 0 + .equ se_m_self_destruct_cmp, 1 + + .section .rodata + .global se_m_self_destruct + .align 2 + +@********************** Track 1 **********************@ + +se_m_self_destruct_1: + .byte KEYSH , se_m_self_destruct_key+0 + .byte TEMPO , 150*se_m_self_destruct_tbs/2 + .byte VOICE , 41 + .byte VOL , 115*se_m_self_destruct_mvl/mxv + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte N01 , Gn3 , v127 + .byte W01 + .byte Cn3 + .byte W01 + .byte N24 , An3 + .byte W06 + .byte PAN , c_v+6 + .byte W04 + .byte c_v+0 + .byte W01 + .byte VOL , 102*se_m_self_destruct_mvl/mxv + .byte W02 + .byte PAN , c_v-8 + .byte VOL , 88*se_m_self_destruct_mvl/mxv + .byte W03 + .byte 78*se_m_self_destruct_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte W01 + .byte VOL , 67*se_m_self_destruct_mvl/mxv + .byte W01 + .byte BEND , c_v-2 + .byte W01 + .byte PAN , c_v+7 + .byte VOL , 45*se_m_self_destruct_mvl/mxv + .byte W02 + .byte BEND , c_v-8 + .byte W01 + .byte VOL , 13*se_m_self_destruct_mvl/mxv + .byte W01 + .byte PAN , c_v+0 + .byte BEND , c_v-15 + .byte W22 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_self_destruct: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_self_destruct_pri @ Priority + .byte se_m_self_destruct_rev @ Reverb. + + .word se_m_self_destruct_grp + + .word se_m_self_destruct_1 + + .end diff --git a/sound/songs/se_w047.s b/sound/songs/se_m_sing.s index 688b782ed..f12509f56 100644 --- a/sound/songs/se_w047.s +++ b/sound/songs/se_m_sing.s @@ -1,28 +1,28 @@ .include "MPlayDef.s" - .equ se_w047_grp, voicegroup128 - .equ se_w047_pri, 4 - .equ se_w047_rev, reverb_set+50 - .equ se_w047_mvl, 127 - .equ se_w047_key, 0 - .equ se_w047_tbs, 1 - .equ se_w047_exg, 0 - .equ se_w047_cmp, 1 + .equ se_m_sing_grp, voicegroup128 + .equ se_m_sing_pri, 4 + .equ se_m_sing_rev, reverb_set+50 + .equ se_m_sing_mvl, 127 + .equ se_m_sing_key, 0 + .equ se_m_sing_tbs, 1 + .equ se_m_sing_exg, 0 + .equ se_m_sing_cmp, 1 .section .rodata - .global se_w047 + .global se_m_sing .align 2 @********************** Track 1 **********************@ -se_w047_1: - .byte KEYSH , se_w047_key+0 - .byte TEMPO , 100*se_w047_tbs/2 +se_m_sing_1: + .byte KEYSH , se_m_sing_key+0 + .byte TEMPO , 100*se_m_sing_tbs/2 .byte VOICE , 73 .byte BENDR , 12 .byte LFOS , 40 .byte PAN , c_v+0 - .byte VOL , 95*se_w047_mvl/mxv + .byte VOL , 95*se_m_sing_mvl/mxv .byte BEND , c_v+0 .byte N44 , Gn4 , v112 .byte W06 @@ -31,47 +31,47 @@ se_w047_1: .byte MOD , 7 .byte W03 .byte W03 - .byte VOL , 83*se_w047_mvl/mxv + .byte VOL , 83*se_m_sing_mvl/mxv .byte W03 .byte W03 - .byte 69*se_w047_mvl/mxv + .byte 69*se_m_sing_mvl/mxv .byte W03 .byte W03 - .byte 50*se_w047_mvl/mxv + .byte 50*se_m_sing_mvl/mxv .byte W03 .byte W03 - .byte 24*se_w047_mvl/mxv + .byte 24*se_m_sing_mvl/mxv .byte W03 .byte W03 .byte MOD , 0 .byte W03 - .byte VOL , 95*se_w047_mvl/mxv + .byte VOL , 95*se_m_sing_mvl/mxv .byte N21 , Fn5 .byte W06 .byte W06 -se_w047_1_000: - .byte VOL , 86*se_w047_mvl/mxv +se_m_sing_1_000: + .byte VOL , 86*se_m_sing_mvl/mxv .byte MOD , 7 .byte W03 - .byte VOL , 75*se_w047_mvl/mxv + .byte VOL , 75*se_m_sing_mvl/mxv .byte W03 .byte PEND -se_w047_1_001: - .byte VOL , 55*se_w047_mvl/mxv +se_m_sing_1_001: + .byte VOL , 55*se_m_sing_mvl/mxv .byte W03 - .byte 26*se_w047_mvl/mxv + .byte 26*se_m_sing_mvl/mxv .byte MOD , 0 .byte W03 .byte PEND - .byte VOL , 95*se_w047_mvl/mxv + .byte VOL , 95*se_m_sing_mvl/mxv .byte N21 , Ds5 , v112 .byte W06 .byte W06 .byte PATT - .word se_w047_1_000 + .word se_m_sing_1_000 .byte PATT - .word se_w047_1_001 - .byte VOL , 95*se_w047_mvl/mxv + .word se_m_sing_1_001 + .byte VOL , 95*se_m_sing_mvl/mxv .byte N66 , Gn4 , v112 .byte W06 .byte W06 @@ -81,13 +81,13 @@ se_w047_1_001: .byte W06 .byte W06 .byte W06 - .byte VOL , 83*se_w047_mvl/mxv + .byte VOL , 83*se_m_sing_mvl/mxv .byte W06 - .byte 69*se_w047_mvl/mxv + .byte 69*se_m_sing_mvl/mxv .byte W06 - .byte 50*se_w047_mvl/mxv + .byte 50*se_m_sing_mvl/mxv .byte W06 - .byte 24*se_w047_mvl/mxv + .byte 24*se_m_sing_mvl/mxv .byte W06 .byte MOD , 0 .byte W06 @@ -96,11 +96,11 @@ se_w047_1_001: @********************** Track 2 **********************@ -se_w047_2: - .byte KEYSH , se_w047_key+0 +se_m_sing_2: + .byte KEYSH , se_m_sing_key+0 .byte VOICE , 73 .byte LFOS , 40 - .byte VOL , 95*se_w047_mvl/mxv + .byte VOL , 95*se_m_sing_mvl/mxv .byte BEND , c_v+9 .byte W06 .byte W06 @@ -112,49 +112,49 @@ se_w047_2: .byte MOD , 7 .byte W03 .byte W03 - .byte VOL , 83*se_w047_mvl/mxv + .byte VOL , 83*se_m_sing_mvl/mxv .byte W03 .byte W03 - .byte 69*se_w047_mvl/mxv + .byte 69*se_m_sing_mvl/mxv .byte W03 .byte W03 - .byte 50*se_w047_mvl/mxv + .byte 50*se_m_sing_mvl/mxv .byte W03 .byte W03 - .byte 24*se_w047_mvl/mxv + .byte 24*se_m_sing_mvl/mxv .byte W03 .byte W03 .byte MOD , 0 .byte W03 - .byte VOL , 95*se_w047_mvl/mxv + .byte VOL , 95*se_m_sing_mvl/mxv .byte PAN , c_v-12 .byte N21 , Fn5 .byte W06 .byte W06 -se_w047_2_000: - .byte VOL , 86*se_w047_mvl/mxv +se_m_sing_2_000: + .byte VOL , 86*se_m_sing_mvl/mxv .byte MOD , 7 .byte W03 - .byte VOL , 75*se_w047_mvl/mxv + .byte VOL , 75*se_m_sing_mvl/mxv .byte W03 .byte PEND -se_w047_2_001: - .byte VOL , 55*se_w047_mvl/mxv +se_m_sing_2_001: + .byte VOL , 55*se_m_sing_mvl/mxv .byte W03 - .byte 26*se_w047_mvl/mxv + .byte 26*se_m_sing_mvl/mxv .byte MOD , 0 .byte W03 .byte PEND - .byte VOL , 95*se_w047_mvl/mxv + .byte VOL , 95*se_m_sing_mvl/mxv .byte PAN , c_v+12 .byte N21 , Ds5 , v060 .byte W06 .byte W06 .byte PATT - .word se_w047_2_000 + .word se_m_sing_2_000 .byte PATT - .word se_w047_2_001 - .byte VOL , 95*se_w047_mvl/mxv + .word se_m_sing_2_001 + .byte VOL , 95*se_m_sing_mvl/mxv .byte PAN , c_v-12 .byte N66 , Gn4 , v060 .byte W06 @@ -168,14 +168,14 @@ se_w047_2_001: .byte W06 .byte c_v+7 .byte W06 - .byte VOL , 83*se_w047_mvl/mxv + .byte VOL , 83*se_m_sing_mvl/mxv .byte W06 - .byte 69*se_w047_mvl/mxv + .byte 69*se_m_sing_mvl/mxv .byte PAN , c_v+15 .byte W06 - .byte VOL , 50*se_w047_mvl/mxv + .byte VOL , 50*se_m_sing_mvl/mxv .byte W06 - .byte 24*se_w047_mvl/mxv + .byte 24*se_m_sing_mvl/mxv .byte PAN , c_v+8 .byte W06 .byte MOD , 0 @@ -184,15 +184,15 @@ se_w047_2_001: @******************************************************@ .align 2 -se_w047: +se_m_sing: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w047_pri @ Priority - .byte se_w047_rev @ Reverb. + .byte se_m_sing_pri @ Priority + .byte se_m_sing_rev @ Reverb. - .word se_w047_grp + .word se_m_sing_grp - .word se_w047_1 - .word se_w047_2 + .word se_m_sing_1 + .word se_m_sing_2 .end diff --git a/sound/songs/se_m_sketch.s b/sound/songs/se_m_sketch.s new file mode 100644 index 000000000..3657d2009 --- /dev/null +++ b/sound/songs/se_m_sketch.s @@ -0,0 +1,68 @@ + .include "MPlayDef.s" + + .equ se_m_sketch_grp, voicegroup128 + .equ se_m_sketch_pri, 4 + .equ se_m_sketch_rev, reverb_set+50 + .equ se_m_sketch_mvl, 127 + .equ se_m_sketch_key, 0 + .equ se_m_sketch_tbs, 1 + .equ se_m_sketch_exg, 0 + .equ se_m_sketch_cmp, 1 + + .section .rodata + .global se_m_sketch + .align 2 + +@********************** Track 1 **********************@ + +se_m_sketch_1: + .byte KEYSH , se_m_sketch_key+0 + .byte TEMPO , 180*se_m_sketch_tbs/2 + .byte VOICE , 38 + .byte BENDR , 12 + .byte PAN , c_v+0 + .byte VOL , 110*se_m_sketch_mvl/mxv + .byte BEND , c_v+0 + .byte N02 , Gn4 , v127 + .byte W01 + .byte VOL , 74*se_m_sketch_mvl/mxv + .byte BEND , c_v-11 + .byte W01 + .byte VOICE , 31 + .byte VOL , 40*se_m_sketch_mvl/mxv + .byte BEND , c_v-1 + .byte N03 , Cs5 + .byte W01 + .byte VOL , 64*se_m_sketch_mvl/mxv + .byte PAN , c_v-6 + .byte BEND , c_v-12 + .byte W01 + .byte VOL , 86*se_m_sketch_mvl/mxv + .byte PAN , c_v+4 + .byte BEND , c_v-16 + .byte W02 + .byte VOL , 110*se_m_sketch_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+0 + .byte N02 , As5 + .byte W01 + .byte BEND , c_v+12 + .byte W01 + .byte VOL , 0*se_m_sketch_mvl/mxv + .byte W04 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_sketch: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_sketch_pri @ Priority + .byte se_m_sketch_rev @ Reverb. + + .word se_m_sketch_grp + + .word se_m_sketch_1 + + .end diff --git a/sound/songs/se_m_sky_uppercut.s b/sound/songs/se_m_sky_uppercut.s new file mode 100644 index 000000000..66a791f96 --- /dev/null +++ b/sound/songs/se_m_sky_uppercut.s @@ -0,0 +1,103 @@ + .include "MPlayDef.s" + + .equ se_m_sky_uppercut_grp, voicegroup128 + .equ se_m_sky_uppercut_pri, 4 + .equ se_m_sky_uppercut_rev, reverb_set+50 + .equ se_m_sky_uppercut_mvl, 127 + .equ se_m_sky_uppercut_key, 0 + .equ se_m_sky_uppercut_tbs, 1 + .equ se_m_sky_uppercut_exg, 0 + .equ se_m_sky_uppercut_cmp, 1 + + .section .rodata + .global se_m_sky_uppercut + .align 2 + +@********************** Track 1 **********************@ + +se_m_sky_uppercut_1: + .byte KEYSH , se_m_sky_uppercut_key+0 + .byte TEMPO , 220*se_m_sky_uppercut_tbs/2 + .byte VOICE , 41 + .byte VOL , 110*se_m_sky_uppercut_mvl/mxv + .byte BENDR , 12 + .byte PAN , c_v+6 + .byte BEND , c_v+0 + .byte N02 , Cn4 , v127 + .byte W03 + .byte VOL , 104*se_m_sky_uppercut_mvl/mxv + .byte W03 + .byte 93*se_m_sky_uppercut_mvl/mxv + .byte PAN , c_v-6 + .byte N02 , Cn5 + .byte W03 + .byte VOL , 110*se_m_sky_uppercut_mvl/mxv + .byte W01 + .byte VOICE , 22 + .byte PAN , c_v+0 + .byte N24 , Cn4 , v060 + .byte W02 + .byte W02 + .byte BEND , c_v+0 + .byte W04 + .byte c_v+1 + .byte W03 + .byte c_v+1 + .byte W01 + .byte VOL , 105*se_m_sky_uppercut_mvl/mxv + .byte W02 + .byte BEND , c_v+0 + .byte W01 + .byte VOL , 103*se_m_sky_uppercut_mvl/mxv + .byte W02 + .byte 91*se_m_sky_uppercut_mvl/mxv + .byte BEND , c_v+0 + .byte W03 + .byte VOL , 77*se_m_sky_uppercut_mvl/mxv + .byte BEND , c_v-1 + .byte W02 + .byte VOL , 61*se_m_sky_uppercut_mvl/mxv + .byte BEND , c_v-2 + .byte W01 + .byte VOL , 38*se_m_sky_uppercut_mvl/mxv + .byte W01 + .byte 15*se_m_sky_uppercut_mvl/mxv + .byte BEND , c_v-3 + .byte W02 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_sky_uppercut_2: + .byte KEYSH , se_m_sky_uppercut_key+0 + .byte VOICE , 4 + .byte VOL , 110*se_m_sky_uppercut_mvl/mxv + .byte N02 , Cn3 , v060 + .byte W03 + .byte Gn2 + .byte W03 + .byte Gs4 + .byte W04 + .byte Gs4 , v020 + .byte W02 + .byte W06 + .byte W06 + .byte W06 + .byte W06 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_sky_uppercut: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_sky_uppercut_pri @ Priority + .byte se_m_sky_uppercut_rev @ Reverb. + + .word se_m_sky_uppercut_grp + + .word se_m_sky_uppercut_1 + .word se_m_sky_uppercut_2 + + .end diff --git a/sound/songs/se_w173.s b/sound/songs/se_m_snore.s index a0bbd6378..aff9ef5e3 100644 --- a/sound/songs/se_w173.s +++ b/sound/songs/se_m_snore.s @@ -1,65 +1,65 @@ .include "MPlayDef.s" - .equ se_w173_grp, voicegroup128 - .equ se_w173_pri, 4 - .equ se_w173_rev, reverb_set+50 - .equ se_w173_mvl, 127 - .equ se_w173_key, 0 - .equ se_w173_tbs, 1 - .equ se_w173_exg, 0 - .equ se_w173_cmp, 1 + .equ se_m_snore_grp, voicegroup128 + .equ se_m_snore_pri, 4 + .equ se_m_snore_rev, reverb_set+50 + .equ se_m_snore_mvl, 127 + .equ se_m_snore_key, 0 + .equ se_m_snore_tbs, 1 + .equ se_m_snore_exg, 0 + .equ se_m_snore_cmp, 1 .section .rodata - .global se_w173 + .global se_m_snore .align 2 @********************** Track 1 **********************@ -se_w173_1: - .byte KEYSH , se_w173_key+0 - .byte TEMPO , 220*se_w173_tbs/2 +se_m_snore_1: + .byte KEYSH , se_m_snore_key+0 + .byte TEMPO , 220*se_m_snore_tbs/2 .byte VOICE , 38 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 27*se_w173_mvl/mxv + .byte VOL , 27*se_m_snore_mvl/mxv .byte BEND , c_v+0 .byte N10 , An1 , v127 .byte W01 - .byte VOL , 75*se_w173_mvl/mxv + .byte VOL , 75*se_m_snore_mvl/mxv .byte W01 - .byte 120*se_w173_mvl/mxv + .byte 120*se_m_snore_mvl/mxv .byte W04 .byte W02 - .byte 75*se_w173_mvl/mxv + .byte 75*se_m_snore_mvl/mxv .byte W01 - .byte 28*se_w173_mvl/mxv + .byte 28*se_m_snore_mvl/mxv .byte W03 .byte VOICE , 36 - .byte VOL , 83*se_w173_mvl/mxv + .byte VOL , 83*se_m_snore_mvl/mxv .byte N18 , En2 , v112 .byte W02 - .byte VOL , 87*se_w173_mvl/mxv + .byte VOL , 87*se_m_snore_mvl/mxv .byte W02 - .byte 91*se_w173_mvl/mxv + .byte 91*se_m_snore_mvl/mxv .byte W02 .byte W01 - .byte 97*se_w173_mvl/mxv + .byte 97*se_m_snore_mvl/mxv .byte W02 - .byte 102*se_w173_mvl/mxv + .byte 102*se_m_snore_mvl/mxv .byte W01 - .byte 109*se_w173_mvl/mxv + .byte 109*se_m_snore_mvl/mxv .byte W02 - .byte 113*se_w173_mvl/mxv + .byte 113*se_m_snore_mvl/mxv .byte W01 - .byte 120*se_w173_mvl/mxv + .byte 120*se_m_snore_mvl/mxv .byte W05 .byte FINE @********************** Track 2 **********************@ -se_w173_2: - .byte VOL , 120*se_w173_mvl/mxv - .byte KEYSH , se_w173_key+0 +se_m_snore_2: + .byte VOL , 120*se_m_snore_mvl/mxv + .byte KEYSH , se_m_snore_key+0 .byte VOICE , 27 .byte N01 , En2 , v052 .byte W02 @@ -91,15 +91,15 @@ se_w173_2: @******************************************************@ .align 2 -se_w173: +se_m_snore: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w173_pri @ Priority - .byte se_w173_rev @ Reverb. + .byte se_m_snore_pri @ Priority + .byte se_m_snore_rev @ Reverb. - .word se_w173_grp + .word se_m_snore_grp - .word se_w173_1 - .word se_w173_2 + .word se_m_snore_1 + .word se_m_snore_2 .end diff --git a/sound/songs/se_w076.s b/sound/songs/se_m_solar_beam.s index 82508b774..c260c332a 100644 --- a/sound/songs/se_w076.s +++ b/sound/songs/se_m_solar_beam.s @@ -1,41 +1,41 @@ .include "MPlayDef.s" - .equ se_w076_grp, voicegroup128 - .equ se_w076_pri, 4 - .equ se_w076_rev, reverb_set+50 - .equ se_w076_mvl, 127 - .equ se_w076_key, 0 - .equ se_w076_tbs, 1 - .equ se_w076_exg, 0 - .equ se_w076_cmp, 1 + .equ se_m_solar_beam_grp, voicegroup128 + .equ se_m_solar_beam_pri, 4 + .equ se_m_solar_beam_rev, reverb_set+50 + .equ se_m_solar_beam_mvl, 127 + .equ se_m_solar_beam_key, 0 + .equ se_m_solar_beam_tbs, 1 + .equ se_m_solar_beam_exg, 0 + .equ se_m_solar_beam_cmp, 1 .section .rodata - .global se_w076 + .global se_m_solar_beam .align 2 @********************** Track 1 **********************@ -se_w076_1: - .byte KEYSH , se_w076_key+0 - .byte TEMPO , 150*se_w076_tbs/2 +se_m_solar_beam_1: + .byte KEYSH , se_m_solar_beam_key+0 + .byte TEMPO , 150*se_m_solar_beam_tbs/2 .byte VOICE , 36 .byte BENDR , 24 - .byte VOL , 25*se_w076_mvl/mxv + .byte VOL , 25*se_m_solar_beam_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+63 .byte TIE , Cn4 , v112 .byte W04 - .byte VOL , 40*se_w076_mvl/mxv + .byte VOL , 40*se_m_solar_beam_mvl/mxv .byte W02 .byte PAN , c_v-4 .byte BEND , c_v+52 .byte W03 - .byte VOL , 55*se_w076_mvl/mxv + .byte VOL , 55*se_m_solar_beam_mvl/mxv .byte W03 .byte PAN , c_v-10 .byte BEND , c_v+41 .byte W03 - .byte VOL , 80*se_w076_mvl/mxv + .byte VOL , 80*se_m_solar_beam_mvl/mxv .byte W03 .byte PAN , c_v-5 .byte BEND , c_v+30 @@ -43,7 +43,7 @@ se_w076_1: .byte PAN , c_v+0 .byte BEND , c_v+22 .byte W01 - .byte VOL , 100*se_w076_mvl/mxv + .byte VOL , 100*se_m_solar_beam_mvl/mxv .byte W05 .byte PAN , c_v+4 .byte BEND , c_v+63 @@ -114,36 +114,36 @@ se_w076_1: .byte c_v-10 .byte BEND , c_v-18 .byte W03 - .byte VOL , 89*se_w076_mvl/mxv + .byte VOL , 89*se_m_solar_beam_mvl/mxv .byte W03 .byte PAN , c_v-5 .byte W02 - .byte VOL , 74*se_w076_mvl/mxv + .byte VOL , 74*se_m_solar_beam_mvl/mxv .byte BEND , c_v-25 .byte W04 .byte PAN , c_v+0 .byte W02 - .byte VOL , 62*se_w076_mvl/mxv + .byte VOL , 62*se_m_solar_beam_mvl/mxv .byte W01 .byte BEND , c_v-32 .byte W03 .byte PAN , c_v+4 .byte W01 - .byte VOL , 45*se_w076_mvl/mxv + .byte VOL , 45*se_m_solar_beam_mvl/mxv .byte W01 .byte BEND , c_v-40 .byte W04 - .byte VOL , 28*se_w076_mvl/mxv + .byte VOL , 28*se_m_solar_beam_mvl/mxv .byte PAN , c_v+11 .byte BEND , c_v-49 .byte W03 .byte c_v-64 .byte W01 - .byte VOL , 10*se_w076_mvl/mxv + .byte VOL , 10*se_m_solar_beam_mvl/mxv .byte W02 .byte PAN , c_v+4 .byte W02 - .byte VOL , 5*se_w076_mvl/mxv + .byte VOL , 5*se_m_solar_beam_mvl/mxv .byte W04 .byte EOT .byte FINE @@ -151,14 +151,14 @@ se_w076_1: @******************************************************@ .align 2 -se_w076: +se_m_solar_beam: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w076_pri @ Priority - .byte se_w076_rev @ Reverb. + .byte se_m_solar_beam_pri @ Priority + .byte se_m_solar_beam_rev @ Reverb. - .word se_w076_grp + .word se_m_solar_beam_grp - .word se_w076_1 + .word se_m_solar_beam_1 .end diff --git a/sound/songs/se_w255.s b/sound/songs/se_m_spit_up.s index 73169ec42..5d96c7b86 100644 --- a/sound/songs/se_w255.s +++ b/sound/songs/se_m_spit_up.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_w255_grp, voicegroup128 - .equ se_w255_pri, 4 - .equ se_w255_rev, reverb_set+50 - .equ se_w255_mvl, 127 - .equ se_w255_key, 0 - .equ se_w255_tbs, 1 - .equ se_w255_exg, 0 - .equ se_w255_cmp, 1 + .equ se_m_spit_up_grp, voicegroup128 + .equ se_m_spit_up_pri, 4 + .equ se_m_spit_up_rev, reverb_set+50 + .equ se_m_spit_up_mvl, 127 + .equ se_m_spit_up_key, 0 + .equ se_m_spit_up_tbs, 1 + .equ se_m_spit_up_exg, 0 + .equ se_m_spit_up_cmp, 1 .section .rodata - .global se_w255 + .global se_m_spit_up .align 2 @********************** Track 1 **********************@ -se_w255_1: - .byte KEYSH , se_w255_key+0 - .byte TEMPO , 150*se_w255_tbs/2 +se_m_spit_up_1: + .byte KEYSH , se_m_spit_up_key+0 + .byte TEMPO , 150*se_m_spit_up_tbs/2 .byte VOICE , 65 .byte BENDR , 12 - .byte VOL , 110*se_w255_mvl/mxv + .byte VOL , 110*se_m_spit_up_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N03 , Gn3 , v112 @@ -56,10 +56,10 @@ se_w255_1: @********************** Track 2 **********************@ -se_w255_2: - .byte KEYSH , se_w255_key+0 +se_m_spit_up_2: + .byte KEYSH , se_m_spit_up_key+0 .byte VOICE , 57 - .byte VOL , 110*se_w255_mvl/mxv + .byte VOL , 110*se_m_spit_up_mvl/mxv .byte N03 , En3 , v052 .byte W03 .byte W01 @@ -74,15 +74,15 @@ se_w255_2: @******************************************************@ .align 2 -se_w255: +se_m_spit_up: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w255_pri @ Priority - .byte se_w255_rev @ Reverb. + .byte se_m_spit_up_pri @ Priority + .byte se_m_spit_up_rev @ Reverb. - .word se_w255_grp + .word se_m_spit_up_grp - .word se_w255_1 - .word se_w255_2 + .word se_m_spit_up_1 + .word se_m_spit_up_2 .end diff --git a/sound/songs/se_w287b.s b/sound/songs/se_m_stat_decrease.s index a88a960cb..5cdf8ac36 100644 --- a/sound/songs/se_w287b.s +++ b/sound/songs/se_m_stat_decrease.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w287b_grp, voicegroup128 - .equ se_w287b_pri, 4 - .equ se_w287b_rev, reverb_set+50 - .equ se_w287b_mvl, 127 - .equ se_w287b_key, 0 - .equ se_w287b_tbs, 1 - .equ se_w287b_exg, 0 - .equ se_w287b_cmp, 1 + .equ se_m_stat_decrease_grp, voicegroup128 + .equ se_m_stat_decrease_pri, 4 + .equ se_m_stat_decrease_rev, reverb_set+50 + .equ se_m_stat_decrease_mvl, 127 + .equ se_m_stat_decrease_key, 0 + .equ se_m_stat_decrease_tbs, 1 + .equ se_m_stat_decrease_exg, 0 + .equ se_m_stat_decrease_cmp, 1 .section .rodata - .global se_w287b + .global se_m_stat_decrease .align 2 @********************** Track 1 **********************@ -se_w287b_1: - .byte KEYSH , se_w287b_key+0 - .byte TEMPO , 170*se_w287b_tbs/2 +se_m_stat_decrease_1: + .byte KEYSH , se_m_stat_decrease_key+0 + .byte TEMPO , 170*se_m_stat_decrease_tbs/2 .byte VOICE , 67 - .byte VOL , 70*se_w287b_mvl/mxv + .byte VOL , 70*se_m_stat_decrease_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+42 .byte N02 , Cs6 , v076 @@ -194,12 +194,12 @@ se_w287b_1: @********************** Track 2 **********************@ -se_w287b_2: - .byte KEYSH , se_w287b_key+0 +se_m_stat_decrease_2: + .byte KEYSH , se_m_stat_decrease_key+0 .byte VOICE , 55 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 70*se_w287b_mvl/mxv + .byte VOL , 70*se_m_stat_decrease_mvl/mxv .byte N02 , As3 , v052 .byte W03 .byte N02 @@ -257,15 +257,15 @@ se_w287b_2: @******************************************************@ .align 2 -se_w287b: +se_m_stat_decrease: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w287b_pri @ Priority - .byte se_w287b_rev @ Reverb. + .byte se_m_stat_decrease_pri @ Priority + .byte se_m_stat_decrease_rev @ Reverb. - .word se_w287b_grp + .word se_m_stat_decrease_grp - .word se_w287b_1 - .word se_w287b_2 + .word se_m_stat_decrease_1 + .word se_m_stat_decrease_2 .end diff --git a/sound/songs/se_w287.s b/sound/songs/se_m_stat_increase.s index 5f5cc503d..e9eea563a 100644 --- a/sound/songs/se_w287.s +++ b/sound/songs/se_m_stat_increase.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w287_grp, voicegroup128 - .equ se_w287_pri, 4 - .equ se_w287_rev, reverb_set+50 - .equ se_w287_mvl, 127 - .equ se_w287_key, 0 - .equ se_w287_tbs, 1 - .equ se_w287_exg, 0 - .equ se_w287_cmp, 1 + .equ se_m_stat_increase_grp, voicegroup128 + .equ se_m_stat_increase_pri, 4 + .equ se_m_stat_increase_rev, reverb_set+50 + .equ se_m_stat_increase_mvl, 127 + .equ se_m_stat_increase_key, 0 + .equ se_m_stat_increase_tbs, 1 + .equ se_m_stat_increase_exg, 0 + .equ se_m_stat_increase_cmp, 1 .section .rodata - .global se_w287 + .global se_m_stat_increase .align 2 @********************** Track 1 **********************@ -se_w287_1: - .byte KEYSH , se_w287_key+0 - .byte TEMPO , 170*se_w287_tbs/2 +se_m_stat_increase_1: + .byte KEYSH , se_m_stat_increase_key+0 + .byte TEMPO , 170*se_m_stat_increase_tbs/2 .byte VOICE , 67 - .byte VOL , 70*se_w287_mvl/mxv + .byte VOL , 70*se_m_stat_increase_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N02 , An5 , v076 @@ -206,12 +206,12 @@ se_w287_1: @********************** Track 2 **********************@ -se_w287_2: - .byte KEYSH , se_w287_key+0 +se_m_stat_increase_2: + .byte KEYSH , se_m_stat_increase_key+0 .byte VOICE , 55 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 70*se_w287_mvl/mxv + .byte VOL , 70*se_m_stat_increase_mvl/mxv .byte N02 , Cn3 , v052 .byte W03 .byte N02 @@ -269,15 +269,15 @@ se_w287_2: @******************************************************@ .align 2 -se_w287: +se_m_stat_increase: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w287_pri @ Priority - .byte se_w287_rev @ Reverb. + .byte se_m_stat_increase_pri @ Priority + .byte se_m_stat_increase_rev @ Reverb. - .word se_w287_grp + .word se_m_stat_increase_grp - .word se_w287_1 - .word se_w287_2 + .word se_m_stat_increase_1 + .word se_m_stat_increase_2 .end diff --git a/sound/songs/se_w070.s b/sound/songs/se_m_strength.s index 876bad52b..0fca48906 100644 --- a/sound/songs/se_w070.s +++ b/sound/songs/se_m_strength.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w070_grp, voicegroup128 - .equ se_w070_pri, 4 - .equ se_w070_rev, reverb_set+50 - .equ se_w070_mvl, 127 - .equ se_w070_key, 0 - .equ se_w070_tbs, 1 - .equ se_w070_exg, 0 - .equ se_w070_cmp, 1 + .equ se_m_strength_grp, voicegroup128 + .equ se_m_strength_pri, 4 + .equ se_m_strength_rev, reverb_set+50 + .equ se_m_strength_mvl, 127 + .equ se_m_strength_key, 0 + .equ se_m_strength_tbs, 1 + .equ se_m_strength_exg, 0 + .equ se_m_strength_cmp, 1 .section .rodata - .global se_w070 + .global se_m_strength .align 2 @********************** Track 1 **********************@ -se_w070_1: - .byte KEYSH , se_w070_key+0 - .byte TEMPO , 150*se_w070_tbs/2 +se_m_strength_1: + .byte KEYSH , se_m_strength_key+0 + .byte TEMPO , 150*se_m_strength_tbs/2 .byte VOICE , 26 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w070_mvl/mxv + .byte VOL , 110*se_m_strength_mvl/mxv .byte BEND , c_v+0 .byte N03 , Gn2 , v127 .byte W03 @@ -44,11 +44,11 @@ se_w070_1: @********************** Track 2 **********************@ -se_w070_2: - .byte KEYSH , se_w070_key+0 +se_m_strength_2: + .byte KEYSH , se_m_strength_key+0 .byte VOICE , 5 .byte PAN , c_v+0 - .byte VOL , 110*se_w070_mvl/mxv + .byte VOL , 110*se_m_strength_mvl/mxv .byte N02 , Fn2 , v072 .byte W02 .byte N01 @@ -70,15 +70,15 @@ se_w070_2: @******************************************************@ .align 2 -se_w070: +se_m_strength: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w070_pri @ Priority - .byte se_w070_rev @ Reverb. + .byte se_m_strength_pri @ Priority + .byte se_m_strength_rev @ Reverb. - .word se_w070_grp + .word se_m_strength_grp - .word se_w070_1 - .word se_w070_2 + .word se_m_strength_1 + .word se_m_strength_2 .end diff --git a/sound/songs/se_w081.s b/sound/songs/se_m_string_shot.s index 248f44c6f..d750d26b9 100644 --- a/sound/songs/se_w081.s +++ b/sound/songs/se_m_string_shot.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w081_grp, voicegroup128 - .equ se_w081_pri, 4 - .equ se_w081_rev, reverb_set+50 - .equ se_w081_mvl, 127 - .equ se_w081_key, 0 - .equ se_w081_tbs, 1 - .equ se_w081_exg, 0 - .equ se_w081_cmp, 1 + .equ se_m_string_shot_grp, voicegroup128 + .equ se_m_string_shot_pri, 4 + .equ se_m_string_shot_rev, reverb_set+50 + .equ se_m_string_shot_mvl, 127 + .equ se_m_string_shot_key, 0 + .equ se_m_string_shot_tbs, 1 + .equ se_m_string_shot_exg, 0 + .equ se_m_string_shot_cmp, 1 .section .rodata - .global se_w081 + .global se_m_string_shot .align 2 @********************** Track 1 **********************@ -se_w081_1: - .byte KEYSH , se_w081_key+0 - .byte TEMPO , 250*se_w081_tbs/2 +se_m_string_shot_1: + .byte KEYSH , se_m_string_shot_key+0 + .byte TEMPO , 250*se_m_string_shot_tbs/2 .byte VOICE , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w081_mvl/mxv + .byte VOL , 110*se_m_string_shot_mvl/mxv .byte BEND , c_v+0 .byte N48 , Fn4 , v108 .byte W03 @@ -50,31 +50,31 @@ se_w081_1: .byte PAN , c_v+0 .byte BEND , c_v+0 .byte W06 - .byte VOL , 90*se_w081_mvl/mxv + .byte VOL , 90*se_m_string_shot_mvl/mxv .byte W03 - .byte 71*se_w081_mvl/mxv + .byte 71*se_m_string_shot_mvl/mxv .byte W03 - .byte 58*se_w081_mvl/mxv + .byte 58*se_m_string_shot_mvl/mxv .byte W03 - .byte 41*se_w081_mvl/mxv + .byte 41*se_m_string_shot_mvl/mxv .byte W03 - .byte 27*se_w081_mvl/mxv + .byte 27*se_m_string_shot_mvl/mxv .byte W03 - .byte 7*se_w081_mvl/mxv + .byte 7*se_m_string_shot_mvl/mxv .byte W03 .byte FINE @******************************************************@ .align 2 -se_w081: +se_m_string_shot: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w081_pri @ Priority - .byte se_w081_rev @ Reverb. + .byte se_m_string_shot_pri @ Priority + .byte se_m_string_shot_rev @ Reverb. - .word se_w081_grp + .word se_m_string_shot_grp - .word se_w081_1 + .word se_m_string_shot_1 .end diff --git a/sound/songs/se_w081b.s b/sound/songs/se_m_string_shot2.s index d20162cd3..7bd0a7427 100644 --- a/sound/songs/se_w081b.s +++ b/sound/songs/se_m_string_shot2.s @@ -1,26 +1,26 @@ .include "MPlayDef.s" - .equ se_w081b_grp, voicegroup128 - .equ se_w081b_pri, 4 - .equ se_w081b_rev, reverb_set+50 - .equ se_w081b_mvl, 127 - .equ se_w081b_key, 0 - .equ se_w081b_tbs, 1 - .equ se_w081b_exg, 0 - .equ se_w081b_cmp, 1 + .equ se_m_string_shot2_grp, voicegroup128 + .equ se_m_string_shot2_pri, 4 + .equ se_m_string_shot2_rev, reverb_set+50 + .equ se_m_string_shot2_mvl, 127 + .equ se_m_string_shot2_key, 0 + .equ se_m_string_shot2_tbs, 1 + .equ se_m_string_shot2_exg, 0 + .equ se_m_string_shot2_cmp, 1 .section .rodata - .global se_w081b + .global se_m_string_shot2 .align 2 @********************** Track 1 **********************@ -se_w081b_1: - .byte KEYSH , se_w081b_key+0 - .byte TEMPO , 250*se_w081b_tbs/2 +se_m_string_shot2_1: + .byte KEYSH , se_m_string_shot2_key+0 + .byte TEMPO , 250*se_m_string_shot2_tbs/2 .byte VOICE , 10 .byte BENDR , 12 - .byte VOL , 105*se_w081b_mvl/mxv + .byte VOL , 105*se_m_string_shot2_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v+0 .byte N09 , En4 , v112 @@ -93,17 +93,17 @@ se_w081b_1: @********************** Track 2 **********************@ -se_w081b_2: - .byte KEYSH , se_w081b_key+0 +se_m_string_shot2_2: + .byte KEYSH , se_m_string_shot2_key+0 .byte VOICE , 5 - .byte VOL , 105*se_w081b_mvl/mxv + .byte VOL , 105*se_m_string_shot2_mvl/mxv .byte PAN , c_v+9 .byte N09 , Cn3 , v052 .byte W12 .byte PAN , c_v-7 .byte N09 , Gn2 .byte W12 -se_w081b_2_000: +se_m_string_shot2_2_000: .byte PAN , c_v+9 .byte N09 , Cn3 , v052 .byte W12 @@ -112,23 +112,23 @@ se_w081b_2_000: .byte W12 .byte PEND .byte PATT - .word se_w081b_2_000 + .word se_m_string_shot2_2_000 .byte PATT - .word se_w081b_2_000 + .word se_m_string_shot2_2_000 .byte FINE @******************************************************@ .align 2 -se_w081b: +se_m_string_shot2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w081b_pri @ Priority - .byte se_w081b_rev @ Reverb. + .byte se_m_string_shot2_pri @ Priority + .byte se_m_string_shot2_rev @ Reverb. - .word se_w081b_grp + .word se_m_string_shot2_grp - .word se_w081b_1 - .word se_w081b_2 + .word se_m_string_shot2_1 + .word se_m_string_shot2_2 .end diff --git a/sound/songs/se_w048.s b/sound/songs/se_m_supersonic.s index 8046eae58..f791c9b15 100644 --- a/sound/songs/se_w048.s +++ b/sound/songs/se_m_supersonic.s @@ -1,47 +1,47 @@ .include "MPlayDef.s" - .equ se_w048_grp, voicegroup128 - .equ se_w048_pri, 4 - .equ se_w048_rev, reverb_set+50 - .equ se_w048_mvl, 127 - .equ se_w048_key, 0 - .equ se_w048_tbs, 1 - .equ se_w048_exg, 0 - .equ se_w048_cmp, 1 + .equ se_m_supersonic_grp, voicegroup128 + .equ se_m_supersonic_pri, 4 + .equ se_m_supersonic_rev, reverb_set+50 + .equ se_m_supersonic_mvl, 127 + .equ se_m_supersonic_key, 0 + .equ se_m_supersonic_tbs, 1 + .equ se_m_supersonic_exg, 0 + .equ se_m_supersonic_cmp, 1 .section .rodata - .global se_w048 + .global se_m_supersonic .align 2 @********************** Track 1 **********************@ -se_w048_1: - .byte KEYSH , se_w048_key+0 - .byte TEMPO , 150*se_w048_tbs/2 +se_m_supersonic_1: + .byte KEYSH , se_m_supersonic_key+0 + .byte TEMPO , 150*se_m_supersonic_tbs/2 .byte VOICE , 43 .byte BENDR , 2 .byte PAN , c_v+0 - .byte VOL , 61*se_w048_mvl/mxv + .byte VOL , 61*se_m_supersonic_mvl/mxv .byte BEND , c_v-4 .byte N07 , Gs4 , v127 .byte W01 .byte PAN , c_v+6 - .byte VOL , 75*se_w048_mvl/mxv + .byte VOL , 75*se_m_supersonic_mvl/mxv .byte BEND , c_v-1 .byte W01 .byte PAN , c_v-7 - .byte VOL , 93*se_w048_mvl/mxv + .byte VOL , 93*se_m_supersonic_mvl/mxv .byte BEND , c_v+2 .byte W01 .byte PAN , c_v+9 - .byte VOL , 110*se_w048_mvl/mxv + .byte VOL , 110*se_m_supersonic_mvl/mxv .byte BEND , c_v+4 .byte W01 .byte PAN , c_v-12 .byte BEND , c_v+7 .byte W02 .byte W02 - .byte VOL , 0*se_w048_mvl/mxv + .byte VOL , 0*se_m_supersonic_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-4 .byte N32 @@ -50,68 +50,68 @@ se_w048_1: .byte BEND , c_v-1 .byte W01 .byte PAN , c_v-7 - .byte VOL , 36*se_w048_mvl/mxv + .byte VOL , 36*se_m_supersonic_mvl/mxv .byte BEND , c_v+2 .byte W02 .byte PAN , c_v+9 - .byte VOL , 67*se_w048_mvl/mxv + .byte VOL , 67*se_m_supersonic_mvl/mxv .byte BEND , c_v-1 .byte W01 .byte PAN , c_v-13 - .byte VOL , 84*se_w048_mvl/mxv + .byte VOL , 84*se_m_supersonic_mvl/mxv .byte BEND , c_v-4 .byte W01 .byte PAN , c_v+6 .byte BEND , c_v-6 .byte W01 .byte PAN , c_v-6 - .byte VOL , 92*se_w048_mvl/mxv + .byte VOL , 92*se_m_supersonic_mvl/mxv .byte BEND , c_v-8 .byte W01 .byte PAN , c_v+0 .byte BEND , c_v-7 .byte W02 .byte PAN , c_v+6 - .byte VOL , 99*se_w048_mvl/mxv + .byte VOL , 99*se_m_supersonic_mvl/mxv .byte BEND , c_v-4 .byte W01 .byte PAN , c_v-7 .byte BEND , c_v-1 .byte W01 - .byte VOL , 105*se_w048_mvl/mxv + .byte VOL , 105*se_m_supersonic_mvl/mxv .byte PAN , c_v+9 .byte BEND , c_v+2 .byte W01 - .byte VOL , 110*se_w048_mvl/mxv + .byte VOL , 110*se_m_supersonic_mvl/mxv .byte PAN , c_v-13 .byte BEND , c_v-1 .byte W01 .byte PAN , c_v-1 .byte BEND , c_v-4 .byte W02 - .byte VOL , 46*se_w048_mvl/mxv + .byte VOL , 46*se_m_supersonic_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-1 .byte W01 .byte PAN , c_v+6 .byte BEND , c_v+2 .byte W01 - .byte VOL , 67*se_w048_mvl/mxv + .byte VOL , 67*se_m_supersonic_mvl/mxv .byte PAN , c_v-7 .byte BEND , c_v-1 .byte W01 .byte PAN , c_v+9 .byte BEND , c_v-4 .byte W01 - .byte VOL , 84*se_w048_mvl/mxv + .byte VOL , 84*se_m_supersonic_mvl/mxv .byte PAN , c_v-13 .byte BEND , c_v-6 .byte W02 - .byte VOL , 100*se_w048_mvl/mxv + .byte VOL , 100*se_m_supersonic_mvl/mxv .byte PAN , c_v+6 .byte BEND , c_v-8 .byte W01 - .byte VOL , 110*se_w048_mvl/mxv + .byte VOL , 110*se_m_supersonic_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v-7 .byte W01 @@ -121,26 +121,26 @@ se_w048_1: .byte PAN , c_v+6 .byte BEND , c_v-1 .byte W01 - .byte VOL , 101*se_w048_mvl/mxv + .byte VOL , 101*se_m_supersonic_mvl/mxv .byte PAN , c_v-7 .byte BEND , c_v+2 .byte W02 - .byte VOL , 85*se_w048_mvl/mxv + .byte VOL , 85*se_m_supersonic_mvl/mxv .byte PAN , c_v+9 .byte BEND , c_v-1 .byte W01 - .byte VOL , 75*se_w048_mvl/mxv + .byte VOL , 75*se_m_supersonic_mvl/mxv .byte PAN , c_v-13 .byte BEND , c_v-4 .byte W01 - .byte VOL , 48*se_w048_mvl/mxv + .byte VOL , 48*se_m_supersonic_mvl/mxv .byte PAN , c_v-1 .byte BEND , c_v-6 .byte W01 - .byte VOL , 24*se_w048_mvl/mxv + .byte VOL , 24*se_m_supersonic_mvl/mxv .byte BEND , c_v-8 .byte W01 - .byte VOL , 6*se_w048_mvl/mxv + .byte VOL , 6*se_m_supersonic_mvl/mxv .byte BEND , c_v-7 .byte W02 .byte FINE @@ -148,14 +148,14 @@ se_w048_1: @******************************************************@ .align 2 -se_w048: +se_m_supersonic: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w048_pri @ Priority - .byte se_w048_rev @ Reverb. + .byte se_m_supersonic_pri @ Priority + .byte se_m_supersonic_rev @ Reverb. - .word se_w048_grp + .word se_m_supersonic_grp - .word se_w048_1 + .word se_m_supersonic_1 .end diff --git a/sound/songs/se_w057.s b/sound/songs/se_m_surf.s index 6d74168ce..d3e307782 100644 --- a/sound/songs/se_w057.s +++ b/sound/songs/se_m_surf.s @@ -1,43 +1,43 @@ .include "MPlayDef.s" - .equ se_w057_grp, voicegroup128 - .equ se_w057_pri, 4 - .equ se_w057_rev, reverb_set+50 - .equ se_w057_mvl, 127 - .equ se_w057_key, 0 - .equ se_w057_tbs, 1 - .equ se_w057_exg, 0 - .equ se_w057_cmp, 1 + .equ se_m_surf_grp, voicegroup128 + .equ se_m_surf_pri, 4 + .equ se_m_surf_rev, reverb_set+50 + .equ se_m_surf_mvl, 127 + .equ se_m_surf_key, 0 + .equ se_m_surf_tbs, 1 + .equ se_m_surf_exg, 0 + .equ se_m_surf_cmp, 1 .section .rodata - .global se_w057 + .global se_m_surf .align 2 @********************** Track 1 **********************@ -se_w057_1: - .byte KEYSH , se_w057_key+0 - .byte TEMPO , 150*se_w057_tbs/2 +se_m_surf_1: + .byte KEYSH , se_m_surf_key+0 + .byte TEMPO , 150*se_m_surf_tbs/2 .byte VOICE , 36 .byte BENDR , 12 - .byte VOL , 27*se_w057_mvl/mxv + .byte VOL , 27*se_m_surf_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N96 , Cn3 , v112 .byte W04 - .byte VOL , 45*se_w057_mvl/mxv + .byte VOL , 45*se_m_surf_mvl/mxv .byte W02 .byte PAN , c_v-4 .byte W02 .byte BEND , c_v+4 .byte W01 - .byte VOL , 60*se_w057_mvl/mxv + .byte VOL , 60*se_m_surf_mvl/mxv .byte W03 .byte PAN , c_v-10 .byte W02 .byte BEND , c_v+9 .byte W01 - .byte VOL , 88*se_w057_mvl/mxv + .byte VOL , 88*se_m_surf_mvl/mxv .byte W03 .byte PAN , c_v-5 .byte W02 @@ -45,7 +45,7 @@ se_w057_1: .byte W04 .byte PAN , c_v+0 .byte W01 - .byte VOL , 110*se_w057_mvl/mxv + .byte VOL , 110*se_m_surf_mvl/mxv .byte W02 .byte BEND , c_v+19 .byte W03 @@ -65,29 +65,29 @@ se_w057_1: .byte W04 .byte PAN , c_v-10 .byte W01 - .byte VOL , 98*se_w057_mvl/mxv + .byte VOL , 98*se_m_surf_mvl/mxv .byte W05 - .byte 81*se_w057_mvl/mxv + .byte 81*se_m_surf_mvl/mxv .byte PAN , c_v-5 .byte BEND , c_v+12 .byte W06 - .byte VOL , 68*se_w057_mvl/mxv + .byte VOL , 68*se_m_surf_mvl/mxv .byte PAN , c_v+0 .byte W03 .byte BEND , c_v+17 .byte W01 - .byte VOL , 50*se_w057_mvl/mxv + .byte VOL , 50*se_m_surf_mvl/mxv .byte W02 .byte PAN , c_v+4 .byte W03 - .byte VOL , 31*se_w057_mvl/mxv + .byte VOL , 31*se_m_surf_mvl/mxv .byte W03 .byte PAN , c_v+11 .byte BEND , c_v+22 .byte W02 - .byte VOL , 11*se_w057_mvl/mxv + .byte VOL , 11*se_m_surf_mvl/mxv .byte W04 - .byte 6*se_w057_mvl/mxv + .byte 6*se_m_surf_mvl/mxv .byte PAN , c_v+4 .byte BEND , c_v+30 .byte W06 @@ -96,14 +96,14 @@ se_w057_1: @******************************************************@ .align 2 -se_w057: +se_m_surf: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w057_pri @ Priority - .byte se_w057_rev @ Reverb. + .byte se_m_surf_pri @ Priority + .byte se_m_surf_rev @ Reverb. - .word se_w057_grp + .word se_m_surf_grp - .word se_w057_1 + .word se_m_surf_1 .end diff --git a/sound/songs/se_m_swagger.s b/sound/songs/se_m_swagger.s new file mode 100644 index 000000000..9b4b5756b --- /dev/null +++ b/sound/songs/se_m_swagger.s @@ -0,0 +1,77 @@ + .include "MPlayDef.s" + + .equ se_m_swagger_grp, voicegroup128 + .equ se_m_swagger_pri, 4 + .equ se_m_swagger_rev, reverb_set+50 + .equ se_m_swagger_mvl, 127 + .equ se_m_swagger_key, 0 + .equ se_m_swagger_tbs, 1 + .equ se_m_swagger_exg, 0 + .equ se_m_swagger_cmp, 1 + + .section .rodata + .global se_m_swagger + .align 2 + +@********************** Track 1 **********************@ + +se_m_swagger_1: + .byte KEYSH , se_m_swagger_key+0 + .byte TEMPO , 190*se_m_swagger_tbs/2 + .byte VOICE , 2 + .byte BENDR , 8 + .byte PAN , c_v+0 + .byte VOL , 28*se_m_swagger_mvl/mxv + .byte BEND , c_v+0 + .byte N15 , An1 , v127 + .byte W01 + .byte VOL , 60*se_m_swagger_mvl/mxv + .byte W01 + .byte 111*se_m_swagger_mvl/mxv + .byte W01 + .byte 120*se_m_swagger_mvl/mxv + .byte W01 + .byte BEND , c_v-3 + .byte W02 + .byte PAN , c_v+5 + .byte BEND , c_v-6 + .byte W01 + .byte PAN , c_v-4 + .byte BEND , c_v-8 + .byte W01 + .byte VOL , 109*se_m_swagger_mvl/mxv + .byte PAN , c_v+9 + .byte BEND , c_v-10 + .byte W01 + .byte PAN , c_v-9 + .byte BEND , c_v-14 + .byte W01 + .byte VOL , 95*se_m_swagger_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v-19 + .byte W02 + .byte VOL , 71*se_m_swagger_mvl/mxv + .byte BEND , c_v-29 + .byte W01 + .byte VOL , 41*se_m_swagger_mvl/mxv + .byte BEND , c_v-38 + .byte W01 + .byte VOL , 15*se_m_swagger_mvl/mxv + .byte BEND , c_v-52 + .byte W04 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_swagger: + .byte 1 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_swagger_pri @ Priority + .byte se_m_swagger_rev @ Reverb. + + .word se_m_swagger_grp + + .word se_m_swagger_1 + + .end diff --git a/sound/songs/se_w207b.s b/sound/songs/se_m_swagger2.s index 9d199e8d3..0a0d76767 100644 --- a/sound/songs/se_w207b.s +++ b/sound/songs/se_m_swagger2.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w207b_grp, voicegroup128 - .equ se_w207b_pri, 4 - .equ se_w207b_rev, reverb_set+50 - .equ se_w207b_mvl, 127 - .equ se_w207b_key, 0 - .equ se_w207b_tbs, 1 - .equ se_w207b_exg, 0 - .equ se_w207b_cmp, 1 + .equ se_m_swagger2_grp, voicegroup128 + .equ se_m_swagger2_pri, 4 + .equ se_m_swagger2_rev, reverb_set+50 + .equ se_m_swagger2_mvl, 127 + .equ se_m_swagger2_key, 0 + .equ se_m_swagger2_tbs, 1 + .equ se_m_swagger2_exg, 0 + .equ se_m_swagger2_cmp, 1 .section .rodata - .global se_w207b + .global se_m_swagger2 .align 2 @********************** Track 1 **********************@ -se_w207b_1: - .byte KEYSH , se_w207b_key+0 - .byte TEMPO , 150*se_w207b_tbs/2 +se_m_swagger2_1: + .byte KEYSH , se_m_swagger2_key+0 + .byte TEMPO , 150*se_m_swagger2_tbs/2 .byte VOICE , 56 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 65*se_w207b_mvl/mxv + .byte VOL , 65*se_m_swagger2_mvl/mxv .byte BEND , c_v+8 .byte N01 , Cs6 , v112 .byte W01 @@ -43,14 +43,14 @@ se_w207b_1: @******************************************************@ .align 2 -se_w207b: +se_m_swagger2: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w207b_pri @ Priority - .byte se_w207b_rev @ Reverb. + .byte se_m_swagger2_pri @ Priority + .byte se_m_swagger2_rev @ Reverb. - .word se_w207b_grp + .word se_m_swagger2_grp - .word se_w207b_1 + .word se_m_swagger2_1 .end diff --git a/sound/songs/se_w230.s b/sound/songs/se_m_sweet_scent.s index b446b3448..0abf858d2 100644 --- a/sound/songs/se_w230.s +++ b/sound/songs/se_m_sweet_scent.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w230_grp, voicegroup128 - .equ se_w230_pri, 4 - .equ se_w230_rev, reverb_set+50 - .equ se_w230_mvl, 127 - .equ se_w230_key, 0 - .equ se_w230_tbs, 1 - .equ se_w230_exg, 0 - .equ se_w230_cmp, 1 + .equ se_m_sweet_scent_grp, voicegroup128 + .equ se_m_sweet_scent_pri, 4 + .equ se_m_sweet_scent_rev, reverb_set+50 + .equ se_m_sweet_scent_mvl, 127 + .equ se_m_sweet_scent_key, 0 + .equ se_m_sweet_scent_tbs, 1 + .equ se_m_sweet_scent_exg, 0 + .equ se_m_sweet_scent_cmp, 1 .section .rodata - .global se_w230 + .global se_m_sweet_scent .align 2 @********************** Track 1 **********************@ -se_w230_1: - .byte KEYSH , se_w230_key+0 - .byte TEMPO , 150*se_w230_tbs/2 +se_m_sweet_scent_1: + .byte KEYSH , se_m_sweet_scent_key+0 + .byte TEMPO , 150*se_m_sweet_scent_tbs/2 .byte VOICE , 61 .byte BENDR , 44 .byte PAN , c_v+0 - .byte VOL , 110*se_w230_mvl/mxv + .byte VOL , 110*se_m_sweet_scent_mvl/mxv .byte BEND , c_v+2 .byte N36 , En3 , v096 .byte W12 @@ -61,67 +61,67 @@ se_w230_1: .byte PAN , c_v-4 .byte BEND , c_v+12 .byte W04 - .byte VOL , 103*se_w230_mvl/mxv + .byte VOL , 103*se_m_sweet_scent_mvl/mxv .byte W04 - .byte 97*se_w230_mvl/mxv + .byte 97*se_m_sweet_scent_mvl/mxv .byte W04 .byte PAN , c_v+0 .byte BEND , c_v+12 .byte W01 - .byte VOL , 91*se_w230_mvl/mxv + .byte VOL , 91*se_m_sweet_scent_mvl/mxv .byte W05 - .byte 81*se_w230_mvl/mxv + .byte 81*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 72*se_w230_mvl/mxv + .byte 72*se_m_sweet_scent_mvl/mxv .byte W03 .byte PAN , c_v+6 .byte BEND , c_v+13 .byte W01 - .byte VOL , 62*se_w230_mvl/mxv + .byte VOL , 62*se_m_sweet_scent_mvl/mxv .byte W02 - .byte 51*se_w230_mvl/mxv + .byte 51*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 39*se_w230_mvl/mxv + .byte 39*se_m_sweet_scent_mvl/mxv .byte W02 - .byte 24*se_w230_mvl/mxv + .byte 24*se_m_sweet_scent_mvl/mxv .byte W02 - .byte 12*se_w230_mvl/mxv + .byte 12*se_m_sweet_scent_mvl/mxv .byte W02 .byte FINE @********************** Track 2 **********************@ -se_w230_2: - .byte KEYSH , se_w230_key+0 +se_m_sweet_scent_2: + .byte KEYSH , se_m_sweet_scent_key+0 .byte VOICE , 22 .byte BENDR , 44 .byte PAN , c_v+1 - .byte VOL , 38*se_w230_mvl/mxv + .byte VOL , 38*se_m_sweet_scent_mvl/mxv .byte BEND , c_v+1 .byte TIE , Gn3 , v100 .byte W03 - .byte VOL , 50*se_w230_mvl/mxv + .byte VOL , 50*se_m_sweet_scent_mvl/mxv .byte W04 - .byte 62*se_w230_mvl/mxv + .byte 62*se_m_sweet_scent_mvl/mxv .byte W02 .byte BEND , c_v-1 .byte W01 - .byte VOL , 65*se_w230_mvl/mxv + .byte VOL , 65*se_m_sweet_scent_mvl/mxv .byte W04 - .byte 74*se_w230_mvl/mxv + .byte 74*se_m_sweet_scent_mvl/mxv .byte W04 - .byte 78*se_w230_mvl/mxv + .byte 78*se_m_sweet_scent_mvl/mxv .byte BEND , c_v-2 .byte W03 - .byte VOL , 86*se_w230_mvl/mxv + .byte VOL , 86*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 95*se_w230_mvl/mxv + .byte 95*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 105*se_w230_mvl/mxv + .byte 105*se_m_sweet_scent_mvl/mxv .byte W01 .byte BEND , c_v-4 .byte W03 - .byte VOL , 110*se_w230_mvl/mxv + .byte VOL , 110*se_m_sweet_scent_mvl/mxv .byte W13 .byte BEND , c_v-2 .byte W04 @@ -140,37 +140,37 @@ se_w230_2: .byte W14 .byte c_v+3 .byte W08 - .byte VOL , 105*se_w230_mvl/mxv + .byte VOL , 105*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 101*se_w230_mvl/mxv + .byte 101*se_m_sweet_scent_mvl/mxv .byte W05 - .byte 96*se_w230_mvl/mxv + .byte 96*se_m_sweet_scent_mvl/mxv .byte W04 .byte BEND , c_v+2 .byte W01 - .byte VOL , 91*se_w230_mvl/mxv + .byte VOL , 91*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 86*se_w230_mvl/mxv + .byte 86*se_m_sweet_scent_mvl/mxv .byte W05 - .byte 78*se_w230_mvl/mxv + .byte 78*se_m_sweet_scent_mvl/mxv .byte W03 .byte W02 - .byte 68*se_w230_mvl/mxv + .byte 68*se_m_sweet_scent_mvl/mxv .byte W01 .byte BEND , c_v+1 .byte W04 - .byte VOL , 58*se_w230_mvl/mxv + .byte VOL , 58*se_m_sweet_scent_mvl/mxv .byte W03 - .byte 48*se_w230_mvl/mxv + .byte 48*se_m_sweet_scent_mvl/mxv .byte W04 - .byte 37*se_w230_mvl/mxv + .byte 37*se_m_sweet_scent_mvl/mxv .byte BEND , c_v+0 .byte W04 - .byte VOL , 23*se_w230_mvl/mxv + .byte VOL , 23*se_m_sweet_scent_mvl/mxv .byte W01 .byte BEND , c_v-1 .byte W02 - .byte VOL , 12*se_w230_mvl/mxv + .byte VOL , 12*se_m_sweet_scent_mvl/mxv .byte W03 .byte EOT .byte FINE @@ -178,15 +178,15 @@ se_w230_2: @******************************************************@ .align 2 -se_w230: +se_m_sweet_scent: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w230_pri @ Priority - .byte se_w230_rev @ Reverb. + .byte se_m_sweet_scent_pri @ Priority + .byte se_m_sweet_scent_rev @ Reverb. - .word se_w230_grp + .word se_m_sweet_scent_grp - .word se_w230_1 - .word se_w230_2 + .word se_m_sweet_scent_1 + .word se_m_sweet_scent_2 .end diff --git a/sound/songs/se_w129.s b/sound/songs/se_m_swift.s index 61b101462..10649a80e 100644 --- a/sound/songs/se_w129.s +++ b/sound/songs/se_m_swift.s @@ -1,45 +1,45 @@ .include "MPlayDef.s" - .equ se_w129_grp, voicegroup128 - .equ se_w129_pri, 4 - .equ se_w129_rev, reverb_set+50 - .equ se_w129_mvl, 127 - .equ se_w129_key, 0 - .equ se_w129_tbs, 1 - .equ se_w129_exg, 0 - .equ se_w129_cmp, 1 + .equ se_m_swift_grp, voicegroup128 + .equ se_m_swift_pri, 4 + .equ se_m_swift_rev, reverb_set+50 + .equ se_m_swift_mvl, 127 + .equ se_m_swift_key, 0 + .equ se_m_swift_tbs, 1 + .equ se_m_swift_exg, 0 + .equ se_m_swift_cmp, 1 .section .rodata - .global se_w129 + .global se_m_swift .align 2 @********************** Track 1 **********************@ -se_w129_1: - .byte KEYSH , se_w129_key+0 - .byte TEMPO , 180*se_w129_tbs/2 +se_m_swift_1: + .byte KEYSH , se_m_swift_key+0 + .byte TEMPO , 180*se_m_swift_tbs/2 .byte VOICE , 16 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 100*se_w129_mvl/mxv + .byte VOL , 100*se_m_swift_mvl/mxv .byte BEND , c_v+0 .byte N06 , Ds6 , v100 .byte W01 .byte BEND , c_v-11 .byte W01 .byte PAN , c_v+5 - .byte VOL , 90*se_w129_mvl/mxv + .byte VOL , 90*se_m_swift_mvl/mxv .byte BEND , c_v-20 .byte W01 .byte PAN , c_v-6 - .byte VOL , 77*se_w129_mvl/mxv + .byte VOL , 77*se_m_swift_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v+0 - .byte VOL , 37*se_w129_mvl/mxv + .byte VOL , 37*se_m_swift_mvl/mxv .byte BEND , c_v-47 .byte W02 - .byte VOL , 100*se_w129_mvl/mxv + .byte VOL , 100*se_m_swift_mvl/mxv .byte BEND , c_v+0 .byte N06 .byte W01 @@ -47,18 +47,18 @@ se_w129_1: .byte BEND , c_v-11 .byte W01 .byte PAN , c_v-6 - .byte VOL , 90*se_w129_mvl/mxv + .byte VOL , 90*se_m_swift_mvl/mxv .byte BEND , c_v-20 .byte W01 .byte PAN , c_v+8 - .byte VOL , 77*se_w129_mvl/mxv + .byte VOL , 77*se_m_swift_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v-10 - .byte VOL , 37*se_w129_mvl/mxv + .byte VOL , 37*se_m_swift_mvl/mxv .byte BEND , c_v-47 .byte W02 - .byte VOL , 100*se_w129_mvl/mxv + .byte VOL , 100*se_m_swift_mvl/mxv .byte BEND , c_v+0 .byte N06 , Ds6 , v056 .byte W01 @@ -66,25 +66,25 @@ se_w129_1: .byte BEND , c_v-11 .byte W01 .byte PAN , c_v-6 - .byte VOL , 90*se_w129_mvl/mxv + .byte VOL , 90*se_m_swift_mvl/mxv .byte BEND , c_v-20 .byte W01 .byte PAN , c_v+8 - .byte VOL , 77*se_w129_mvl/mxv + .byte VOL , 77*se_m_swift_mvl/mxv .byte BEND , c_v-37 .byte W01 .byte PAN , c_v-10 - .byte VOL , 37*se_w129_mvl/mxv + .byte VOL , 37*se_m_swift_mvl/mxv .byte BEND , c_v-47 .byte W02 .byte FINE @********************** Track 2 **********************@ -se_w129_2: - .byte KEYSH , se_w129_key+0 +se_m_swift_2: + .byte KEYSH , se_m_swift_key+0 .byte VOICE , 53 - .byte VOL , 100*se_w129_mvl/mxv + .byte VOL , 100*se_m_swift_mvl/mxv .byte W02 .byte N06 , Cn6 , v040 .byte W04 @@ -97,15 +97,15 @@ se_w129_2: @******************************************************@ .align 2 -se_w129: +se_m_swift: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w129_pri @ Priority - .byte se_w129_rev @ Reverb. + .byte se_m_swift_pri @ Priority + .byte se_m_swift_rev @ Reverb. - .word se_w129_grp + .word se_m_swift_grp - .word se_w129_1 - .word se_w129_2 + .word se_m_swift_1 + .word se_m_swift_2 .end diff --git a/sound/songs/se_w298.s b/sound/songs/se_m_teeter_dance.s index d21e4b710..8238afeb2 100644 --- a/sound/songs/se_w298.s +++ b/sound/songs/se_m_teeter_dance.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w298_grp, voicegroup128 - .equ se_w298_pri, 4 - .equ se_w298_rev, reverb_set+50 - .equ se_w298_mvl, 127 - .equ se_w298_key, 0 - .equ se_w298_tbs, 1 - .equ se_w298_exg, 0 - .equ se_w298_cmp, 1 + .equ se_m_teeter_dance_grp, voicegroup128 + .equ se_m_teeter_dance_pri, 4 + .equ se_m_teeter_dance_rev, reverb_set+50 + .equ se_m_teeter_dance_mvl, 127 + .equ se_m_teeter_dance_key, 0 + .equ se_m_teeter_dance_tbs, 1 + .equ se_m_teeter_dance_exg, 0 + .equ se_m_teeter_dance_cmp, 1 .section .rodata - .global se_w298 + .global se_m_teeter_dance .align 2 @********************** Track 1 **********************@ -se_w298_1: - .byte KEYSH , se_w298_key+0 - .byte TEMPO , 170*se_w298_tbs/2 +se_m_teeter_dance_1: + .byte KEYSH , se_m_teeter_dance_key+0 + .byte TEMPO , 170*se_m_teeter_dance_tbs/2 .byte VOICE , 37 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w298_mvl/mxv + .byte VOL , 110*se_m_teeter_dance_mvl/mxv .byte BEND , c_v-4 .byte N03 , Gn4 , v100 .byte W06 @@ -66,13 +66,13 @@ se_w298_1: @********************** Track 2 **********************@ -se_w298_2: - .byte KEYSH , se_w298_key+0 +se_m_teeter_dance_2: + .byte KEYSH , se_m_teeter_dance_key+0 .byte VOICE , 47 .byte XCMD , xIECV , 10 .byte xIECL , 8 .byte MOD , 20 - .byte VOL , 44*se_w298_mvl/mxv + .byte VOL , 44*se_m_teeter_dance_mvl/mxv .byte BEND , c_v-2 .byte W03 .byte N03 , Gn3 , v112 @@ -107,15 +107,15 @@ se_w298_2: @******************************************************@ .align 2 -se_w298: +se_m_teeter_dance: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w298_pri @ Priority - .byte se_w298_rev @ Reverb. + .byte se_m_teeter_dance_pri @ Priority + .byte se_m_teeter_dance_rev @ Reverb. - .word se_w298_grp + .word se_m_teeter_dance_grp - .word se_w298_1 - .word se_w298_2 + .word se_m_teeter_dance_1 + .word se_m_teeter_dance_2 .end diff --git a/sound/songs/se_w100.s b/sound/songs/se_m_teleport.s index e2a43dbcc..2c4ad40e8 100644 --- a/sound/songs/se_w100.s +++ b/sound/songs/se_m_teleport.s @@ -1,58 +1,58 @@ .include "MPlayDef.s" - .equ se_w100_grp, voicegroup128 - .equ se_w100_pri, 4 - .equ se_w100_rev, reverb_set+50 - .equ se_w100_mvl, 127 - .equ se_w100_key, 0 - .equ se_w100_tbs, 1 - .equ se_w100_exg, 0 - .equ se_w100_cmp, 1 + .equ se_m_teleport_grp, voicegroup128 + .equ se_m_teleport_pri, 4 + .equ se_m_teleport_rev, reverb_set+50 + .equ se_m_teleport_mvl, 127 + .equ se_m_teleport_key, 0 + .equ se_m_teleport_tbs, 1 + .equ se_m_teleport_exg, 0 + .equ se_m_teleport_cmp, 1 .section .rodata - .global se_w100 + .global se_m_teleport .align 2 @********************** Track 1 **********************@ -se_w100_1: - .byte KEYSH , se_w100_key+0 - .byte TEMPO , 150*se_w100_tbs/2 +se_m_teleport_1: + .byte KEYSH , se_m_teleport_key+0 + .byte TEMPO , 150*se_m_teleport_tbs/2 .byte VOICE , 45 .byte BENDR , 24 .byte PAN , c_v+0 - .byte VOL , 32*se_w100_mvl/mxv + .byte VOL , 32*se_m_teleport_mvl/mxv .byte MOD , 30 .byte BEND , c_v+0 .byte N06 , Cn3 , v127 .byte W01 .byte BEND , c_v+4 .byte W01 - .byte VOL , 49*se_w100_mvl/mxv + .byte VOL , 49*se_m_teleport_mvl/mxv .byte PAN , c_v+5 .byte BEND , c_v+9 .byte W01 .byte c_v+16 .byte W01 - .byte VOL , 61*se_w100_mvl/mxv + .byte VOL , 61*se_m_teleport_mvl/mxv .byte BEND , c_v+24 .byte W02 .byte PAN , c_v+0 .byte BEND , c_v+2 .byte N06 , Dn3 , v116 .byte W01 - .byte VOL , 71*se_w100_mvl/mxv + .byte VOL , 71*se_m_teleport_mvl/mxv .byte BEND , c_v+7 .byte W01 .byte PAN , c_v-4 .byte BEND , c_v+12 .byte W01 - .byte VOL , 81*se_w100_mvl/mxv + .byte VOL , 81*se_m_teleport_mvl/mxv .byte BEND , c_v+18 .byte W01 .byte c_v+27 .byte W02 - .byte VOL , 95*se_w100_mvl/mxv + .byte VOL , 95*se_m_teleport_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+4 .byte N06 , En3 , v112 @@ -92,20 +92,20 @@ se_w100_1: .byte W01 .byte c_v+34 .byte W02 - .byte VOL , 82*se_w100_mvl/mxv + .byte VOL , 82*se_m_teleport_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+14 .byte N06 , An3 , v100 .byte W01 .byte BEND , c_v+18 .byte W01 - .byte VOL , 71*se_w100_mvl/mxv + .byte VOL , 71*se_m_teleport_mvl/mxv .byte PAN , c_v-8 .byte BEND , c_v+23 .byte W01 .byte c_v+30 .byte W01 - .byte VOL , 61*se_w100_mvl/mxv + .byte VOL , 61*se_m_teleport_mvl/mxv .byte BEND , c_v+38 .byte W02 .byte PAN , c_v+0 @@ -152,14 +152,14 @@ se_w100_1: @******************************************************@ .align 2 -se_w100: +se_m_teleport: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w100_pri @ Priority - .byte se_w100_rev @ Reverb. + .byte se_m_teleport_pri @ Priority + .byte se_m_teleport_rev @ Reverb. - .word se_w100_grp + .word se_m_teleport_grp - .word se_w100_1 + .word se_m_teleport_1 .end diff --git a/sound/songs/se_w086.s b/sound/songs/se_m_thunder_wave.s index 37bf21db0..c26535500 100644 --- a/sound/songs/se_w086.s +++ b/sound/songs/se_m_thunder_wave.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w086_grp, voicegroup128 - .equ se_w086_pri, 4 - .equ se_w086_rev, reverb_set+50 - .equ se_w086_mvl, 127 - .equ se_w086_key, 0 - .equ se_w086_tbs, 1 - .equ se_w086_exg, 0 - .equ se_w086_cmp, 1 + .equ se_m_thunder_wave_grp, voicegroup128 + .equ se_m_thunder_wave_pri, 4 + .equ se_m_thunder_wave_rev, reverb_set+50 + .equ se_m_thunder_wave_mvl, 127 + .equ se_m_thunder_wave_key, 0 + .equ se_m_thunder_wave_tbs, 1 + .equ se_m_thunder_wave_exg, 0 + .equ se_m_thunder_wave_cmp, 1 .section .rodata - .global se_w086 + .global se_m_thunder_wave .align 2 @********************** Track 1 **********************@ -se_w086_1: - .byte KEYSH , se_w086_key+0 - .byte TEMPO , 150*se_w086_tbs/2 +se_m_thunder_wave_1: + .byte KEYSH , se_m_thunder_wave_key+0 + .byte TEMPO , 150*se_m_thunder_wave_tbs/2 .byte VOICE , 18 - .byte VOL , 110*se_w086_mvl/mxv + .byte VOL , 110*se_m_thunder_wave_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+32 @@ -45,21 +45,21 @@ se_w086_1: .byte W02 .byte N13 , Gn3 .byte W02 - .byte VOL , 96*se_w086_mvl/mxv + .byte VOL , 96*se_m_thunder_wave_mvl/mxv .byte W01 - .byte 85*se_w086_mvl/mxv + .byte 85*se_m_thunder_wave_mvl/mxv .byte W01 .byte BEND , c_v-23 .byte W01 - .byte VOL , 66*se_w086_mvl/mxv + .byte VOL , 66*se_m_thunder_wave_mvl/mxv .byte W01 .byte BEND , c_v-40 .byte W01 - .byte VOL , 36*se_w086_mvl/mxv + .byte VOL , 36*se_m_thunder_wave_mvl/mxv .byte W01 .byte BEND , c_v-54 .byte W02 - .byte VOL , 12*se_w086_mvl/mxv + .byte VOL , 12*se_m_thunder_wave_mvl/mxv .byte W01 .byte BEND , c_v-64 .byte W21 @@ -67,10 +67,10 @@ se_w086_1: @********************** Track 2 **********************@ -se_w086_2: - .byte KEYSH , se_w086_key+0 +se_m_thunder_wave_2: + .byte KEYSH , se_m_thunder_wave_key+0 .byte VOICE , 5 - .byte VOL , 110*se_w086_mvl/mxv + .byte VOL , 110*se_m_thunder_wave_mvl/mxv .byte PAN , c_v-7 .byte N02 , En3 , v052 .byte W04 @@ -92,15 +92,15 @@ se_w086_2: @******************************************************@ .align 2 -se_w086: +se_m_thunder_wave: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w086_pri @ Priority - .byte se_w086_rev @ Reverb. + .byte se_m_thunder_wave_pri @ Priority + .byte se_m_thunder_wave_rev @ Reverb. - .word se_w086_grp + .word se_m_thunder_wave_grp - .word se_w086_1 - .word se_w086_2 + .word se_m_thunder_wave_1 + .word se_m_thunder_wave_2 .end diff --git a/sound/songs/se_w085.s b/sound/songs/se_m_thunderbolt.s index 21e8fc6df..3b3790313 100644 --- a/sound/songs/se_w085.s +++ b/sound/songs/se_m_thunderbolt.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w085_grp, voicegroup128 - .equ se_w085_pri, 4 - .equ se_w085_rev, reverb_set+50 - .equ se_w085_mvl, 127 - .equ se_w085_key, 0 - .equ se_w085_tbs, 1 - .equ se_w085_exg, 0 - .equ se_w085_cmp, 1 + .equ se_m_thunderbolt_grp, voicegroup128 + .equ se_m_thunderbolt_pri, 4 + .equ se_m_thunderbolt_rev, reverb_set+50 + .equ se_m_thunderbolt_mvl, 127 + .equ se_m_thunderbolt_key, 0 + .equ se_m_thunderbolt_tbs, 1 + .equ se_m_thunderbolt_exg, 0 + .equ se_m_thunderbolt_cmp, 1 .section .rodata - .global se_w085 + .global se_m_thunderbolt .align 2 @********************** Track 1 **********************@ -se_w085_1: - .byte KEYSH , se_w085_key+0 - .byte TEMPO , 220*se_w085_tbs/2 +se_m_thunderbolt_1: + .byte KEYSH , se_m_thunderbolt_key+0 + .byte TEMPO , 220*se_m_thunderbolt_tbs/2 .byte VOICE , 18 - .byte VOL , 120*se_w085_mvl/mxv + .byte VOL , 120*se_m_thunderbolt_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+32 @@ -55,23 +55,23 @@ se_w085_1: .byte W01 .byte BEND , c_v-23 .byte W02 - .byte VOL , 100*se_w085_mvl/mxv + .byte VOL , 100*se_m_thunderbolt_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v-40 .byte W01 - .byte VOL , 86*se_w085_mvl/mxv + .byte VOL , 86*se_m_thunderbolt_mvl/mxv .byte W01 .byte BEND , c_v-54 .byte W01 .byte PAN , c_v+10 - .byte VOL , 68*se_w085_mvl/mxv + .byte VOL , 68*se_m_thunderbolt_mvl/mxv .byte W02 - .byte 37*se_w085_mvl/mxv + .byte 37*se_m_thunderbolt_mvl/mxv .byte BEND , c_v-64 .byte W01 .byte PAN , c_v+16 .byte W02 - .byte VOL , 17*se_w085_mvl/mxv + .byte VOL , 17*se_m_thunderbolt_mvl/mxv .byte W01 .byte PAN , c_v+10 .byte W15 @@ -79,10 +79,10 @@ se_w085_1: @********************** Track 2 **********************@ -se_w085_2: - .byte KEYSH , se_w085_key+0 +se_m_thunderbolt_2: + .byte KEYSH , se_m_thunderbolt_key+0 .byte VOICE , 5 - .byte VOL , 120*se_w085_mvl/mxv + .byte VOL , 120*se_m_thunderbolt_mvl/mxv .byte PAN , c_v-7 .byte N02 , En3 , v048 .byte W05 @@ -103,15 +103,15 @@ se_w085_2: @******************************************************@ .align 2 -se_w085: +se_m_thunderbolt: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w085_pri @ Priority - .byte se_w085_rev @ Reverb. + .byte se_m_thunderbolt_pri @ Priority + .byte se_m_thunderbolt_rev @ Reverb. - .word se_w085_grp + .word se_m_thunderbolt_grp - .word se_w085_1 - .word se_w085_2 + .word se_m_thunderbolt_1 + .word se_m_thunderbolt_2 .end diff --git a/sound/songs/se_w085b.s b/sound/songs/se_m_thunderbolt2.s index b42007094..506820395 100644 --- a/sound/songs/se_w085b.s +++ b/sound/songs/se_m_thunderbolt2.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w085b_grp, voicegroup128 - .equ se_w085b_pri, 4 - .equ se_w085b_rev, reverb_set+50 - .equ se_w085b_mvl, 127 - .equ se_w085b_key, 0 - .equ se_w085b_tbs, 1 - .equ se_w085b_exg, 0 - .equ se_w085b_cmp, 1 + .equ se_m_thunderbolt2_grp, voicegroup128 + .equ se_m_thunderbolt2_pri, 4 + .equ se_m_thunderbolt2_rev, reverb_set+50 + .equ se_m_thunderbolt2_mvl, 127 + .equ se_m_thunderbolt2_key, 0 + .equ se_m_thunderbolt2_tbs, 1 + .equ se_m_thunderbolt2_exg, 0 + .equ se_m_thunderbolt2_cmp, 1 .section .rodata - .global se_w085b + .global se_m_thunderbolt2 .align 2 @********************** Track 1 **********************@ -se_w085b_1: - .byte KEYSH , se_w085b_key+0 - .byte TEMPO , 220*se_w085b_tbs/2 +se_m_thunderbolt2_1: + .byte KEYSH , se_m_thunderbolt2_key+0 + .byte TEMPO , 220*se_m_thunderbolt2_tbs/2 .byte VOICE , 18 - .byte VOL , 100*se_w085b_mvl/mxv + .byte VOL , 100*se_m_thunderbolt2_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -44,10 +44,10 @@ se_w085b_1: @********************** Track 2 **********************@ -se_w085b_2: - .byte KEYSH , se_w085b_key+0 +se_m_thunderbolt2_2: + .byte KEYSH , se_m_thunderbolt2_key+0 .byte VOICE , 5 - .byte VOL , 100*se_w085b_mvl/mxv + .byte VOL , 100*se_m_thunderbolt2_mvl/mxv .byte PAN , c_v+9 .byte N02 , Gn3 , v072 .byte W06 @@ -71,15 +71,15 @@ se_w085b_2: @******************************************************@ .align 2 -se_w085b: +se_m_thunderbolt2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w085b_pri @ Priority - .byte se_w085b_rev @ Reverb. + .byte se_m_thunderbolt2_pri @ Priority + .byte se_m_thunderbolt2_rev @ Reverb. - .word se_w085b_grp + .word se_m_thunderbolt2_grp - .word se_w085b_1 - .word se_w085b_2 + .word se_m_thunderbolt2_1 + .word se_m_thunderbolt2_2 .end diff --git a/sound/songs/se_w092.s b/sound/songs/se_m_toxic.s index b82665340..0e3ebe220 100644 --- a/sound/songs/se_w092.s +++ b/sound/songs/se_m_toxic.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w092_grp, voicegroup128 - .equ se_w092_pri, 4 - .equ se_w092_rev, reverb_set+50 - .equ se_w092_mvl, 127 - .equ se_w092_key, 0 - .equ se_w092_tbs, 1 - .equ se_w092_exg, 0 - .equ se_w092_cmp, 1 + .equ se_m_toxic_grp, voicegroup128 + .equ se_m_toxic_pri, 4 + .equ se_m_toxic_rev, reverb_set+50 + .equ se_m_toxic_mvl, 127 + .equ se_m_toxic_key, 0 + .equ se_m_toxic_tbs, 1 + .equ se_m_toxic_exg, 0 + .equ se_m_toxic_cmp, 1 .section .rodata - .global se_w092 + .global se_m_toxic .align 2 @********************** Track 1 **********************@ -se_w092_1: - .byte KEYSH , se_w092_key+0 - .byte TEMPO , 150*se_w092_tbs/2 +se_m_toxic_1: + .byte KEYSH , se_m_toxic_key+0 + .byte TEMPO , 150*se_m_toxic_tbs/2 .byte VOICE , 31 - .byte VOL , 110*se_w092_mvl/mxv + .byte VOL , 110*se_m_toxic_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -74,14 +74,14 @@ se_w092_1: @******************************************************@ .align 2 -se_w092: +se_m_toxic: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w092_pri @ Priority - .byte se_w092_rev @ Reverb. + .byte se_m_toxic_pri @ Priority + .byte se_m_toxic_rev @ Reverb. - .word se_w092_grp + .word se_m_toxic_grp - .word se_w092_1 + .word se_m_toxic_1 .end diff --git a/sound/songs/se_w161.s b/sound/songs/se_m_tri_attack.s index 8b378b121..448998e77 100644 --- a/sound/songs/se_w161.s +++ b/sound/songs/se_m_tri_attack.s @@ -1,40 +1,40 @@ .include "MPlayDef.s" - .equ se_w161_grp, voicegroup128 - .equ se_w161_pri, 4 - .equ se_w161_rev, reverb_set+50 - .equ se_w161_mvl, 127 - .equ se_w161_key, 0 - .equ se_w161_tbs, 1 - .equ se_w161_exg, 0 - .equ se_w161_cmp, 1 + .equ se_m_tri_attack_grp, voicegroup128 + .equ se_m_tri_attack_pri, 4 + .equ se_m_tri_attack_rev, reverb_set+50 + .equ se_m_tri_attack_mvl, 127 + .equ se_m_tri_attack_key, 0 + .equ se_m_tri_attack_tbs, 1 + .equ se_m_tri_attack_exg, 0 + .equ se_m_tri_attack_cmp, 1 .section .rodata - .global se_w161 + .global se_m_tri_attack .align 2 @********************** Track 1 **********************@ -se_w161_1: - .byte KEYSH , se_w161_key+0 - .byte TEMPO , 220*se_w161_tbs/2 +se_m_tri_attack_1: + .byte KEYSH , se_m_tri_attack_key+0 + .byte TEMPO , 220*se_m_tri_attack_tbs/2 .byte VOICE , 58 .byte BENDR , 24 .byte PAN , c_v+0 - .byte VOL , 19*se_w161_mvl/mxv + .byte VOL , 19*se_m_tri_attack_mvl/mxv .byte BEND , c_v-32 .byte N16 , Gn1 , v127 .byte W01 - .byte VOL , 43*se_w161_mvl/mxv + .byte VOL , 43*se_m_tri_attack_mvl/mxv .byte BEND , c_v-20 .byte W01 - .byte VOL , 72*se_w161_mvl/mxv + .byte VOL , 72*se_m_tri_attack_mvl/mxv .byte BEND , c_v-8 .byte W01 - .byte VOL , 92*se_w161_mvl/mxv + .byte VOL , 92*se_m_tri_attack_mvl/mxv .byte BEND , c_v+7 .byte W01 - .byte VOL , 109*se_w161_mvl/mxv + .byte VOL , 109*se_m_tri_attack_mvl/mxv .byte BEND , c_v+19 .byte W02 .byte c_v+28 @@ -43,29 +43,29 @@ se_w161_1: .byte W01 .byte c_v+28 .byte W01 - .byte VOL , 102*se_w161_mvl/mxv + .byte VOL , 102*se_m_tri_attack_mvl/mxv .byte BEND , c_v+19 .byte W01 - .byte VOL , 88*se_w161_mvl/mxv + .byte VOL , 88*se_m_tri_attack_mvl/mxv .byte BEND , c_v+5 .byte W02 - .byte VOL , 69*se_w161_mvl/mxv + .byte VOL , 69*se_m_tri_attack_mvl/mxv .byte BEND , c_v-9 .byte W01 - .byte VOL , 37*se_w161_mvl/mxv + .byte VOL , 37*se_m_tri_attack_mvl/mxv .byte BEND , c_v-20 .byte W01 - .byte VOL , 17*se_w161_mvl/mxv + .byte VOL , 17*se_m_tri_attack_mvl/mxv .byte BEND , c_v-34 .byte W10 .byte FINE @********************** Track 2 **********************@ -se_w161_2: - .byte KEYSH , se_w161_key+0 +se_m_tri_attack_2: + .byte KEYSH , se_m_tri_attack_key+0 .byte VOICE , 4 - .byte VOL , 110*se_w161_mvl/mxv + .byte VOL , 110*se_m_tri_attack_mvl/mxv .byte N02 , Gs3 , v032 .byte W02 .byte Gn3 @@ -85,15 +85,15 @@ se_w161_2: @******************************************************@ .align 2 -se_w161: +se_m_tri_attack: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w161_pri @ Priority - .byte se_w161_rev @ Reverb. + .byte se_m_tri_attack_pri @ Priority + .byte se_m_tri_attack_rev @ Reverb. - .word se_w161_grp + .word se_m_tri_attack_grp - .word se_w161_1 - .word se_w161_2 + .word se_m_tri_attack_1 + .word se_m_tri_attack_2 .end diff --git a/sound/songs/se_w161b.s b/sound/songs/se_m_tri_attack2.s index 87c27eb7e..0afade13c 100644 --- a/sound/songs/se_w161b.s +++ b/sound/songs/se_m_tri_attack2.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w161b_grp, voicegroup128 - .equ se_w161b_pri, 4 - .equ se_w161b_rev, reverb_set+50 - .equ se_w161b_mvl, 127 - .equ se_w161b_key, 0 - .equ se_w161b_tbs, 1 - .equ se_w161b_exg, 0 - .equ se_w161b_cmp, 1 + .equ se_m_tri_attack2_grp, voicegroup128 + .equ se_m_tri_attack2_pri, 4 + .equ se_m_tri_attack2_rev, reverb_set+50 + .equ se_m_tri_attack2_mvl, 127 + .equ se_m_tri_attack2_key, 0 + .equ se_m_tri_attack2_tbs, 1 + .equ se_m_tri_attack2_exg, 0 + .equ se_m_tri_attack2_cmp, 1 .section .rodata - .global se_w161b + .global se_m_tri_attack2 .align 2 @********************** Track 1 **********************@ -se_w161b_1: - .byte KEYSH , se_w161b_key+0 - .byte TEMPO , 220*se_w161b_tbs/2 +se_m_tri_attack2_1: + .byte KEYSH , se_m_tri_attack2_key+0 + .byte TEMPO , 220*se_m_tri_attack2_tbs/2 .byte VOICE , 18 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 110*se_w161b_mvl/mxv + .byte VOL , 110*se_m_tri_attack2_mvl/mxv .byte BEND , c_v+0 .byte N09 , An3 , v127 .byte W03 @@ -65,28 +65,28 @@ se_w161b_1: .byte PAN , c_v+0 .byte BEND , c_v-22 .byte W06 - .byte VOL , 103*se_w161b_mvl/mxv + .byte VOL , 103*se_m_tri_attack2_mvl/mxv .byte PAN , c_v+10 .byte W03 .byte BEND , c_v-32 .byte W03 .byte PAN , c_v+0 .byte W03 - .byte VOL , 95*se_w161b_mvl/mxv + .byte VOL , 95*se_m_tri_attack2_mvl/mxv .byte BEND , c_v-38 .byte W03 .byte PAN , c_v-9 .byte W05 .byte BEND , c_v-45 .byte W01 - .byte VOL , 66*se_w161b_mvl/mxv + .byte VOL , 66*se_m_tri_attack2_mvl/mxv .byte PAN , c_v+0 .byte W05 .byte c_v+10 .byte W01 .byte BEND , c_v-52 .byte W03 - .byte VOL , 21*se_w161b_mvl/mxv + .byte VOL , 21*se_m_tri_attack2_mvl/mxv .byte W02 .byte PAN , c_v+0 .byte W04 @@ -94,10 +94,10 @@ se_w161b_1: @********************** Track 2 **********************@ -se_w161b_2: - .byte KEYSH , se_w161b_key+0 +se_m_tri_attack2_2: + .byte KEYSH , se_m_tri_attack2_key+0 .byte VOICE , 4 - .byte VOL , 110*se_w161b_mvl/mxv + .byte VOL , 110*se_m_tri_attack2_mvl/mxv .byte N06 , Cn3 , v060 .byte W09 .byte N15 @@ -110,15 +110,15 @@ se_w161b_2: @******************************************************@ .align 2 -se_w161b: +se_m_tri_attack2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w161b_pri @ Priority - .byte se_w161b_rev @ Reverb. + .byte se_m_tri_attack2_pri @ Priority + .byte se_m_tri_attack2_rev @ Reverb. - .word se_w161b_grp + .word se_m_tri_attack2_grp - .word se_w161b_1 - .word se_w161b_2 + .word se_m_tri_attack2_1 + .word se_m_tri_attack2_2 .end diff --git a/sound/songs/se_w239.s b/sound/songs/se_m_twister.s index fc18c1d5c..e95e9b322 100644 --- a/sound/songs/se_w239.s +++ b/sound/songs/se_m_twister.s @@ -1,44 +1,44 @@ .include "MPlayDef.s" - .equ se_w239_grp, voicegroup128 - .equ se_w239_pri, 4 - .equ se_w239_rev, reverb_set+50 - .equ se_w239_mvl, 127 - .equ se_w239_key, 0 - .equ se_w239_tbs, 1 - .equ se_w239_exg, 0 - .equ se_w239_cmp, 1 + .equ se_m_twister_grp, voicegroup128 + .equ se_m_twister_pri, 4 + .equ se_m_twister_rev, reverb_set+50 + .equ se_m_twister_mvl, 127 + .equ se_m_twister_key, 0 + .equ se_m_twister_tbs, 1 + .equ se_m_twister_exg, 0 + .equ se_m_twister_cmp, 1 .section .rodata - .global se_w239 + .global se_m_twister .align 2 @********************** Track 1 **********************@ -se_w239_1: - .byte KEYSH , se_w239_key+0 - .byte TEMPO , 150*se_w239_tbs/2 +se_m_twister_1: + .byte KEYSH , se_m_twister_key+0 + .byte TEMPO , 150*se_m_twister_tbs/2 .byte VOICE , 22 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 67*se_w239_mvl/mxv + .byte VOL , 67*se_m_twister_mvl/mxv .byte BEND , c_v+0 .byte TIE , Dn2 , v127 .byte W03 - .byte VOL , 83*se_w239_mvl/mxv + .byte VOL , 83*se_m_twister_mvl/mxv .byte BEND , c_v+22 .byte W03 - .byte VOL , 88*se_w239_mvl/mxv + .byte VOL , 88*se_m_twister_mvl/mxv .byte PAN , c_v-4 .byte W03 - .byte VOL , 95*se_w239_mvl/mxv + .byte VOL , 95*se_m_twister_mvl/mxv .byte W02 .byte BEND , c_v+8 .byte W01 - .byte VOL , 105*se_w239_mvl/mxv + .byte VOL , 105*se_m_twister_mvl/mxv .byte PAN , c_v-8 .byte W03 - .byte VOL , 115*se_w239_mvl/mxv + .byte VOL , 115*se_m_twister_mvl/mxv .byte W02 .byte BEND , c_v+0 .byte W01 @@ -101,7 +101,7 @@ se_w239_1: .byte PAN , c_v-8 .byte W03 .byte c_v-11 - .byte VOL , 103*se_w239_mvl/mxv + .byte VOL , 103*se_m_twister_mvl/mxv .byte W03 .byte PAN , c_v-17 .byte W01 @@ -109,41 +109,41 @@ se_w239_1: .byte W05 .byte PAN , c_v-9 .byte W01 - .byte VOL , 97*se_w239_mvl/mxv + .byte VOL , 97*se_m_twister_mvl/mxv .byte W05 .byte PAN , c_v-3 .byte W01 .byte BEND , c_v+12 .byte W02 .byte PAN , c_v+6 - .byte VOL , 88*se_w239_mvl/mxv + .byte VOL , 88*se_m_twister_mvl/mxv .byte W03 .byte PAN , c_v+10 .byte W02 .byte BEND , c_v+7 .byte W02 - .byte VOL , 79*se_w239_mvl/mxv + .byte VOL , 79*se_m_twister_mvl/mxv .byte W02 .byte PAN , c_v+16 .byte W04 - .byte VOL , 62*se_w239_mvl/mxv + .byte VOL , 62*se_m_twister_mvl/mxv .byte BEND , c_v+0 .byte W02 .byte PAN , c_v+13 .byte W04 - .byte VOL , 45*se_w239_mvl/mxv + .byte VOL , 45*se_m_twister_mvl/mxv .byte W02 .byte PAN , c_v+8 .byte W01 .byte BEND , c_v-7 .byte W01 - .byte VOL , 33*se_w239_mvl/mxv + .byte VOL , 33*se_m_twister_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte W03 .byte c_v-8 .byte W01 - .byte VOL , 18*se_w239_mvl/mxv + .byte VOL , 18*se_m_twister_mvl/mxv .byte W02 .byte PAN , c_v-11 .byte W03 @@ -152,43 +152,43 @@ se_w239_1: @********************** Track 2 **********************@ -se_w239_2: - .byte KEYSH , se_w239_key+0 +se_m_twister_2: + .byte KEYSH , se_m_twister_key+0 .byte VOICE , 25 - .byte VOL , 67*se_w239_mvl/mxv + .byte VOL , 67*se_m_twister_mvl/mxv .byte TIE , Gs4 , v012 .byte W03 - .byte VOL , 83*se_w239_mvl/mxv + .byte VOL , 83*se_m_twister_mvl/mxv .byte W03 - .byte 88*se_w239_mvl/mxv + .byte 88*se_m_twister_mvl/mxv .byte W03 - .byte 95*se_w239_mvl/mxv + .byte 95*se_m_twister_mvl/mxv .byte W03 - .byte 105*se_w239_mvl/mxv + .byte 105*se_m_twister_mvl/mxv .byte W03 - .byte 115*se_w239_mvl/mxv + .byte 115*se_m_twister_mvl/mxv .byte W09 .byte W24 .byte W24 .byte W24 .byte W21 - .byte 103*se_w239_mvl/mxv + .byte 103*se_m_twister_mvl/mxv .byte W03 .byte W07 - .byte 97*se_w239_mvl/mxv + .byte 97*se_m_twister_mvl/mxv .byte W08 - .byte 88*se_w239_mvl/mxv + .byte 88*se_m_twister_mvl/mxv .byte W07 - .byte 79*se_w239_mvl/mxv + .byte 79*se_m_twister_mvl/mxv .byte W02 .byte W04 - .byte 62*se_w239_mvl/mxv + .byte 62*se_m_twister_mvl/mxv .byte W06 - .byte 45*se_w239_mvl/mxv + .byte 45*se_m_twister_mvl/mxv .byte W04 - .byte 33*se_w239_mvl/mxv + .byte 33*se_m_twister_mvl/mxv .byte W05 - .byte 18*se_w239_mvl/mxv + .byte 18*se_m_twister_mvl/mxv .byte W05 .byte EOT .byte FINE @@ -196,15 +196,15 @@ se_w239_2: @******************************************************@ .align 2 -se_w239: +se_m_twister: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w239_pri @ Priority - .byte se_w239_rev @ Reverb. + .byte se_m_twister_pri @ Priority + .byte se_m_twister_rev @ Reverb. - .word se_w239_grp + .word se_m_twister_grp - .word se_w239_1 - .word se_w239_2 + .word se_m_twister_1 + .word se_m_twister_2 .end diff --git a/sound/songs/se_w253.s b/sound/songs/se_m_uproar.s index e33de4550..c60cccee4 100644 --- a/sound/songs/se_w253.s +++ b/sound/songs/se_m_uproar.s @@ -1,41 +1,41 @@ .include "MPlayDef.s" - .equ se_w253_grp, voicegroup128 - .equ se_w253_pri, 4 - .equ se_w253_rev, reverb_set+50 - .equ se_w253_mvl, 127 - .equ se_w253_key, 0 - .equ se_w253_tbs, 1 - .equ se_w253_exg, 0 - .equ se_w253_cmp, 1 + .equ se_m_uproar_grp, voicegroup128 + .equ se_m_uproar_pri, 4 + .equ se_m_uproar_rev, reverb_set+50 + .equ se_m_uproar_mvl, 127 + .equ se_m_uproar_key, 0 + .equ se_m_uproar_tbs, 1 + .equ se_m_uproar_exg, 0 + .equ se_m_uproar_cmp, 1 .section .rodata - .global se_w253 + .global se_m_uproar .align 2 @********************** Track 1 **********************@ -se_w253_1: - .byte KEYSH , se_w253_key+0 - .byte TEMPO , 150*se_w253_tbs/2 +se_m_uproar_1: + .byte KEYSH , se_m_uproar_key+0 + .byte TEMPO , 150*se_m_uproar_tbs/2 .byte VOICE , 60 .byte BENDR , 12 - .byte VOL , 25*se_w253_mvl/mxv + .byte VOL , 25*se_m_uproar_mvl/mxv .byte PAN , c_v+0 .byte BEND , c_v+0 .byte N24 , Gs2 , v127 .byte W01 .byte PAN , c_v+2 - .byte VOL , 51*se_w253_mvl/mxv + .byte VOL , 51*se_m_uproar_mvl/mxv .byte W01 .byte PAN , c_v+5 - .byte VOL , 74*se_w253_mvl/mxv + .byte VOL , 74*se_m_uproar_mvl/mxv .byte W01 - .byte 89*se_w253_mvl/mxv + .byte 89*se_m_uproar_mvl/mxv .byte BEND , c_v+1 .byte W01 .byte PAN , c_v+2 - .byte VOL , 100*se_w253_mvl/mxv + .byte VOL , 100*se_m_uproar_mvl/mxv .byte W02 .byte PAN , c_v+0 .byte W01 @@ -57,30 +57,30 @@ se_w253_1: .byte W02 .byte c_v+0 .byte W01 - .byte VOL , 85*se_w253_mvl/mxv + .byte VOL , 85*se_m_uproar_mvl/mxv .byte PAN , c_v-2 .byte W01 .byte c_v-4 - .byte VOL , 62*se_w253_mvl/mxv + .byte VOL , 62*se_m_uproar_mvl/mxv .byte W01 - .byte 33*se_w253_mvl/mxv + .byte 33*se_m_uproar_mvl/mxv .byte W01 .byte PAN , c_v-2 - .byte VOL , 11*se_w253_mvl/mxv + .byte VOL , 11*se_m_uproar_mvl/mxv .byte W02 .byte FINE @******************************************************@ .align 2 -se_w253: +se_m_uproar: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w253_pri @ Priority - .byte se_w253_rev @ Reverb. + .byte se_m_uproar_pri @ Priority + .byte se_m_uproar_rev @ Reverb. - .word se_w253_grp + .word se_m_uproar_grp - .word se_w253_1 + .word se_m_uproar_1 .end diff --git a/sound/songs/se_m_vital_throw.s b/sound/songs/se_m_vital_throw.s new file mode 100644 index 000000000..c89d003b6 --- /dev/null +++ b/sound/songs/se_m_vital_throw.s @@ -0,0 +1,75 @@ + .include "MPlayDef.s" + + .equ se_m_vital_throw_grp, voicegroup128 + .equ se_m_vital_throw_pri, 4 + .equ se_m_vital_throw_rev, reverb_set+50 + .equ se_m_vital_throw_mvl, 127 + .equ se_m_vital_throw_key, 0 + .equ se_m_vital_throw_tbs, 1 + .equ se_m_vital_throw_exg, 0 + .equ se_m_vital_throw_cmp, 1 + + .section .rodata + .global se_m_vital_throw + .align 2 + +@********************** Track 1 **********************@ + +se_m_vital_throw_1: + .byte KEYSH , se_m_vital_throw_key+0 + .byte TEMPO , 220*se_m_vital_throw_tbs/2 + .byte VOICE , 22 + .byte VOL , 110*se_m_vital_throw_mvl/mxv + .byte BENDR , 12 + .byte PAN , c_v+16 + .byte BEND , c_v+46 + .byte N09 , Cn3 , v127 + .byte W03 + .byte VOL , 104*se_m_vital_throw_mvl/mxv + .byte PAN , c_v+0 + .byte BEND , c_v+23 + .byte W03 + .byte VOL , 93*se_m_vital_throw_mvl/mxv + .byte PAN , c_v-16 + .byte BEND , c_v-15 + .byte W03 + .byte VOICE , 21 + .byte VOL , 110*se_m_vital_throw_mvl/mxv + .byte BEND , c_v+0 + .byte N03 , Gn4 + .byte W06 + .byte PAN , c_v+16 + .byte N03 , Cn5 + .byte W09 + .byte FINE + +@********************** Track 2 **********************@ + +se_m_vital_throw_2: + .byte KEYSH , se_m_vital_throw_key+0 + .byte VOICE , 4 + .byte VOL , 110*se_m_vital_throw_mvl/mxv + .byte W09 + .byte PAN , c_v+8 + .byte N03 , Cn3 , v052 + .byte W06 + .byte PAN , c_v-7 + .byte N03 + .byte W09 + .byte FINE + +@******************************************************@ + .align 2 + +se_m_vital_throw: + .byte 2 @ NumTrks + .byte 0 @ NumBlks + .byte se_m_vital_throw_pri @ Priority + .byte se_m_vital_throw_rev @ Reverb. + + .word se_m_vital_throw_grp + + .word se_m_vital_throw_1 + .word se_m_vital_throw_2 + + .end diff --git a/sound/songs/se_w233b.s b/sound/songs/se_m_vital_throw2.s index 65d256d9a..3bffdeb25 100644 --- a/sound/songs/se_w233b.s +++ b/sound/songs/se_m_vital_throw2.s @@ -1,25 +1,25 @@ .include "MPlayDef.s" - .equ se_w233b_grp, voicegroup128 - .equ se_w233b_pri, 4 - .equ se_w233b_rev, reverb_set+50 - .equ se_w233b_mvl, 127 - .equ se_w233b_key, 0 - .equ se_w233b_tbs, 1 - .equ se_w233b_exg, 0 - .equ se_w233b_cmp, 1 + .equ se_m_vital_throw2_grp, voicegroup128 + .equ se_m_vital_throw2_pri, 4 + .equ se_m_vital_throw2_rev, reverb_set+50 + .equ se_m_vital_throw2_mvl, 127 + .equ se_m_vital_throw2_key, 0 + .equ se_m_vital_throw2_tbs, 1 + .equ se_m_vital_throw2_exg, 0 + .equ se_m_vital_throw2_cmp, 1 .section .rodata - .global se_w233b + .global se_m_vital_throw2 .align 2 @********************** Track 1 **********************@ -se_w233b_1: - .byte KEYSH , se_w233b_key+0 - .byte TEMPO , 220*se_w233b_tbs/2 +se_m_vital_throw2_1: + .byte KEYSH , se_m_vital_throw2_key+0 + .byte TEMPO , 220*se_m_vital_throw2_tbs/2 .byte VOICE , 6 - .byte VOL , 110*se_w233b_mvl/mxv + .byte VOL , 110*se_m_vital_throw2_mvl/mxv .byte BENDR , 12 .byte PAN , c_v+0 .byte BEND , c_v+0 @@ -57,16 +57,16 @@ se_w233b_1: .byte W01 .byte c_v-29 .byte W01 - .byte VOL , 86*se_w233b_mvl/mxv + .byte VOL , 86*se_m_vital_throw2_mvl/mxv .byte BEND , c_v-39 .byte W02 - .byte VOL , 69*se_w233b_mvl/mxv + .byte VOL , 69*se_m_vital_throw2_mvl/mxv .byte BEND , c_v-45 .byte W01 - .byte VOL , 53*se_w233b_mvl/mxv + .byte VOL , 53*se_m_vital_throw2_mvl/mxv .byte BEND , c_v-56 .byte W01 - .byte VOL , 20*se_w233b_mvl/mxv + .byte VOL , 20*se_m_vital_throw2_mvl/mxv .byte BEND , c_v-64 .byte W04 .byte c_v-64 @@ -74,12 +74,12 @@ se_w233b_1: @********************** Track 2 **********************@ -se_w233b_2: - .byte KEYSH , se_w233b_key+0 +se_m_vital_throw2_2: + .byte KEYSH , se_m_vital_throw2_key+0 .byte VOICE , 5 .byte XCMD , xIECV , 10 .byte xIECL , 8 - .byte VOL , 110*se_w233b_mvl/mxv + .byte VOL , 110*se_m_vital_throw2_mvl/mxv .byte PAN , c_v+9 .byte N03 , Gs2 , v052 .byte W06 @@ -94,15 +94,15 @@ se_w233b_2: @******************************************************@ .align 2 -se_w233b: +se_m_vital_throw2: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w233b_pri @ Priority - .byte se_w233b_rev @ Reverb. + .byte se_m_vital_throw2_pri @ Priority + .byte se_m_vital_throw2_rev @ Reverb. - .word se_w233b_grp + .word se_m_vital_throw2_grp - .word se_w233b_1 - .word se_w233b_2 + .word se_m_vital_throw2_1 + .word se_m_vital_throw2_2 .end diff --git a/sound/songs/se_w127.s b/sound/songs/se_m_waterfall.s index 695697698..a07e7e971 100644 --- a/sound/songs/se_w127.s +++ b/sound/songs/se_m_waterfall.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w127_grp, voicegroup128 - .equ se_w127_pri, 4 - .equ se_w127_rev, reverb_set+50 - .equ se_w127_mvl, 127 - .equ se_w127_key, 0 - .equ se_w127_tbs, 1 - .equ se_w127_exg, 0 - .equ se_w127_cmp, 1 + .equ se_m_waterfall_grp, voicegroup128 + .equ se_m_waterfall_pri, 4 + .equ se_m_waterfall_rev, reverb_set+50 + .equ se_m_waterfall_mvl, 127 + .equ se_m_waterfall_key, 0 + .equ se_m_waterfall_tbs, 1 + .equ se_m_waterfall_exg, 0 + .equ se_m_waterfall_cmp, 1 .section .rodata - .global se_w127 + .global se_m_waterfall .align 2 @********************** Track 1 **********************@ -se_w127_1: - .byte KEYSH , se_w127_key+0 - .byte TEMPO , 150*se_w127_tbs/2 +se_m_waterfall_1: + .byte KEYSH , se_m_waterfall_key+0 + .byte TEMPO , 150*se_m_waterfall_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 115*se_w127_mvl/mxv + .byte VOL , 115*se_m_waterfall_mvl/mxv .byte BEND , c_v-18 .byte N60 , Gn2 , v127 .byte W03 @@ -54,62 +54,62 @@ se_w127_1: .byte PAN , c_v+3 .byte BEND , c_v+7 .byte W02 - .byte VOL , 109*se_w127_mvl/mxv + .byte VOL , 109*se_m_waterfall_mvl/mxv .byte W02 .byte PAN , c_v+6 .byte BEND , c_v+10 .byte W02 - .byte VOL , 103*se_w127_mvl/mxv + .byte VOL , 103*se_m_waterfall_mvl/mxv .byte W01 .byte PAN , c_v+3 .byte BEND , c_v+13 .byte W03 - .byte VOL , 92*se_w127_mvl/mxv + .byte VOL , 92*se_m_waterfall_mvl/mxv .byte W01 .byte PAN , c_v+0 .byte BEND , c_v+16 .byte W03 - .byte VOL , 79*se_w127_mvl/mxv + .byte VOL , 79*se_m_waterfall_mvl/mxv .byte PAN , c_v-3 .byte BEND , c_v+18 .byte W02 .byte W02 - .byte VOL , 62*se_w127_mvl/mxv + .byte VOL , 62*se_m_waterfall_mvl/mxv .byte PAN , c_v-6 .byte BEND , c_v+21 .byte W04 - .byte VOL , 40*se_w127_mvl/mxv + .byte VOL , 40*se_m_waterfall_mvl/mxv .byte PAN , c_v-3 .byte BEND , c_v+26 .byte W02 - .byte VOL , 22*se_w127_mvl/mxv + .byte VOL , 22*se_m_waterfall_mvl/mxv .byte BEND , c_v+33 .byte W01 .byte PAN , c_v+0 .byte W01 - .byte VOL , 8*se_w127_mvl/mxv + .byte VOL , 8*se_m_waterfall_mvl/mxv .byte BEND , c_v+43 .byte W02 .byte FINE @********************** Track 2 **********************@ -se_w127_2: - .byte KEYSH , se_w127_key+0 +se_m_waterfall_2: + .byte KEYSH , se_m_waterfall_key+0 .byte VOICE , 25 - .byte VOL , 115*se_w127_mvl/mxv + .byte VOL , 115*se_m_waterfall_mvl/mxv .byte N06 , Cn3 , v040 .byte W06 .byte Gn2 .byte W06 -se_w127_2_000: +se_m_waterfall_2_000: .byte N06 , Cn3 , v040 .byte W06 .byte Gn2 .byte W06 .byte PEND .byte PATT - .word se_w127_2_000 + .word se_m_waterfall_2_000 .byte N06 , Cn3 , v032 .byte W06 .byte Gn2 @@ -123,15 +123,15 @@ se_w127_2_000: @******************************************************@ .align 2 -se_w127: +se_m_waterfall: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w127_pri @ Priority - .byte se_w127_rev @ Reverb. + .byte se_m_waterfall_pri @ Priority + .byte se_m_waterfall_rev @ Reverb. - .word se_w127_grp + .word se_m_waterfall_grp - .word se_w127_1 - .word se_w127_2 + .word se_m_waterfall_1 + .word se_m_waterfall_2 .end diff --git a/sound/songs/se_w250.s b/sound/songs/se_m_whirlpool.s index 20a660411..bac3fa5bc 100644 --- a/sound/songs/se_w250.s +++ b/sound/songs/se_m_whirlpool.s @@ -1,27 +1,27 @@ .include "MPlayDef.s" - .equ se_w250_grp, voicegroup128 - .equ se_w250_pri, 4 - .equ se_w250_rev, reverb_set+50 - .equ se_w250_mvl, 127 - .equ se_w250_key, 0 - .equ se_w250_tbs, 1 - .equ se_w250_exg, 0 - .equ se_w250_cmp, 1 + .equ se_m_whirlpool_grp, voicegroup128 + .equ se_m_whirlpool_pri, 4 + .equ se_m_whirlpool_rev, reverb_set+50 + .equ se_m_whirlpool_mvl, 127 + .equ se_m_whirlpool_key, 0 + .equ se_m_whirlpool_tbs, 1 + .equ se_m_whirlpool_exg, 0 + .equ se_m_whirlpool_cmp, 1 .section .rodata - .global se_w250 + .global se_m_whirlpool .align 2 @********************** Track 1 **********************@ -se_w250_1: - .byte KEYSH , se_w250_key+0 - .byte TEMPO , 150*se_w250_tbs/2 +se_m_whirlpool_1: + .byte KEYSH , se_m_whirlpool_key+0 + .byte TEMPO , 150*se_m_whirlpool_tbs/2 .byte VOICE , 36 .byte BENDR , 12 .byte PAN , c_v+0 - .byte VOL , 115*se_w250_mvl/mxv + .byte VOL , 115*se_m_whirlpool_mvl/mxv .byte BEND , c_v-18 .byte TIE , Dn2 , v127 .byte W03 @@ -72,37 +72,37 @@ se_w250_1: .byte W05 .byte PAN , c_v+6 .byte W02 - .byte VOL , 103*se_w250_mvl/mxv + .byte VOL , 103*se_m_whirlpool_mvl/mxv .byte W01 .byte BEND , c_v+0 .byte W03 .byte PAN , c_v+4 .byte W01 - .byte VOL , 85*se_w250_mvl/mxv + .byte VOL , 85*se_m_whirlpool_mvl/mxv .byte W01 .byte BEND , c_v-5 .byte W04 .byte PAN , c_v+0 .byte W01 - .byte VOL , 71*se_w250_mvl/mxv + .byte VOL , 71*se_m_whirlpool_mvl/mxv .byte W02 .byte BEND , c_v-8 .byte W03 - .byte VOL , 52*se_w250_mvl/mxv + .byte VOL , 52*se_m_whirlpool_mvl/mxv .byte PAN , c_v-4 .byte W03 .byte BEND , c_v-12 .byte W01 - .byte VOL , 32*se_w250_mvl/mxv + .byte VOL , 32*se_m_whirlpool_mvl/mxv .byte W02 .byte PAN , c_v-10 .byte W03 - .byte VOL , 11*se_w250_mvl/mxv + .byte VOL , 11*se_m_whirlpool_mvl/mxv .byte BEND , c_v-19 .byte W03 .byte PAN , c_v-15 .byte W01 - .byte VOL , 6*se_w250_mvl/mxv + .byte VOL , 6*se_m_whirlpool_mvl/mxv .byte W01 .byte BEND , c_v-28 .byte W04 @@ -112,14 +112,14 @@ se_w250_1: @******************************************************@ .align 2 -se_w250: +se_m_whirlpool: .byte 1 @ NumTrks .byte 0 @ NumBlks - .byte se_w250_pri @ Priority - .byte se_w250_rev @ Reverb. + .byte se_m_whirlpool_pri @ Priority + .byte se_m_whirlpool_rev @ Reverb. - .word se_w250_grp + .word se_m_whirlpool_grp - .word se_w250_1 + .word se_m_whirlpool_1 .end diff --git a/sound/songs/se_w281.s b/sound/songs/se_m_yawn.s index 21f27203d..c6af1f361 100644 --- a/sound/songs/se_w281.s +++ b/sound/songs/se_m_yawn.s @@ -1,24 +1,24 @@ .include "MPlayDef.s" - .equ se_w281_grp, voicegroup128 - .equ se_w281_pri, 4 - .equ se_w281_rev, reverb_set+50 - .equ se_w281_mvl, 127 - .equ se_w281_key, 0 - .equ se_w281_tbs, 1 - .equ se_w281_exg, 0 - .equ se_w281_cmp, 1 + .equ se_m_yawn_grp, voicegroup128 + .equ se_m_yawn_pri, 4 + .equ se_m_yawn_rev, reverb_set+50 + .equ se_m_yawn_mvl, 127 + .equ se_m_yawn_key, 0 + .equ se_m_yawn_tbs, 1 + .equ se_m_yawn_exg, 0 + .equ se_m_yawn_cmp, 1 .section .rodata - .global se_w281 + .global se_m_yawn .align 2 @********************** Track 1 **********************@ -se_w281_1: - .byte VOL , 110*se_w281_mvl/mxv - .byte KEYSH , se_w281_key+0 - .byte TEMPO , 150*se_w281_tbs/2 +se_m_yawn_1: + .byte VOL , 110*se_m_yawn_mvl/mxv + .byte KEYSH , se_m_yawn_key+0 + .byte TEMPO , 150*se_m_yawn_tbs/2 .byte VOICE , 61 .byte BENDR , 44 .byte PAN , c_v+0 @@ -87,41 +87,41 @@ se_w281_1: @********************** Track 2 **********************@ -se_w281_2: - .byte KEYSH , se_w281_key+0 +se_m_yawn_2: + .byte KEYSH , se_m_yawn_key+0 .byte VOICE , 66 .byte BENDR , 44 .byte PAN , c_v+1 - .byte VOL , 110*se_w281_mvl/mxv + .byte VOL , 110*se_m_yawn_mvl/mxv .byte N48 , Dn3 , v020 .byte W24 .byte W03 - .byte VOL , 103*se_w281_mvl/mxv + .byte VOL , 103*se_m_yawn_mvl/mxv .byte W04 - .byte 96*se_w281_mvl/mxv + .byte 96*se_m_yawn_mvl/mxv .byte W03 - .byte 83*se_w281_mvl/mxv + .byte 83*se_m_yawn_mvl/mxv .byte W04 - .byte 67*se_w281_mvl/mxv + .byte 67*se_m_yawn_mvl/mxv .byte W04 - .byte 49*se_w281_mvl/mxv + .byte 49*se_m_yawn_mvl/mxv .byte W03 - .byte 23*se_w281_mvl/mxv + .byte 23*se_m_yawn_mvl/mxv .byte W03 .byte FINE @******************************************************@ .align 2 -se_w281: +se_m_yawn: .byte 2 @ NumTrks .byte 0 @ NumBlks - .byte se_w281_pri @ Priority - .byte se_w281_rev @ Reverb. + .byte se_m_yawn_pri @ Priority + .byte se_m_yawn_rev @ Reverb. - .word se_w281_grp + .word se_m_yawn_grp - .word se_w281_1 - .word se_w281_2 + .word se_m_yawn_1 + .word se_m_yawn_2 .end diff --git a/sound/songs/se_nawamiss.s b/sound/songs/se_poke_jump_failure.s index 7080819c9..4dc7d109c 100644 --- a/sound/songs/se_nawamiss.s +++ b/sound/songs/se_poke_jump_failure.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_nawamiss + .global se_poke_jump_failure .align 2 - .equ se_nawamiss_grp, voicegroup127 - .equ se_nawamiss_pri, 5 - .equ se_nawamiss_rev, reverb_set+50 + .equ se_poke_jump_failure_grp, voicegroup127 + .equ se_poke_jump_failure_pri, 5 + .equ se_poke_jump_failure_rev, reverb_set+50 -se_nawamiss_1: @ 86BCBD8 +se_poke_jump_failure_1: @ 86BCBD8 .byte KEYSH, 0x00 .byte TEMPO, 0x78 .byte VOICE, 0x5C @@ -39,11 +39,11 @@ se_nawamiss_1: @ 86BCBD8 @ *************************************** .align 2 -se_nawamiss: @ 86BCBFC +se_poke_jump_failure: @ 86BCBFC .byte 1 .byte 0 - .byte se_nawamiss_pri - .byte se_nawamiss_rev - .word se_nawamiss_grp + .byte se_poke_jump_failure_pri + .byte se_poke_jump_failure_rev + .word se_poke_jump_failure_grp - .word se_nawamiss_1 + .word se_poke_jump_failure_1 diff --git a/sound/songs/se_excellent.s b/sound/songs/se_poke_jump_success.s index 157fdeebc..edab733e6 100644 --- a/sound/songs/se_excellent.s +++ b/sound/songs/se_poke_jump_success.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_excellent + .global se_poke_jump_success .align 2 - .equ se_excellent_grp, voicegroup128 - .equ se_excellent_pri, 5 - .equ se_excellent_rev, reverb_set+50 + .equ se_poke_jump_success_grp, voicegroup128 + .equ se_poke_jump_success_pri, 5 + .equ se_poke_jump_success_rev, reverb_set+50 -se_excellent_1: @ 86BCB1C +se_poke_jump_success_1: @ 86BCB1C .byte KEYSH, 0x00 .byte TEMPO, 0x4B .byte VOICE, 0x2E @@ -91,7 +91,7 @@ se_excellent_1: @ 86BCB1C .byte W03 .byte FINE -se_excellent_2: @ 86BCB7B +se_poke_jump_success_2: @ 86BCB7B .byte KEYSH, 0x00 .byte VOICE, 0x35 .byte BENDR, 0x02 @@ -166,12 +166,12 @@ se_excellent_2: @ 86BCB7B @ *************************************** .align 2 -se_excellent: @ 86BCBC8 +se_poke_jump_success: @ 86BCBC8 .byte 2 .byte 0 - .byte se_excellent_pri - .byte se_excellent_rev - .word se_excellent_grp + .byte se_poke_jump_success_pri + .byte se_poke_jump_success_rev + .word se_poke_jump_success_grp - .word se_excellent_1 - .word se_excellent_2 + .word se_poke_jump_success_1 + .word se_poke_jump_success_2 diff --git a/sound/songs/se_kiteki.s b/sound/songs/se_ss_anne_horn.s index e91666b7e..c7ab94801 100644 --- a/sound/songs/se_kiteki.s +++ b/sound/songs/se_ss_anne_horn.s @@ -1,12 +1,12 @@ .include "MPlayDef.s" .section .rodata - .global se_kiteki + .global se_ss_anne_horn .align 2 - .equ se_kiteki_grp, voicegroup129 - .equ se_kiteki_pri, 5 - .equ se_kiteki_rev, reverb_set+50 + .equ se_ss_anne_horn_grp, voicegroup129 + .equ se_ss_anne_horn_pri, 5 + .equ se_ss_anne_horn_rev, reverb_set+50 -se_kiteki_1: @ 86BC854 +se_ss_anne_horn_1: @ 86BC854 .byte KEYSH, 0x00 .byte TEMPO, 0x52 .byte VOICE, 0x09 @@ -99,7 +99,7 @@ se_kiteki_1: @ 86BC854 .byte W06 .byte FINE -se_kiteki_2: @ 86BC8CB +se_ss_anne_horn_2: @ 86BC8CB .byte KEYSH, 0x00 .byte VOICE, 0x51 .byte PAN, 0x40 @@ -147,12 +147,12 @@ se_kiteki_2: @ 86BC8CB @ *************************************** .align 2 -se_kiteki: @ 86BC900 +se_ss_anne_horn: @ 86BC900 .byte 2 .byte 0 - .byte se_kiteki_pri - .byte se_kiteki_rev - .word se_kiteki_grp + .byte se_ss_anne_horn_pri + .byte se_ss_anne_horn_rev + .word se_ss_anne_horn_grp - .word se_kiteki_1 - .word se_kiteki_2 + .word se_ss_anne_horn_1 + .word se_ss_anne_horn_2 diff --git a/sound/songs/se_w052.s b/sound/songs/se_w052.s deleted file mode 100644 index 50529af91..000000000 --- a/sound/songs/se_w052.s +++ /dev/null @@ -1,61 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w052_grp, voicegroup128 - .equ se_w052_pri, 4 - .equ se_w052_rev, reverb_set+50 - .equ se_w052_mvl, 127 - .equ se_w052_key, 0 - .equ se_w052_tbs, 1 - .equ se_w052_exg, 0 - .equ se_w052_cmp, 1 - - .section .rodata - .global se_w052 - .align 2 - -@********************** Track 1 **********************@ - -se_w052_1: - .byte KEYSH , se_w052_key+0 - .byte TEMPO , 150*se_w052_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 61*se_w052_mvl/mxv - .byte BEND , c_v+8 - .byte N10 , Gn3 , v127 - .byte W01 - .byte VOL , 84*se_w052_mvl/mxv - .byte W01 - .byte 97*se_w052_mvl/mxv - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 110*se_w052_mvl/mxv - .byte W01 - .byte BEND , c_v+7 - .byte W02 - .byte c_v-12 - .byte W01 - .byte VOL , 89*se_w052_mvl/mxv - .byte W01 - .byte 64*se_w052_mvl/mxv - .byte BEND , c_v-42 - .byte W01 - .byte VOL , 34*se_w052_mvl/mxv - .byte W15 - .byte FINE - -@******************************************************@ - .align 2 - -se_w052: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w052_pri @ Priority - .byte se_w052_rev @ Reverb. - - .word se_w052_grp - - .word se_w052_1 - - .end diff --git a/sound/songs/se_w059b.s b/sound/songs/se_w059b.s deleted file mode 100644 index f12762957..000000000 --- a/sound/songs/se_w059b.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w059b_grp, voicegroup128 - .equ se_w059b_pri, 4 - .equ se_w059b_rev, reverb_set+50 - .equ se_w059b_mvl, 127 - .equ se_w059b_key, 0 - .equ se_w059b_tbs, 1 - .equ se_w059b_exg, 0 - .equ se_w059b_cmp, 1 - - .section .rodata - .global se_w059b - .align 2 - -@********************** Track 1 **********************@ - -se_w059b_1: - .byte KEYSH , se_w059b_key+0 - .byte TEMPO , 150*se_w059b_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w059b_mvl/mxv - .byte BEND , c_v+0 - .byte N24 , Gn3 , v108 - .byte W02 - .byte PAN , c_v-19 - .byte W04 - .byte c_v+0 - .byte W01 - .byte VOL , 97*se_w059b_mvl/mxv - .byte W01 - .byte PAN , c_v+16 - .byte W01 - .byte VOL , 84*se_w059b_mvl/mxv - .byte W03 - .byte 76*se_w059b_mvl/mxv - .byte PAN , c_v+2 - .byte W02 - .byte VOL , 55*se_w059b_mvl/mxv - .byte PAN , c_v-8 - .byte W02 - .byte VOL , 39*se_w059b_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 25*se_w059b_mvl/mxv - .byte W01 - .byte PAN , c_v+8 - .byte W01 - .byte VOL , 13*se_w059b_mvl/mxv - .byte W03 - .byte 7*se_w059b_mvl/mxv - .byte PAN , c_v+0 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_w059b: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w059b_pri @ Priority - .byte se_w059b_rev @ Reverb. - - .word se_w059b_grp - - .word se_w059b_1 - - .end diff --git a/sound/songs/se_w062b.s b/sound/songs/se_w062b.s deleted file mode 100644 index 75a04e448..000000000 --- a/sound/songs/se_w062b.s +++ /dev/null @@ -1,131 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w062b_grp, voicegroup128 - .equ se_w062b_pri, 4 - .equ se_w062b_rev, reverb_set+50 - .equ se_w062b_mvl, 127 - .equ se_w062b_key, 0 - .equ se_w062b_tbs, 1 - .equ se_w062b_exg, 0 - .equ se_w062b_cmp, 1 - - .section .rodata - .global se_w062b - .align 2 - -@********************** Track 1 **********************@ - -se_w062b_1: - .byte KEYSH , se_w062b_key+0 - .byte TEMPO , 150*se_w062b_tbs/2 - .byte VOICE , 9 - .byte BENDR , 2 - .byte PAN , c_v+0 - .byte VOL , 26*se_w062b_mvl/mxv - .byte BEND , c_v-23 - .byte N09 , Dn5 , v127 - .byte W01 - .byte VOL , 34*se_w062b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 42*se_w062b_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 52*se_w062b_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 72*se_w062b_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-18 - .byte W02 - .byte VOL , 85*se_w062b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-21 - .byte W01 - .byte VOL , 102*se_w062b_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-23 - .byte W01 - .byte VOL , 120*se_w062b_mvl/mxv - .byte BEND , c_v-24 - .byte W02 - .byte VOL , 26*se_w062b_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-23 - .byte N09 , Dn5 , v100 - .byte W02 - .byte VOL , 34*se_w062b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W01 - .byte VOL , 42*se_w062b_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 52*se_w062b_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 72*se_w062b_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 85*se_w062b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-21 - .byte W02 - .byte VOL , 102*se_w062b_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-23 - .byte W01 - .byte VOL , 120*se_w062b_mvl/mxv - .byte BEND , c_v-24 - .byte W02 - .byte VOL , 26*se_w062b_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-23 - .byte N09 , Dn5 , v080 - .byte W01 - .byte VOL , 34*se_w062b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-20 - .byte W02 - .byte VOL , 42*se_w062b_mvl/mxv - .byte PAN , c_v-7 - .byte BEND , c_v-16 - .byte W01 - .byte VOL , 52*se_w062b_mvl/mxv - .byte PAN , c_v+9 - .byte W01 - .byte VOL , 72*se_w062b_mvl/mxv - .byte PAN , c_v-13 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 85*se_w062b_mvl/mxv - .byte PAN , c_v+6 - .byte BEND , c_v-21 - .byte W01 - .byte VOL , 102*se_w062b_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-23 - .byte W02 - .byte VOL , 120*se_w062b_mvl/mxv - .byte BEND , c_v-24 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w062b: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w062b_pri @ Priority - .byte se_w062b_rev @ Reverb. - - .word se_w062b_grp - - .word se_w062b_1 - - .end diff --git a/sound/songs/se_w077.s b/sound/songs/se_w077.s deleted file mode 100644 index 8dd93481a..000000000 --- a/sound/songs/se_w077.s +++ /dev/null @@ -1,58 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w077_grp, voicegroup128 - .equ se_w077_pri, 4 - .equ se_w077_rev, reverb_set+50 - .equ se_w077_mvl, 127 - .equ se_w077_key, 0 - .equ se_w077_tbs, 1 - .equ se_w077_exg, 0 - .equ se_w077_cmp, 1 - - .section .rodata - .global se_w077 - .align 2 - -@********************** Track 1 **********************@ - -se_w077_1: - .byte KEYSH , se_w077_key+0 - .byte TEMPO , 150*se_w077_tbs/2 - .byte VOICE , 18 - .byte BENDR , 12 - .byte VOL , 55*se_w077_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte N01 , Cn6 , v100 - .byte W01 - .byte VOL , 110*se_w077_mvl/mxv - .byte W01 - .byte VOICE , 36 - .byte VOL , 55*se_w077_mvl/mxv - .byte N02 , Gn6 , v080 - .byte W01 - .byte VOL , 110*se_w077_mvl/mxv - .byte W04 - .byte PAN , c_v+20 - .byte N01 , Gn6 , v024 - .byte W03 - .byte Gn6 , v016 - .byte W02 - .byte PAN , c_v-21 - .byte W12 - .byte FINE - -@******************************************************@ - .align 2 - -se_w077: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w077_pri @ Priority - .byte se_w077_rev @ Reverb. - - .word se_w077_grp - - .word se_w077_1 - - .end diff --git a/sound/songs/se_w082.s b/sound/songs/se_w082.s deleted file mode 100644 index 460cdd977..000000000 --- a/sound/songs/se_w082.s +++ /dev/null @@ -1,150 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w082_grp, voicegroup128 - .equ se_w082_pri, 4 - .equ se_w082_rev, reverb_set+50 - .equ se_w082_mvl, 127 - .equ se_w082_key, 0 - .equ se_w082_tbs, 1 - .equ se_w082_exg, 0 - .equ se_w082_cmp, 1 - - .section .rodata - .global se_w082 - .align 2 - -@********************** Track 1 **********************@ - -se_w082_1: - .byte KEYSH , se_w082_key+0 - .byte TEMPO , 150*se_w082_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+5 - .byte VOL , 21*se_w082_mvl/mxv - .byte BEND , c_v+0 - .byte N10 , An2 , v127 - .byte W02 - .byte VOL , 47*se_w082_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 88*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 120*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 21*se_w082_mvl/mxv - .byte BEND , c_v+10 - .byte N10 , Bn2 - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 47*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 88*se_w082_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte VOL , 120*se_w082_mvl/mxv - .byte W03 - .byte PAN , c_v-2 - .byte VOL , 21*se_w082_mvl/mxv - .byte BEND , c_v+18 - .byte N10 , Cs3 - .byte W03 - .byte PAN , c_v+5 - .byte VOL , 47*se_w082_mvl/mxv - .byte W02 - .byte 88*se_w082_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 120*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 20*se_w082_mvl/mxv - .byte BEND , c_v+29 - .byte N10 , Dn3 - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 47*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 88*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 120*se_w082_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 21*se_w082_mvl/mxv - .byte BEND , c_v+37 - .byte N10 , En3 - .byte W02 - .byte PAN , c_v-2 - .byte VOL , 46*se_w082_mvl/mxv - .byte W03 - .byte PAN , c_v+5 - .byte VOL , 102*se_w082_mvl/mxv - .byte W02 - .byte 120*se_w082_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte VOL , 20*se_w082_mvl/mxv - .byte BEND , c_v+42 - .byte N20 , Fs3 - .byte W02 - .byte VOL , 47*se_w082_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 88*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte VOL , 120*se_w082_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 99*se_w082_mvl/mxv - .byte BEND , c_v+50 - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 74*se_w082_mvl/mxv - .byte W01 - .byte BEND , c_v+56 - .byte W01 - .byte PAN , c_v-2 - .byte VOL , 53*se_w082_mvl/mxv - .byte W03 - .byte 34*se_w082_mvl/mxv - .byte BEND , c_v+63 - .byte W01 - .byte VOL , 15*se_w082_mvl/mxv - .byte W23 - .byte FINE - -@******************************************************@ - .align 2 - -se_w082: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w082_pri @ Priority - .byte se_w082_rev @ Reverb. - - .word se_w082_grp - - .word se_w082_1 - - .end diff --git a/sound/songs/se_w104.s b/sound/songs/se_w104.s deleted file mode 100644 index a93b52abe..000000000 --- a/sound/songs/se_w104.s +++ /dev/null @@ -1,71 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w104_grp, voicegroup128 - .equ se_w104_pri, 4 - .equ se_w104_rev, reverb_set+50 - .equ se_w104_mvl, 127 - .equ se_w104_key, 0 - .equ se_w104_tbs, 1 - .equ se_w104_exg, 0 - .equ se_w104_cmp, 1 - - .section .rodata - .global se_w104 - .align 2 - -@********************** Track 1 **********************@ - -se_w104_1: - .byte KEYSH , se_w104_key+0 - .byte TEMPO , 150*se_w104_tbs/2 - .byte VOICE , 22 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w104_mvl/mxv - .byte BEND , c_v-18 - .byte N19 , Dn3 , v108 - .byte W02 - .byte BEND , c_v-7 - .byte W01 - .byte VOL , 101*se_w104_mvl/mxv - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v+8 - .byte W02 - .byte VOL , 84*se_w104_mvl/mxv - .byte BEND , c_v+4 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 64*se_w104_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v+8 - .byte W02 - .byte VOL , 45*se_w104_mvl/mxv - .byte BEND , c_v-31 - .byte W02 - .byte VOL , 32*se_w104_mvl/mxv - .byte PAN , c_v+0 - .byte W01 - .byte VOICE , 2 - .byte W01 - .byte VOL , 13*se_w104_mvl/mxv - .byte BEND , c_v-52 - .byte W08 - .byte FINE - -@******************************************************@ - .align 2 - -se_w104: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w104_pri @ Priority - .byte se_w104_rev @ Reverb. - - .word se_w104_grp - - .word se_w104_1 - - .end diff --git a/sound/songs/se_w112.s b/sound/songs/se_w112.s deleted file mode 100644 index 3b741aa41..000000000 --- a/sound/songs/se_w112.s +++ /dev/null @@ -1,276 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w112_grp, voicegroup128 - .equ se_w112_pri, 4 - .equ se_w112_rev, reverb_set+50 - .equ se_w112_mvl, 127 - .equ se_w112_key, 0 - .equ se_w112_tbs, 1 - .equ se_w112_exg, 0 - .equ se_w112_cmp, 1 - - .section .rodata - .global se_w112 - .align 2 - -@********************** Track 1 **********************@ - -se_w112_1: - .byte KEYSH , se_w112_key+0 - .byte TEMPO , 150*se_w112_tbs/2 - .byte VOICE , 19 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v+3 - .byte N06 , Cn6 , v088 - .byte W01 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-8 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-17 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-34 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-45 - .byte W02 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v+0 - .byte N06 , Cn6 , v084 - .byte W01 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-37 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-47 - .byte W02 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-1 - .byte N06 , Cn6 , v076 - .byte W01 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-1 - .byte N06 , Cn6 , v064 - .byte W01 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-21 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-48 - .byte W02 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v056 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v044 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-12 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v036 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte PAN , c_v+0 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-2 - .byte N06 , Cn6 , v028 - .byte W01 - .byte PAN , c_v+5 - .byte VOL , 88*se_w112_mvl/mxv - .byte BEND , c_v-13 - .byte W01 - .byte PAN , c_v-6 - .byte VOL , 56*se_w112_mvl/mxv - .byte BEND , c_v-22 - .byte W01 - .byte PAN , c_v+8 - .byte VOL , 24*se_w112_mvl/mxv - .byte BEND , c_v-39 - .byte W01 - .byte PAN , c_v-10 - .byte VOL , 11*se_w112_mvl/mxv - .byte BEND , c_v-49 - .byte W02 - .byte W06 - .byte FINE - -@********************** Track 2 **********************@ - -se_w112_2: - .byte KEYSH , se_w112_key+0 - .byte VOICE , 53 - .byte PAN , c_v+0 - .byte VOL , 95*se_w112_mvl/mxv - .byte BEND , c_v-5 - .byte W02 - .byte N06 , An5 , v064 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 - .byte 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W01 - .byte 95*se_w112_mvl/mxv - .byte N06 , An5 , v056 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 -se_w112_2_000: - .byte VOL , 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W01 - .byte 95*se_w112_mvl/mxv - .byte N06 , An5 , v052 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 - .byte PEND - .byte PATT - .word se_w112_2_000 - .byte VOL , 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W01 - .byte 95*se_w112_mvl/mxv - .byte N06 , An5 , v048 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 - .byte 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W01 - .byte 95*se_w112_mvl/mxv - .byte N06 , An5 , v044 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 - .byte 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W01 - .byte 95*se_w112_mvl/mxv - .byte N06 , An5 , v040 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 - .byte 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W01 - .byte 95*se_w112_mvl/mxv - .byte N06 , An5 , v036 - .byte W02 - .byte VOL , 88*se_w112_mvl/mxv - .byte W02 - .byte 56*se_w112_mvl/mxv - .byte W01 - .byte 24*se_w112_mvl/mxv - .byte W05 - .byte FINE - -@******************************************************@ - .align 2 - -se_w112: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w112_pri @ Priority - .byte se_w112_rev @ Reverb. - - .word se_w112_grp - - .word se_w112_1 - .word se_w112_2 - - .end diff --git a/sound/songs/se_w120.s b/sound/songs/se_w120.s deleted file mode 100644 index e86fac991..000000000 --- a/sound/songs/se_w120.s +++ /dev/null @@ -1,74 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w120_grp, voicegroup128 - .equ se_w120_pri, 4 - .equ se_w120_rev, reverb_set+50 - .equ se_w120_mvl, 127 - .equ se_w120_key, 0 - .equ se_w120_tbs, 1 - .equ se_w120_exg, 0 - .equ se_w120_cmp, 1 - - .section .rodata - .global se_w120 - .align 2 - -@********************** Track 1 **********************@ - -se_w120_1: - .byte KEYSH , se_w120_key+0 - .byte TEMPO , 150*se_w120_tbs/2 - .byte VOICE , 41 - .byte VOL , 115*se_w120_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Gn3 , v127 - .byte W01 - .byte Cn3 - .byte W01 - .byte N24 , An3 - .byte W06 - .byte PAN , c_v+6 - .byte W04 - .byte c_v+0 - .byte W01 - .byte VOL , 102*se_w120_mvl/mxv - .byte W02 - .byte PAN , c_v-8 - .byte VOL , 88*se_w120_mvl/mxv - .byte W03 - .byte 78*se_w120_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 67*se_w120_mvl/mxv - .byte W01 - .byte BEND , c_v-2 - .byte W01 - .byte PAN , c_v+7 - .byte VOL , 45*se_w120_mvl/mxv - .byte W02 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 13*se_w120_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-15 - .byte W22 - .byte FINE - -@******************************************************@ - .align 2 - -se_w120: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w120_pri @ Priority - .byte se_w120_rev @ Reverb. - - .word se_w120_grp - - .word se_w120_1 - - .end diff --git a/sound/songs/se_w145b.s b/sound/songs/se_w145b.s deleted file mode 100644 index d076bd331..000000000 --- a/sound/songs/se_w145b.s +++ /dev/null @@ -1,60 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w145b_grp, voicegroup128 - .equ se_w145b_pri, 4 - .equ se_w145b_rev, reverb_set+50 - .equ se_w145b_mvl, 127 - .equ se_w145b_key, 0 - .equ se_w145b_tbs, 1 - .equ se_w145b_exg, 0 - .equ se_w145b_cmp, 1 - - .section .rodata - .global se_w145b - .align 2 - -@********************** Track 1 **********************@ - -se_w145b_1: - .byte KEYSH , se_w145b_key+0 - .byte TEMPO , 220*se_w145b_tbs/2 - .byte VOICE , 24 - .byte VOL , 110*se_w145b_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte W03 - .byte N09 , Gn4 , v127 - .byte W02 - .byte BEND , c_v+31 - .byte W02 - .byte c_v-34 - .byte W17 - .byte FINE - -@********************** Track 2 **********************@ - -se_w145b_2: - .byte KEYSH , se_w145b_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_w145b_mvl/mxv - .byte PAN , c_v+0 - .byte N01 , Cn4 , v044 - .byte W24 - .byte FINE - -@******************************************************@ - .align 2 - -se_w145b: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w145b_pri @ Priority - .byte se_w145b_rev @ Reverb. - - .word se_w145b_grp - - .word se_w145b_1 - .word se_w145b_2 - - .end diff --git a/sound/songs/se_w146.s b/sound/songs/se_w146.s deleted file mode 100644 index 824c66ac3..000000000 --- a/sound/songs/se_w146.s +++ /dev/null @@ -1,79 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w146_grp, voicegroup128 - .equ se_w146_pri, 4 - .equ se_w146_rev, reverb_set+50 - .equ se_w146_mvl, 127 - .equ se_w146_key, 0 - .equ se_w146_tbs, 1 - .equ se_w146_exg, 0 - .equ se_w146_cmp, 1 - - .section .rodata - .global se_w146 - .align 2 - -@********************** Track 1 **********************@ - -se_w146_1: - .byte KEYSH , se_w146_key+0 - .byte TEMPO , 150*se_w146_tbs/2 - .byte VOICE , 19 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 5*se_w146_mvl/mxv - .byte BEND , c_v+0 - .byte N07 , Bn5 , v080 - .byte W01 - .byte VOL , 55*se_w146_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+3 - .byte W01 - .byte VOL , 67*se_w146_mvl/mxv - .byte PAN , c_v+22 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 90*se_w146_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-6 - .byte W01 - .byte PAN , c_v-12 - .byte BEND , c_v-14 - .byte W02 - .byte VOL , 4*se_w146_mvl/mxv - .byte PAN , c_v-22 - .byte BEND , c_v-23 - .byte W01 - .byte PAN , c_v-13 - .byte BEND , c_v+0 - .byte N04 , Cn6 - .byte W01 - .byte VOL , 66*se_w146_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+1 - .byte W01 - .byte VOL , 90*se_w146_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v+3 - .byte W01 - .byte VOL , 4*se_w146_mvl/mxv - .byte PAN , c_v+21 - .byte BEND , c_v+5 - .byte W14 - .byte VOL , 90*se_w146_mvl/mxv - .byte FINE - -@******************************************************@ - .align 2 - -se_w146: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w146_pri @ Priority - .byte se_w146_rev @ Reverb. - - .word se_w146_grp - - .word se_w146_1 - - .end diff --git a/sound/songs/se_w166.s b/sound/songs/se_w166.s deleted file mode 100644 index afbe08f08..000000000 --- a/sound/songs/se_w166.s +++ /dev/null @@ -1,68 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w166_grp, voicegroup128 - .equ se_w166_pri, 4 - .equ se_w166_rev, reverb_set+50 - .equ se_w166_mvl, 127 - .equ se_w166_key, 0 - .equ se_w166_tbs, 1 - .equ se_w166_exg, 0 - .equ se_w166_cmp, 1 - - .section .rodata - .global se_w166 - .align 2 - -@********************** Track 1 **********************@ - -se_w166_1: - .byte KEYSH , se_w166_key+0 - .byte TEMPO , 180*se_w166_tbs/2 - .byte VOICE , 38 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w166_mvl/mxv - .byte BEND , c_v+0 - .byte N02 , Gn4 , v127 - .byte W01 - .byte VOL , 74*se_w166_mvl/mxv - .byte BEND , c_v-11 - .byte W01 - .byte VOICE , 31 - .byte VOL , 40*se_w166_mvl/mxv - .byte BEND , c_v-1 - .byte N03 , Cs5 - .byte W01 - .byte VOL , 64*se_w166_mvl/mxv - .byte PAN , c_v-6 - .byte BEND , c_v-12 - .byte W01 - .byte VOL , 86*se_w166_mvl/mxv - .byte PAN , c_v+4 - .byte BEND , c_v-16 - .byte W02 - .byte VOL , 110*se_w166_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N02 , As5 - .byte W01 - .byte BEND , c_v+12 - .byte W01 - .byte VOL , 0*se_w166_mvl/mxv - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_w166: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w166_pri @ Priority - .byte se_w166_rev @ Reverb. - - .word se_w166_grp - - .word se_w166_1 - - .end diff --git a/sound/songs/se_w172.s b/sound/songs/se_w172.s deleted file mode 100644 index 0c5ae6754..000000000 --- a/sound/songs/se_w172.s +++ /dev/null @@ -1,124 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w172_grp, voicegroup128 - .equ se_w172_pri, 4 - .equ se_w172_rev, reverb_set+50 - .equ se_w172_mvl, 127 - .equ se_w172_key, 0 - .equ se_w172_tbs, 1 - .equ se_w172_exg, 0 - .equ se_w172_cmp, 1 - - .section .rodata - .global se_w172 - .align 2 - -@********************** Track 1 **********************@ - -se_w172_1: - .byte KEYSH , se_w172_key+0 - .byte TEMPO , 150*se_w172_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 22*se_w172_mvl/mxv - .byte BEND , c_v+0 - .byte N30 , Dn4 , v127 - .byte W01 - .byte VOL , 49*se_w172_mvl/mxv - .byte W01 - .byte 71*se_w172_mvl/mxv - .byte W01 - .byte 95*se_w172_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 110*se_w172_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte BEND , c_v+16 - .byte W01 - .byte VOL , 95*se_w172_mvl/mxv - .byte W02 - .byte 88*se_w172_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+7 - .byte W01 - .byte VOL , 93*se_w172_mvl/mxv - .byte W02 - .byte 110*se_w172_mvl/mxv - .byte PAN , c_v-5 - .byte BEND , c_v+0 - .byte W02 - .byte VOL , 86*se_w172_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte BEND , c_v-9 - .byte W01 - .byte VOL , 63*se_w172_mvl/mxv - .byte W02 - .byte 37*se_w172_mvl/mxv - .byte BEND , c_v-24 - .byte W03 - .byte VOL , 13*se_w172_mvl/mxv - .byte BEND , c_v-46 - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_w172_2: - .byte KEYSH , se_w172_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 22*se_w172_mvl/mxv - .byte N30 , Gn2 , v032 - .byte W01 - .byte VOL , 49*se_w172_mvl/mxv - .byte W01 - .byte 71*se_w172_mvl/mxv - .byte W01 - .byte 95*se_w172_mvl/mxv - .byte W01 - .byte 110*se_w172_mvl/mxv - .byte W02 - .byte W01 - .byte 95*se_w172_mvl/mxv - .byte W02 - .byte 88*se_w172_mvl/mxv - .byte W01 - .byte 93*se_w172_mvl/mxv - .byte W02 - .byte 110*se_w172_mvl/mxv - .byte W02 - .byte 86*se_w172_mvl/mxv - .byte W01 - .byte W01 - .byte 63*se_w172_mvl/mxv - .byte W02 - .byte 37*se_w172_mvl/mxv - .byte W03 - .byte 13*se_w172_mvl/mxv - .byte W03 - .byte W03 - .byte W03 - .byte W03 - .byte FINE - -@******************************************************@ - .align 2 - -se_w172: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w172_pri @ Priority - .byte se_w172_rev @ Reverb. - - .word se_w172_grp - - .word se_w172_1 - .word se_w172_2 - - .end diff --git a/sound/songs/se_w172b.s b/sound/songs/se_w172b.s deleted file mode 100644 index 1d4369b00..000000000 --- a/sound/songs/se_w172b.s +++ /dev/null @@ -1,99 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w172b_grp, voicegroup128 - .equ se_w172b_pri, 4 - .equ se_w172b_rev, reverb_set+50 - .equ se_w172b_mvl, 127 - .equ se_w172b_key, 0 - .equ se_w172b_tbs, 1 - .equ se_w172b_exg, 0 - .equ se_w172b_cmp, 1 - - .section .rodata - .global se_w172b - .align 2 - -@********************** Track 1 **********************@ - -se_w172b_1: - .byte KEYSH , se_w172b_key+0 - .byte TEMPO , 150*se_w172b_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 110*se_w172b_mvl/mxv - .byte BEND , c_v+0 - .byte N48 , Cn4 , v127 - .byte W06 - .byte PAN , c_v+4 - .byte W03 - .byte BEND , c_v+2 - .byte W03 - .byte PAN , c_v+10 - .byte W03 - .byte BEND , c_v+5 - .byte W03 - .byte VOL , 98*se_w172b_mvl/mxv - .byte PAN , c_v+4 - .byte W03 - .byte BEND , c_v+3 - .byte W03 - .byte VOL , 88*se_w172b_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-5 - .byte W03 - .byte VOL , 68*se_w172b_mvl/mxv - .byte PAN , c_v-5 - .byte W03 - .byte c_v+7 - .byte BEND , c_v-9 - .byte W03 - .byte VOL , 44*se_w172b_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte BEND , c_v-15 - .byte W03 - .byte VOL , 13*se_w172b_mvl/mxv - .byte BEND , c_v-24 - .byte W03 - .byte c_v-40 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_w172b_2: - .byte KEYSH , se_w172b_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 110*se_w172b_mvl/mxv - .byte N48 , Gn2 , v032 - .byte W18 - .byte VOL , 98*se_w172b_mvl/mxv - .byte W06 - .byte 88*se_w172b_mvl/mxv - .byte W06 - .byte 68*se_w172b_mvl/mxv - .byte W06 - .byte 44*se_w172b_mvl/mxv - .byte W06 - .byte 13*se_w172b_mvl/mxv - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w172b: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w172b_pri @ Priority - .byte se_w172b_rev @ Reverb. - - .word se_w172b_grp - - .word se_w172b_1 - .word se_w172b_2 - - .end diff --git a/sound/songs/se_w187.s b/sound/songs/se_w187.s deleted file mode 100644 index d6c27b89c..000000000 --- a/sound/songs/se_w187.s +++ /dev/null @@ -1,72 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w187_grp, voicegroup128 - .equ se_w187_pri, 4 - .equ se_w187_rev, reverb_set+50 - .equ se_w187_mvl, 127 - .equ se_w187_key, 0 - .equ se_w187_tbs, 1 - .equ se_w187_exg, 0 - .equ se_w187_cmp, 1 - - .section .rodata - .global se_w187 - .align 2 - -@********************** Track 1 **********************@ - -se_w187_1: - .byte KEYSH , se_w187_key+0 - .byte TEMPO , 150*se_w187_tbs/2 - .byte VOICE , 6 - .byte BENDR , 12 - .byte VOL , 115*se_w187_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N19 , An2 , v127 - .byte W01 - .byte BEND , c_v-6 - .byte W01 - .byte c_v-10 - .byte W01 - .byte c_v-14 - .byte W01 - .byte c_v-12 - .byte W02 - .byte c_v-14 - .byte W01 - .byte c_v-18 - .byte W01 - .byte VOL , 108*se_w187_mvl/mxv - .byte BEND , c_v-20 - .byte W01 - .byte c_v-22 - .byte W01 - .byte VOL , 94*se_w187_mvl/mxv - .byte W03 - .byte 78*se_w187_mvl/mxv - .byte W01 - .byte 62*se_w187_mvl/mxv - .byte W01 - .byte 40*se_w187_mvl/mxv - .byte W01 - .byte 27*se_w187_mvl/mxv - .byte W02 - .byte 12*se_w187_mvl/mxv - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w187: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w187_pri @ Priority - .byte se_w187_rev @ Reverb. - - .word se_w187_grp - - .word se_w187_1 - - .end diff --git a/sound/songs/se_w195.s b/sound/songs/se_w195.s deleted file mode 100644 index b78095248..000000000 --- a/sound/songs/se_w195.s +++ /dev/null @@ -1,221 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w195_grp, voicegroup128 - .equ se_w195_pri, 4 - .equ se_w195_rev, reverb_set+50 - .equ se_w195_mvl, 127 - .equ se_w195_key, 0 - .equ se_w195_tbs, 1 - .equ se_w195_exg, 0 - .equ se_w195_cmp, 1 - - .section .rodata - .global se_w195 - .align 2 - -@********************** Track 1 **********************@ - -se_w195_1: - .byte KEYSH , se_w195_key+0 - .byte TEMPO , 100*se_w195_tbs/2 - .byte VOICE , 73 - .byte BENDR , 12 - .byte LFOS , 40 - .byte PAN , c_v+7 - .byte VOL , 25*se_w195_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 29*se_w195_mvl/mxv - .byte W03 - .byte 33*se_w195_mvl/mxv - .byte N48 , An3 , v112 - .byte W03 - .byte VOL , 40*se_w195_mvl/mxv - .byte W01 - .byte PAN , c_v+4 - .byte W02 -se_w195_1_000: - .byte VOL , 45*se_w195_mvl/mxv - .byte MOD , 8 - .byte W03 - .byte VOL , 51*se_w195_mvl/mxv - .byte W03 - .byte PEND -se_w195_1_001: - .byte VOL , 56*se_w195_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte VOL , 62*se_w195_mvl/mxv - .byte W03 - .byte PEND -se_w195_1_002: - .byte VOL , 72*se_w195_mvl/mxv - .byte PAN , c_v-4 - .byte W03 - .byte VOL , 81*se_w195_mvl/mxv - .byte W03 - .byte PEND -se_w195_1_003: - .byte VOL , 92*se_w195_mvl/mxv - .byte PAN , c_v-8 - .byte W03 - .byte VOL , 100*se_w195_mvl/mxv - .byte W03 - .byte PEND - .byte PAN , c_v-4 - .byte W06 - .byte VOL , 82*se_w195_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte VOL , 52*se_w195_mvl/mxv - .byte W03 - .byte 25*se_w195_mvl/mxv - .byte MOD , 0 - .byte PAN , c_v+4 - .byte W03 - .byte VOL , 29*se_w195_mvl/mxv - .byte W01 - .byte PAN , c_v+7 - .byte W02 - .byte VOL , 33*se_w195_mvl/mxv - .byte N72 , Gs3 , v112 - .byte W03 - .byte VOL , 40*se_w195_mvl/mxv - .byte W01 - .byte PAN , c_v+4 - .byte W02 - .byte PATT - .word se_w195_1_000 - .byte PATT - .word se_w195_1_001 - .byte PATT - .word se_w195_1_002 - .byte PATT - .word se_w195_1_003 - .byte PAN , c_v-4 - .byte W06 - .byte c_v+0 - .byte W06 - .byte c_v+4 - .byte W03 - .byte VOL , 87*se_w195_mvl/mxv - .byte W03 - .byte 75*se_w195_mvl/mxv - .byte PAN , c_v+7 - .byte W03 - .byte VOL , 62*se_w195_mvl/mxv - .byte W03 - .byte 48*se_w195_mvl/mxv - .byte PAN , c_v+4 - .byte W03 - .byte VOL , 33*se_w195_mvl/mxv - .byte W03 - .byte 25*se_w195_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W02 - .byte VOL , 10*se_w195_mvl/mxv - .byte W03 - .byte W01 - .byte PAN , c_v-4 - .byte W05 - .byte FINE - -@********************** Track 2 **********************@ - -se_w195_2: - .byte KEYSH , se_w195_key+0 - .byte VOICE , 73 - .byte VOL , 25*se_w195_mvl/mxv - .byte PAN , c_v-17 - .byte N48 , Cn4 , v100 - .byte W03 - .byte VOL , 29*se_w195_mvl/mxv - .byte W03 - .byte 33*se_w195_mvl/mxv - .byte W03 - .byte 40*se_w195_mvl/mxv - .byte W03 -se_w195_2_000: - .byte VOL , 45*se_w195_mvl/mxv - .byte MOD , 8 - .byte W03 - .byte VOL , 51*se_w195_mvl/mxv - .byte W03 - .byte PEND - .byte 56*se_w195_mvl/mxv - .byte W03 - .byte 62*se_w195_mvl/mxv - .byte W03 - .byte 72*se_w195_mvl/mxv - .byte W03 - .byte 81*se_w195_mvl/mxv - .byte W03 - .byte 92*se_w195_mvl/mxv - .byte W03 - .byte 100*se_w195_mvl/mxv - .byte W03 - .byte W06 - .byte 82*se_w195_mvl/mxv - .byte W03 - .byte 52*se_w195_mvl/mxv - .byte W03 - .byte 25*se_w195_mvl/mxv - .byte MOD , 0 - .byte N72 , Bn3 , v100 - .byte W03 - .byte VOL , 29*se_w195_mvl/mxv - .byte W03 - .byte 33*se_w195_mvl/mxv - .byte W03 - .byte 40*se_w195_mvl/mxv - .byte W03 - .byte PATT - .word se_w195_2_000 - .byte VOL , 56*se_w195_mvl/mxv - .byte W03 - .byte 62*se_w195_mvl/mxv - .byte W03 - .byte 72*se_w195_mvl/mxv - .byte W03 - .byte 81*se_w195_mvl/mxv - .byte W03 - .byte 92*se_w195_mvl/mxv - .byte W03 - .byte 100*se_w195_mvl/mxv - .byte W03 - .byte W06 - .byte W06 - .byte W03 - .byte 87*se_w195_mvl/mxv - .byte W03 - .byte 75*se_w195_mvl/mxv - .byte W03 - .byte 62*se_w195_mvl/mxv - .byte W03 - .byte 48*se_w195_mvl/mxv - .byte W03 - .byte 33*se_w195_mvl/mxv - .byte W03 - .byte 25*se_w195_mvl/mxv - .byte W03 - .byte 10*se_w195_mvl/mxv - .byte W03 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w195: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w195_pri @ Priority - .byte se_w195_rev @ Reverb. - - .word se_w195_grp - - .word se_w195_1 - .word se_w195_2 - - .end diff --git a/sound/songs/se_w207.s b/sound/songs/se_w207.s deleted file mode 100644 index 1c0d0475b..000000000 --- a/sound/songs/se_w207.s +++ /dev/null @@ -1,77 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w207_grp, voicegroup128 - .equ se_w207_pri, 4 - .equ se_w207_rev, reverb_set+50 - .equ se_w207_mvl, 127 - .equ se_w207_key, 0 - .equ se_w207_tbs, 1 - .equ se_w207_exg, 0 - .equ se_w207_cmp, 1 - - .section .rodata - .global se_w207 - .align 2 - -@********************** Track 1 **********************@ - -se_w207_1: - .byte KEYSH , se_w207_key+0 - .byte TEMPO , 190*se_w207_tbs/2 - .byte VOICE , 2 - .byte BENDR , 8 - .byte PAN , c_v+0 - .byte VOL , 28*se_w207_mvl/mxv - .byte BEND , c_v+0 - .byte N15 , An1 , v127 - .byte W01 - .byte VOL , 60*se_w207_mvl/mxv - .byte W01 - .byte 111*se_w207_mvl/mxv - .byte W01 - .byte 120*se_w207_mvl/mxv - .byte W01 - .byte BEND , c_v-3 - .byte W02 - .byte PAN , c_v+5 - .byte BEND , c_v-6 - .byte W01 - .byte PAN , c_v-4 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 109*se_w207_mvl/mxv - .byte PAN , c_v+9 - .byte BEND , c_v-10 - .byte W01 - .byte PAN , c_v-9 - .byte BEND , c_v-14 - .byte W01 - .byte VOL , 95*se_w207_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v-19 - .byte W02 - .byte VOL , 71*se_w207_mvl/mxv - .byte BEND , c_v-29 - .byte W01 - .byte VOL , 41*se_w207_mvl/mxv - .byte BEND , c_v-38 - .byte W01 - .byte VOL , 15*se_w207_mvl/mxv - .byte BEND , c_v-52 - .byte W04 - .byte FINE - -@******************************************************@ - .align 2 - -se_w207: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w207_pri @ Priority - .byte se_w207_rev @ Reverb. - - .word se_w207_grp - - .word se_w207_1 - - .end diff --git a/sound/songs/se_w221.s b/sound/songs/se_w221.s deleted file mode 100644 index 68e9d0957..000000000 --- a/sound/songs/se_w221.s +++ /dev/null @@ -1,105 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w221_grp, voicegroup128 - .equ se_w221_pri, 4 - .equ se_w221_rev, reverb_set+50 - .equ se_w221_mvl, 127 - .equ se_w221_key, 0 - .equ se_w221_tbs, 1 - .equ se_w221_exg, 0 - .equ se_w221_cmp, 1 - - .section .rodata - .global se_w221 - .align 2 - -@********************** Track 1 **********************@ - -se_w221_1: - .byte KEYSH , se_w221_key+0 - .byte TEMPO , 150*se_w221_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte VOL , 110*se_w221_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+0 - .byte N04 , Cn3 , v127 - .byte W03 - .byte PAN , c_v+0 - .byte W01 - .byte N18 , Gn4 - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte VOL , 98*se_w221_mvl/mxv - .byte BEND , c_v+2 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 83*se_w221_mvl/mxv - .byte BEND , c_v+6 - .byte W02 - .byte PAN , c_v+5 - .byte W01 - .byte BEND , c_v+9 - .byte W01 - .byte VOL , 63*se_w221_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W01 - .byte BEND , c_v+13 - .byte W02 - .byte VOL , 44*se_w221_mvl/mxv - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 28*se_w221_mvl/mxv - .byte BEND , c_v+20 - .byte W01 - .byte PAN , c_v-2 - .byte W01 - .byte VOL , 12*se_w221_mvl/mxv - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_w221_2: - .byte KEYSH , se_w221_key+0 - .byte VOICE , 27 - .byte PAN , c_v+0 - .byte VOL , 110*se_w221_mvl/mxv - .byte N01 , Gn2 , v032 - .byte W02 - .byte N01 - .byte W02 - .byte N18 - .byte W03 - .byte VOL , 98*se_w221_mvl/mxv - .byte W03 - .byte 83*se_w221_mvl/mxv - .byte W04 - .byte 63*se_w221_mvl/mxv - .byte W04 - .byte 44*se_w221_mvl/mxv - .byte W02 - .byte 28*se_w221_mvl/mxv - .byte W02 - .byte 12*se_w221_mvl/mxv - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_w221: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w221_pri @ Priority - .byte se_w221_rev @ Reverb. - - .word se_w221_grp - - .word se_w221_1 - .word se_w221_2 - - .end diff --git a/sound/songs/se_w221b.s b/sound/songs/se_w221b.s deleted file mode 100644 index ed0120acf..000000000 --- a/sound/songs/se_w221b.s +++ /dev/null @@ -1,180 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w221b_grp, voicegroup128 - .equ se_w221b_pri, 4 - .equ se_w221b_rev, reverb_set+50 - .equ se_w221b_mvl, 127 - .equ se_w221b_key, 0 - .equ se_w221b_tbs, 1 - .equ se_w221b_exg, 0 - .equ se_w221b_cmp, 1 - - .section .rodata - .global se_w221b - .align 2 - -@********************** Track 1 **********************@ - -se_w221b_1: - .byte KEYSH , se_w221b_key+0 - .byte TEMPO , 150*se_w221b_tbs/2 - .byte VOICE , 29 - .byte BENDR , 12 - .byte VOL , 22*se_w221b_mvl/mxv - .byte PAN , c_v+5 - .byte BEND , c_v+0 - .byte N96 , Gn3 , v127 - .byte W01 - .byte VOL , 49*se_w221b_mvl/mxv - .byte W01 - .byte 71*se_w221b_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte VOL , 95*se_w221b_mvl/mxv - .byte BEND , c_v+8 - .byte W01 - .byte VOL , 110*se_w221b_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte BEND , c_v+16 - .byte W03 - .byte VOL , 97*se_w221b_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+7 - .byte W03 - .byte PAN , c_v+5 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 84*se_w221b_mvl/mxv - .byte W02 - .byte PAN , c_v+0 - .byte BEND , c_v-9 - .byte W03 - .byte VOL , 76*se_w221b_mvl/mxv - .byte PAN , c_v-5 - .byte BEND , c_v-24 - .byte W03 - .byte PAN , c_v-2 - .byte BEND , c_v-46 - .byte W03 - .byte VOL , 84*se_w221b_mvl/mxv - .byte PAN , c_v+5 - .byte W03 - .byte c_v+0 - .byte W01 - .byte VOL , 92*se_w221b_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W01 - .byte BEND , c_v-32 - .byte W02 - .byte PAN , c_v+0 - .byte W01 - .byte VOL , 86*se_w221b_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W02 - .byte BEND , c_v-18 - .byte W01 - .byte VOL , 78*se_w221b_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte W02 - .byte VOL , 71*se_w221b_mvl/mxv - .byte W01 - .byte PAN , c_v-2 - .byte W03 - .byte c_v+5 - .byte W03 - .byte c_v+0 - .byte VOL , 78*se_w221b_mvl/mxv - .byte W03 - .byte PAN , c_v-5 - .byte W02 - .byte VOL , 86*se_w221b_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v+5 - .byte W02 - .byte VOL , 90*se_w221b_mvl/mxv - .byte W01 - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte W03 - .byte c_v-2 - .byte W01 - .byte VOL , 80*se_w221b_mvl/mxv - .byte W02 - .byte PAN , c_v+5 - .byte W03 - .byte c_v+0 - .byte W01 - .byte VOL , 86*se_w221b_mvl/mxv - .byte W02 - .byte PAN , c_v-5 - .byte W03 - .byte c_v+0 - .byte VOL , 83*se_w221b_mvl/mxv - .byte W03 - .byte PAN , c_v+5 - .byte VOL , 63*se_w221b_mvl/mxv - .byte W03 - .byte 37*se_w221b_mvl/mxv - .byte PAN , c_v+0 - .byte W03 - .byte c_v-5 - .byte VOL , 13*se_w221b_mvl/mxv - .byte W03 - .byte PAN , c_v-2 - .byte W03 - .byte FINE - -@********************** Track 2 **********************@ - -se_w221b_2: - .byte KEYSH , se_w221b_key+0 - .byte VOICE , 27 - .byte VOL , 22*se_w221b_mvl/mxv - .byte N96 , Gn2 , v032 - .byte W01 - .byte VOL , 49*se_w221b_mvl/mxv - .byte W01 - .byte 71*se_w221b_mvl/mxv - .byte W01 - .byte 95*se_w221b_mvl/mxv - .byte W01 - .byte 110*se_w221b_mvl/mxv - .byte W05 - .byte 97*se_w221b_mvl/mxv - .byte W15 - .byte W24 - .byte W24 - .byte W09 - .byte 83*se_w221b_mvl/mxv - .byte W03 - .byte 63*se_w221b_mvl/mxv - .byte W03 - .byte 37*se_w221b_mvl/mxv - .byte W03 - .byte 13*se_w221b_mvl/mxv - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w221b: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w221b_pri @ Priority - .byte se_w221b_rev @ Reverb. - - .word se_w221b_grp - - .word se_w221b_1 - .word se_w221b_2 - - .end diff --git a/sound/songs/se_w233.s b/sound/songs/se_w233.s deleted file mode 100644 index 84381fc0e..000000000 --- a/sound/songs/se_w233.s +++ /dev/null @@ -1,75 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w233_grp, voicegroup128 - .equ se_w233_pri, 4 - .equ se_w233_rev, reverb_set+50 - .equ se_w233_mvl, 127 - .equ se_w233_key, 0 - .equ se_w233_tbs, 1 - .equ se_w233_exg, 0 - .equ se_w233_cmp, 1 - - .section .rodata - .global se_w233 - .align 2 - -@********************** Track 1 **********************@ - -se_w233_1: - .byte KEYSH , se_w233_key+0 - .byte TEMPO , 220*se_w233_tbs/2 - .byte VOICE , 22 - .byte VOL , 110*se_w233_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+16 - .byte BEND , c_v+46 - .byte N09 , Cn3 , v127 - .byte W03 - .byte VOL , 104*se_w233_mvl/mxv - .byte PAN , c_v+0 - .byte BEND , c_v+23 - .byte W03 - .byte VOL , 93*se_w233_mvl/mxv - .byte PAN , c_v-16 - .byte BEND , c_v-15 - .byte W03 - .byte VOICE , 21 - .byte VOL , 110*se_w233_mvl/mxv - .byte BEND , c_v+0 - .byte N03 , Gn4 - .byte W06 - .byte PAN , c_v+16 - .byte N03 , Cn5 - .byte W09 - .byte FINE - -@********************** Track 2 **********************@ - -se_w233_2: - .byte KEYSH , se_w233_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_w233_mvl/mxv - .byte W09 - .byte PAN , c_v+8 - .byte N03 , Cn3 , v052 - .byte W06 - .byte PAN , c_v-7 - .byte N03 - .byte W09 - .byte FINE - -@******************************************************@ - .align 2 - -se_w233: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w233_pri @ Priority - .byte se_w233_rev @ Reverb. - - .word se_w233_grp - - .word se_w233_1 - .word se_w233_2 - - .end diff --git a/sound/songs/se_w240.s b/sound/songs/se_w240.s deleted file mode 100644 index 744cc3b88..000000000 --- a/sound/songs/se_w240.s +++ /dev/null @@ -1,116 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w240_grp, voicegroup128 - .equ se_w240_pri, 4 - .equ se_w240_rev, reverb_set+50 - .equ se_w240_mvl, 127 - .equ se_w240_key, 0 - .equ se_w240_tbs, 1 - .equ se_w240_exg, 0 - .equ se_w240_cmp, 1 - - .section .rodata - .global se_w240 - .align 2 - -@********************** Track 1 **********************@ - -se_w240_1: - .byte KEYSH , se_w240_key+0 - .byte TEMPO , 220*se_w240_tbs/2 - .byte VOICE , 36 - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte VOL , 20*se_w240_mvl/mxv - .byte BEND , c_v+0 - .byte TIE , Gn3 , v064 - .byte W03 - .byte VOL , 37*se_w240_mvl/mxv - .byte W03 - .byte 53*se_w240_mvl/mxv - .byte W03 - .byte 60*se_w240_mvl/mxv - .byte W03 - .byte 71*se_w240_mvl/mxv - .byte W03 - .byte 81*se_w240_mvl/mxv - .byte W03 - .byte 93*se_w240_mvl/mxv - .byte W03 - .byte 110*se_w240_mvl/mxv - .byte W03 - .byte PAN , c_v+3 - .byte W06 - .byte c_v+11 - .byte W12 - .byte c_v+20 - .byte W06 - .byte c_v+25 - .byte W12 - .byte c_v+14 - .byte W06 - .byte c_v+8 - .byte W06 - .byte W06 - .byte c_v-3 - .byte W12 - .byte c_v-16 - .byte W06 - .byte W06 - .byte c_v-26 - .byte W12 - .byte c_v-16 - .byte W06 - .byte VOL , 104*se_w240_mvl/mxv - .byte PAN , c_v-5 - .byte W03 - .byte VOL , 101*se_w240_mvl/mxv - .byte W03 - .byte 98*se_w240_mvl/mxv - .byte PAN , c_v+6 - .byte W03 - .byte VOL , 93*se_w240_mvl/mxv - .byte W03 - .byte 90*se_w240_mvl/mxv - .byte PAN , c_v+14 - .byte W03 - .byte VOL , 86*se_w240_mvl/mxv - .byte W03 - .byte 83*se_w240_mvl/mxv - .byte W03 - .byte 77*se_w240_mvl/mxv - .byte W03 - .byte 73*se_w240_mvl/mxv - .byte PAN , c_v+24 - .byte W03 - .byte VOL , 66*se_w240_mvl/mxv - .byte W03 - .byte 58*se_w240_mvl/mxv - .byte W03 - .byte 44*se_w240_mvl/mxv - .byte W03 - .byte 32*se_w240_mvl/mxv - .byte PAN , c_v+15 - .byte W03 - .byte VOL , 16*se_w240_mvl/mxv - .byte W03 - .byte 1*se_w240_mvl/mxv - .byte PAN , c_v+4 - .byte W06 - .byte EOT - .byte FINE - -@******************************************************@ - .align 2 - -se_w240: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w240_pri @ Priority - .byte se_w240_rev @ Reverb. - - .word se_w240_grp - - .word se_w240_1 - - .end diff --git a/sound/songs/se_w260.s b/sound/songs/se_w260.s deleted file mode 100644 index 70e58fda1..000000000 --- a/sound/songs/se_w260.s +++ /dev/null @@ -1,67 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w260_grp, voicegroup128 - .equ se_w260_pri, 4 - .equ se_w260_rev, reverb_set+50 - .equ se_w260_mvl, 127 - .equ se_w260_key, 0 - .equ se_w260_tbs, 1 - .equ se_w260_exg, 0 - .equ se_w260_cmp, 1 - - .section .rodata - .global se_w260 - .align 2 - -@********************** Track 1 **********************@ - -se_w260_1: - .byte KEYSH , se_w260_key+0 - .byte TEMPO , 150*se_w260_tbs/2 - .byte VOICE , 41 - .byte VOL , 100*se_w260_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+0 - .byte BEND , c_v+0 - .byte N01 , Dn5 , v127 - .byte W01 - .byte Gn4 - .byte W01 - .byte N09 , En5 - .byte W02 - .byte PAN , c_v+6 - .byte W02 - .byte VOL , 92*se_w260_mvl/mxv - .byte PAN , c_v-8 - .byte W01 - .byte VOL , 83*se_w260_mvl/mxv - .byte PAN , c_v+6 - .byte W01 - .byte VOL , 71*se_w260_mvl/mxv - .byte PAN , c_v-8 - .byte BEND , c_v-4 - .byte W01 - .byte VOL , 46*se_w260_mvl/mxv - .byte PAN , c_v+11 - .byte BEND , c_v-8 - .byte W01 - .byte VOL , 22*se_w260_mvl/mxv - .byte PAN , c_v-12 - .byte BEND , c_v-15 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_w260: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_w260_pri @ Priority - .byte se_w260_rev @ Reverb. - - .word se_w260_grp - - .word se_w260_1 - - .end diff --git a/sound/songs/se_w327.s b/sound/songs/se_w327.s deleted file mode 100644 index 1efa6c33f..000000000 --- a/sound/songs/se_w327.s +++ /dev/null @@ -1,103 +0,0 @@ - .include "MPlayDef.s" - - .equ se_w327_grp, voicegroup128 - .equ se_w327_pri, 4 - .equ se_w327_rev, reverb_set+50 - .equ se_w327_mvl, 127 - .equ se_w327_key, 0 - .equ se_w327_tbs, 1 - .equ se_w327_exg, 0 - .equ se_w327_cmp, 1 - - .section .rodata - .global se_w327 - .align 2 - -@********************** Track 1 **********************@ - -se_w327_1: - .byte KEYSH , se_w327_key+0 - .byte TEMPO , 220*se_w327_tbs/2 - .byte VOICE , 41 - .byte VOL , 110*se_w327_mvl/mxv - .byte BENDR , 12 - .byte PAN , c_v+6 - .byte BEND , c_v+0 - .byte N02 , Cn4 , v127 - .byte W03 - .byte VOL , 104*se_w327_mvl/mxv - .byte W03 - .byte 93*se_w327_mvl/mxv - .byte PAN , c_v-6 - .byte N02 , Cn5 - .byte W03 - .byte VOL , 110*se_w327_mvl/mxv - .byte W01 - .byte VOICE , 22 - .byte PAN , c_v+0 - .byte N24 , Cn4 , v060 - .byte W02 - .byte W02 - .byte BEND , c_v+0 - .byte W04 - .byte c_v+1 - .byte W03 - .byte c_v+1 - .byte W01 - .byte VOL , 105*se_w327_mvl/mxv - .byte W02 - .byte BEND , c_v+0 - .byte W01 - .byte VOL , 103*se_w327_mvl/mxv - .byte W02 - .byte 91*se_w327_mvl/mxv - .byte BEND , c_v+0 - .byte W03 - .byte VOL , 77*se_w327_mvl/mxv - .byte BEND , c_v-1 - .byte W02 - .byte VOL , 61*se_w327_mvl/mxv - .byte BEND , c_v-2 - .byte W01 - .byte VOL , 38*se_w327_mvl/mxv - .byte W01 - .byte 15*se_w327_mvl/mxv - .byte BEND , c_v-3 - .byte W02 - .byte FINE - -@********************** Track 2 **********************@ - -se_w327_2: - .byte KEYSH , se_w327_key+0 - .byte VOICE , 4 - .byte VOL , 110*se_w327_mvl/mxv - .byte N02 , Cn3 , v060 - .byte W03 - .byte Gn2 - .byte W03 - .byte Gs4 - .byte W04 - .byte Gs4 , v020 - .byte W02 - .byte W06 - .byte W06 - .byte W06 - .byte W06 - .byte FINE - -@******************************************************@ - .align 2 - -se_w327: - .byte 2 @ NumTrks - .byte 0 @ NumBlks - .byte se_w327_pri @ Priority - .byte se_w327_rev @ Reverb. - - .word se_w327_grp - - .word se_w327_1 - .word se_w327_2 - - .end diff --git a/sound/songs/se_z_scroll.s b/sound/songs/se_z_scroll.s deleted file mode 100644 index d8c792b17..000000000 --- a/sound/songs/se_z_scroll.s +++ /dev/null @@ -1,46 +0,0 @@ - .include "MPlayDef.s" - - .equ se_z_scroll_grp, voicegroup127 - .equ se_z_scroll_pri, 5 - .equ se_z_scroll_rev, reverb_set+50 - .equ se_z_scroll_mvl, 127 - .equ se_z_scroll_key, 0 - .equ se_z_scroll_tbs, 1 - .equ se_z_scroll_exg, 0 - .equ se_z_scroll_cmp, 1 - - .section .rodata - .global se_z_scroll - .align 2 - -@********************** Track 1 **********************@ - -se_z_scroll_1: - .byte KEYSH , se_z_scroll_key+0 - .byte TEMPO , 100*se_z_scroll_tbs/2 - .byte VOICE , 4 - .byte BENDR , 12 - .byte XCMD , xIECV , 10 - .byte xIECL , 8 - .byte VOL , 40*se_z_scroll_mvl/mxv - .byte BEND , c_v+4 - .byte N01 , Gn4 , v127 - .byte W01 - .byte Gn4 , v020 - .byte W02 - .byte FINE - -@******************************************************@ - .align 2 - -se_z_scroll: - .byte 1 @ NumTrks - .byte 0 @ NumBlks - .byte se_z_scroll_pri @ Priority - .byte se_z_scroll_rev @ Reverb. - - .word se_z_scroll_grp - - .word se_z_scroll_1 - - .end diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 4fd58b19e..152e93eec 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -3150,14 +3150,14 @@ static void AnimItemStealStep3(struct Sprite* sprite) sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8); if (sprite->pos2.y == 0) - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); + PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); if (MoveAlongLinearPath(sprite)) { sprite->pos2.y = 0; sprite->data[0] = 0; sprite->callback = AnimItemStealStep2; - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); + PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); } } @@ -4239,7 +4239,7 @@ static void AnimLockOnTargetStep1(struct Sprite* sprite) sprite->callback = StartAnimLinearTranslation; StoreSpriteCallbackInData6(sprite, AnimLockOnTargetStep2); sprite->data[5] += 0x100; - PlaySE12WithPanning(SE_W199, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); + PlaySE12WithPanning(SE_M_LOCK_ON, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); break; } @@ -4326,7 +4326,7 @@ static void AnimLockOnTargetStep4(struct Sprite* sprite) sprite->data[2]++; pal = sprite->oam.paletteNum; LoadPalette(&gPlttBufferUnfaded[0x108 + pal * 16], pal * 16 | 0x101, 4); - PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); + PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); } else if (sprite->data[1] == 0) { @@ -4803,7 +4803,7 @@ static void AnimSharpenSphereStep(struct Sprite* sprite) { sprite->data[4]++; if (!(sprite->data[4] & 1)) - PlaySE12WithPanning(SE_W207B, sprite->data[5]); + PlaySE12WithPanning(SE_M_SWAGGER2, sprite->data[5]); } sprite->data[0] = 0; diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index 563e3ffc2..ac4e9db30 100644 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1586,7 +1586,7 @@ static void AirCutterProjectileStep1(u8 taskId) gTasks[taskId].data[gTasks[taskId].data[1] + 13] = spriteId; gTasks[taskId].data[0] = gTasks[taskId].data[3]; gTasks[taskId].data[1]++; - PlaySE12WithPanning(SE_W059B, BattleAnimAdjustPanning(-SOUND_PAN_TARGET)); + PlaySE12WithPanning(SE_M_BLIZZARD2, BattleAnimAdjustPanning(-SOUND_PAN_TARGET)); if (gTasks[taskId].data[1] > 2) gTasks[taskId].func = AirCutterProjectileStep2; } @@ -1784,7 +1784,7 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite) u16 rand; s16* ptr; - PlaySE12WithPanning(SE_W030, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); + PlaySE12WithPanning(SE_M_HORN_ATTACK, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.y = 0; @@ -2472,7 +2472,7 @@ static void AnimPencil_Step(struct Sprite *sprite) sprite->pos1.y -= 1; sprite->data[2]++; if (sprite->data[2] % 10 == 0) - PlaySE12WithPanning(SE_W166, sprite->data[6]); + PlaySE12WithPanning(SE_M_SKETCH, sprite->data[6]); } sprite->data[4] += sprite->data[3]; if (sprite->data[4] > 31) diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index c60f51c31..07b44d53a 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -1586,7 +1586,7 @@ static void AnimClappingHand_Step(struct Sprite *sprite) sprite->data[2]++; if (sprite->data[3] == 0) { - PlaySE1WithPanning(SE_W227, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); + PlaySE1WithPanning(SE_M_ENCORE, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); } } } @@ -1865,7 +1865,7 @@ static void TormentAttacker_Step(u8 taskId) y = task->data[3] + task->data[5]; spriteId = CreateSprite(&gThoughtBubbleSpriteTemplate, x, y, 6 - task->data[1]); - PlaySE12WithPanning(SE_W118, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); + PlaySE12WithPanning(SE_M_METRONOME, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); if (spriteId != MAX_SPRITES) { @@ -2312,7 +2312,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId) gTasks[taskId].data[11] = gBattle_BG1_Y; gTasks[taskId].data[0]++; - PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); + PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); break; case 1: if (gTasks[taskId].data[4]++ > 0) @@ -2345,7 +2345,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId) { gTasks[taskId].data[3] = 0; gTasks[taskId].data[0] = 1; - PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); + PlaySE12WithPanning(SE_M_MORNING_SUN, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); } break; case 4: @@ -4622,7 +4622,7 @@ static void AnimTask_MonToSubstituteDoll(u8 taskId) if (gSprites[spriteId].pos2.y == 0) { - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); + PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); gTasks[taskId].data[10] -= 0x800; gTasks[taskId].data[0]++; } @@ -4644,7 +4644,7 @@ static void AnimTask_MonToSubstituteDoll(u8 taskId) if (gSprites[spriteId].pos2.y == 0) { - PlaySE12WithPanning(SE_W145B, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); + PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); DestroyAnimVisualTask(taskId); } break; @@ -4681,7 +4681,7 @@ static void AnimBlockXStep(struct Sprite *sprite) sprite->pos2.y += 10; if (sprite->pos2.y >= 0) { - PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); + PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->pos2.y = 0; sprite->data[0]++; } @@ -4691,7 +4691,7 @@ static void AnimBlockXStep(struct Sprite *sprite) sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3); if (sprite->data[1] > 0x7F) { - PlaySE12WithPanning(SE_W166, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); + PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->data[1] = 0; sprite->pos2.y = 0; sprite->data[0]++; @@ -4710,7 +4710,7 @@ static void AnimBlockXStep(struct Sprite *sprite) case 3: if (++sprite->data[1] > 8) { - PlaySE12WithPanning(SE_W043, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); + PlaySE12WithPanning(SE_M_LEER, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->data[1] = 0; sprite->data[0]++; } @@ -4991,7 +4991,7 @@ void sub_80E3E84(struct Sprite *sprite) case 0: if (gBattleAnimArgs[7] == -1) { - PlaySE12WithPanning(SE_W233, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); + PlaySE12WithPanning(SE_M_VITAL_THROW, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16; sprite->data[0] = -32; sprite->data[7]++; diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index 677090a65..a919b0371 100644 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -798,7 +798,7 @@ static void sub_80EF7EC(u8 taskId) { if (gSprites[gBattlerSpriteIds[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)]].animCmdIndex == 1) { - PlaySE12WithPanning(SE_NAGERU, 0); + PlaySE12WithPanning(SE_BALL_THROW, 0); gSprites[gTasks[taskId].data[0]].callback = sub_80EF8C0; CreateTask(sub_80EF864, 10); gTasks[taskId].func = sub_80EF698; @@ -887,7 +887,7 @@ static void sub_80EFA0C(struct Sprite *sprite) spriteId = gBattlerSpriteIds[gBattleAnimTarget]; taskId = sprite->data[5]; if (++gTasks[taskId].data[1] == 11) - PlaySE(SE_SUIKOMU); + PlaySE(SE_BALL_TRADE); switch (gTasks[taskId].data[0]) { @@ -965,16 +965,16 @@ static void sub_80EFB9C(struct Sprite *sprite) switch (bounceCount) { case 1: - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); break; case 2: - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); break; case 3: - PlaySE(SE_KON3); + PlaySE(SE_BALL_BOUNCE_3); break; default: - PlaySE(SE_KON4); + PlaySE(SE_BALL_BOUNCE_4); break; } } @@ -1018,7 +1018,7 @@ static void sub_80EFCA0(struct Sprite *sprite) StartSpriteAffineAnim(sprite, 1); gBattleSpritesDataPtr->animationData->field_C = 0; sprite->callback = sub_80EFCEC; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } @@ -1160,7 +1160,7 @@ static void sub_80EFCEC(struct Sprite *sprite) else StartSpriteAffineAnim(sprite, 1); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } break; } @@ -1191,7 +1191,7 @@ static void sub_80EFFC4(struct Sprite *sprite) sprite->data[4]++; if (sprite->data[4] == 40) { - PlaySE(SE_GETTING); + PlaySE(SE_BALL_CLICK); BlendPalettes(0x10000 << sprite->oam.paletteNum, 6, RGB_BLACK); sub_80F01B8(sprite); } @@ -1204,7 +1204,7 @@ static void sub_80EFFC4(struct Sprite *sprite) gDoingBattleAnim = FALSE; UpdateOamPriorityInAllHealthboxes(1); m4aMPlayAllStop(); - PlaySE(MUS_FAN6); + PlaySE(MUS_CAUGHT_INTRO); } else if (sprite->data[4] == 315) { @@ -1444,7 +1444,7 @@ u8 LaunchBallStarsTask(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId) gTasks[taskId].data[3] = priority; gTasks[taskId].data[4] = subpriority; gTasks[taskId].data[15] = ballId; - PlaySE(SE_BOWA2); + PlaySE(SE_BALL_OPEN); return taskId; } @@ -2143,7 +2143,7 @@ static void sub_80F181C(u8 taskId) else pan = SOUND_PAN_TARGET; - PlaySE12WithPanning(SE_REAPOKE, pan); + PlaySE12WithPanning(SE_SHINY, pan); } } diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 489198ed4..e8042df92 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -516,9 +516,9 @@ static void sub_80BB2A0(u8 taskId) gTasks[taskId].data[7] = gBattlerSpriteIds[sAnimStatsChangeData->battler2]; gTasks[taskId].func = sub_80BB4B8; if (sAnimStatsChangeData->data[0] == 0) - PlaySE12WithPanning(SE_W287, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER)); + PlaySE12WithPanning(SE_M_STAT_INCREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER)); else - PlaySE12WithPanning(SE_W287B, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER)); + PlaySE12WithPanning(SE_M_STAT_DECREASE, BattleAnimAdjustPanning2(SOUND_PAN_ATTACKER)); } static void sub_80BB4B8(u8 taskId) diff --git a/src/battle_bg.c b/src/battle_bg.c index 1c0b41bb4..e66180c4d 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -924,7 +924,7 @@ void InitLinkBattleVsScreen(u8 taskId) if (gTasks[taskId].data[5] != 0) DrawLinkBattleVsScreenOutcomeText(); - PlaySE(SE_W231); + PlaySE(SE_M_HARDEN); DestroyTask(taskId); gSprites[gBattleStruct->linkBattleVsSpriteId_V].invisible = FALSE; gSprites[gBattleStruct->linkBattleVsSpriteId_S].invisible = FALSE; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 90080b88e..f3966e832 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1200,7 +1200,7 @@ static void LinkOpponentHandleFaintAnimation(void) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET); gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gBattlerControllerFuncs[gActiveBattler] = sub_803AD20; } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index fdac017c8..2d95a756f 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1111,7 +1111,7 @@ static void LinkPartnerHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8012110; diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c index dc93c20fb..d6833942a 100644 --- a/src/battle_controller_oak_old_man.c +++ b/src/battle_controller_oak_old_man.c @@ -1638,7 +1638,7 @@ static void OakOldManHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8012110; diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index b7522c0de..29cde44df 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1202,7 +1202,7 @@ static void OpponentHandleFaintAnimation(void) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET); gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gBattlerControllerFuncs[gActiveBattler] = sub_803612C; } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index f19075769..db51f6e05 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -798,7 +798,7 @@ static void sub_802F610(void) { if (!gReceivedRemoteLinkPlayers) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(sub_8011A1C); @@ -807,7 +807,7 @@ static void sub_802F610(void) } else if (IsLinkTaskFinished()) { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = 0; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(sub_8011A1C); @@ -829,7 +829,7 @@ void sub_802F6A8(void) } else { - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); gMain.inBattle = FALSE; gMain.callback1 = gPreBattleCallback1; SetMainCallback2(gMain.savedCallback); @@ -1217,7 +1217,7 @@ static void sub_80303A8(u8 taskId) ++data[15]; break; case 2: - PlaySE(SE_REGI); + PlaySE(SE_RS_SHOP); if (IsMonGettingExpSentOut()) CreateLevelUpVerticalSpritesTask(sprite->pos1.x + sprite->pos2.x, sprite->pos1.y + sprite->pos2.y, @@ -2252,7 +2252,7 @@ static void PlayerHandleFaintAnimation(void) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8012110; diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index 285be03c7..c8a4b0286 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -1782,14 +1782,14 @@ static void PokedudeHandleFaintAnimation(void) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER); gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8012110; } else { - PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET); + PlaySE12WithPanning(SE_FAINT, SOUND_PAN_TARGET); gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; } gBattlerControllerFuncs[gActiveBattler] = sub_8156DCC; @@ -2607,7 +2607,7 @@ static void sub_8159BA8(void) if (gUnknown_3005EE0[gActiveBattler][3] == 13) { BattleStopLowHpSound(); - PlayBGM(MUS_WIN_YASEI); + PlayBGM(MUS_VICTORY_WILD); } gBattle_BG0_Y = gUnknown_3005EE0[gActiveBattler][4]; sub_80EB524(); @@ -2680,7 +2680,7 @@ static void sub_8159D04(void) if (gUnknown_3005EE0[gActiveBattler][3] == 13) { BattleStopLowHpSound(); - PlayBGM(MUS_WIN_YASEI); + PlayBGM(MUS_VICTORY_WILD); } sub_80EF0E0(GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)); sub_80EB524(); diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 45188d022..9795c52ff 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -816,7 +816,7 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId) if (!gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong) { if (!gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong) - PlaySE(SE_HINSI); + PlaySE(SE_LOW_HEALTH); gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 1; } } @@ -824,9 +824,9 @@ void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId) { gBattleSpritesDataPtr->battlerData[battlerId].lowHpSong = 0; if (!IsDoubleBattle()) - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); else if (IsDoubleBattle() && !gBattleSpritesDataPtr->battlerData[battlerId ^ BIT_FLANK].lowHpSong) - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); } } @@ -837,7 +837,7 @@ void BattleStopLowHpSound(void) gBattleSpritesDataPtr->battlerData[playerBattler].lowHpSong = 0; if (IsDoubleBattle()) gBattleSpritesDataPtr->battlerData[playerBattler ^ BIT_FLANK].lowHpSong = 0; - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); } // not used diff --git a/src/battle_interface.c b/src/battle_interface.c index 7a8f4eb67..9212cae14 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1231,7 +1231,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, gTasks[taskId].tBallIconSpriteId(i) = ballIconSpritesIds[i]; gTasks[taskId].tIsBattleStart = isBattleStart; - PlaySE12WithPanning(SE_TB_START, 0); + PlaySE12WithPanning(SE_BALL_TRAY_ENTER, 0); return taskId; } @@ -1421,9 +1421,9 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite) pan = SOUND_PAN_ATTACKER; if (sprite->data[7] != 0) - PlaySE2WithPanning(SE_TB_KARA, pan); + PlaySE2WithPanning(SE_BALL_TRAY_EXIT, pan); else - PlaySE1WithPanning(SE_TB_KON, pan); + PlaySE1WithPanning(SE_BALL_TRAY_BALL, pan); sprite->callback = SpriteCallbackDummy; } diff --git a/src/battle_main.c b/src/battle_main.c index 04a4a2acc..0d14d9b5b 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1435,7 +1435,7 @@ void FreeRestoreBattleData(void) gScanlineEffect.state = 3; gMain.inBattle = FALSE; ZeroEnemyPartyMons(); - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); FreeMonSpritesGfx(); FreeBattleSpritesData(); FreeBattleResources(); @@ -1647,7 +1647,7 @@ void sub_801182C(struct Sprite *sprite) { StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_80117BC; - PlaySE(SE_BT_START); + PlaySE(SE_MUGSHOT); } static void sub_801184C(u8 taskId) @@ -3661,7 +3661,7 @@ static void HandleEndTurn_BattleWon(void) else if (gBattleTypeFlags & (BATTLE_TYPE_TRAINER_TOWER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_BATTLE_TOWER)) { BattleStopLowHpSound(); - PlayBGM(MUS_WIN_TRE); + PlayBGM(MUS_VICTORY_TRAINER); gBattlescriptCurrInstr = BattleScript_BattleTowerTrainerBattleWon; } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) @@ -3672,7 +3672,7 @@ static void HandleEndTurn_BattleWon(void) { case CLASS_LEADER_2: case CLASS_CHAMPION_2: - PlayBGM(MUS_WIN_GYM); + PlayBGM(MUS_VICTORY_GYM_LEADER); break; case CLASS_BOSS: case CLASS_TEAM_ROCKET: @@ -3680,7 +3680,7 @@ static void HandleEndTurn_BattleWon(void) case CLASS_ELITE_FOUR_2: case CLASS_GENTLEMAN_2: default: - PlayBGM(MUS_WIN_TRE); + PlayBGM(MUS_VICTORY_TRAINER); break; } } @@ -3858,7 +3858,7 @@ static void ReturnFromBattleToOverworld(void) #endif // & with B_OUTCOME_WON (1) will return TRUE and deactivates the roamer. SetRoamerInactive(); } - m4aSongNumStop(SE_HINSI); + m4aSongNumStop(SE_LOW_HEALTH); SetMainCallback2(gMain.savedCallback); } } @@ -4338,7 +4338,7 @@ static void HandleAction_ThrowRock(void) static void HandleAction_SafariZoneRun(void) { gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; - PlaySE(SE_NIGERU); + PlaySE(SE_FLEE); gCurrentTurnActionNumber = gBattlersCount; gBattleOutcome = B_OUTCOME_RAN; } diff --git a/src/battle_message.c b/src/battle_message.c index 087d0361c..d055ecd94 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -311,23 +311,23 @@ static const u8 sText_StatsWontIncrease2[] = _("{B_ATK_NAME_WITH_PREFIX}'s stats static const u8 sText_StatsWontDecrease2[] = _("{B_DEF_NAME_WITH_PREFIX}'s stats won't\ngo any lower!"); static const u8 sText_CriticalHit[] = _("A critical hit!"); static const u8 sText_OneHitKO[] = _("It's a one-hit KO!"); -static const u8 sText_123Poof[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_KON}Poof!\p"); +static const u8 sText_123Poof[] = _("{PAUSE 32}1, {PAUSE 15}2, and{PAUSE 15}… {PAUSE 15}… {PAUSE 15}… {PAUSE 15}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p"); static const u8 sText_AndEllipsis[] = _("And…\p"); static const u8 sText_HMMovesCantBeForgotten[] = _("HM moves can't be\nforgotten now.\p"); static const u8 sText_NotVeryEffective[] = _("It's not very effective…"); static const u8 sText_SuperEffective[] = _("It's super effective!"); -static const u8 sText_GotAwaySafely[] = _("{PLAY_SE SE_NIGERU}Got away safely!\p"); -static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE SE_NIGERU}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p"); -static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE SE_NIGERU}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p"); -static const u8 sText_WildPkmnFled[] = _("{PLAY_SE SE_NIGERU}Wild {B_BUFF1} fled!"); +static const u8 sText_GotAwaySafely[] = _("{PLAY_SE SE_FLEE}Got away safely!\p"); +static const u8 sText_PkmnFledUsingIts[] = _("{PLAY_SE SE_FLEE}{B_ATK_NAME_WITH_PREFIX} fled\nusing its {B_LAST_ITEM}!\p"); +static const u8 sText_PkmnFledUsing[] = _("{PLAY_SE SE_FLEE}{B_ATK_NAME_WITH_PREFIX} fled\nusing {B_ATK_ABILITY}!\p"); +static const u8 sText_WildPkmnFled[] = _("{PLAY_SE SE_FLEE}Wild {B_BUFF1} fled!"); static const u8 sText_PlayerDefeatedLinkTrainer[] = _("Player defeated\n{B_LINK_OPPONENT1_NAME}!"); static const u8 sText_TwoLinkTrainersDefeated[] = _("Player beat {B_LINK_OPPONENT1_NAME}\nand {B_LINK_OPPONENT2_NAME}!"); static const u8 sText_PlayerLostAgainstLinkTrainer[] = _("Player lost against\n{B_LINK_OPPONENT1_NAME}!"); static const u8 sText_PlayerLostToTwo[] = _("Player lost to {B_LINK_OPPONENT1_NAME}\nand {B_LINK_OPPONENT2_NAME}!"); static const u8 sText_PlayerBattledToDrawLinkTrainer[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME}!"); static const u8 sText_PlayerBattledToDrawVsTwo[] = _("Player battled to a draw against\n{B_LINK_OPPONENT1_NAME} and {B_LINK_OPPONENT2_NAME}!"); -static const u8 sText_WildFled[] = _("{PLAY_SE SE_NIGERU}{B_LINK_OPPONENT1_NAME} fled!"); -static const u8 sText_TwoWildFled[] = _("{PLAY_SE SE_NIGERU}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!"); +static const u8 sText_WildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME} fled!"); +static const u8 sText_TwoWildFled[] = _("{PLAY_SE SE_FLEE}{B_LINK_OPPONENT1_NAME} and\n{B_LINK_OPPONENT2_NAME} fled!"); static const u8 sText_NoRunningFromTrainers[] = _("No! There's no running\nfrom a TRAINER battle!\p"); static const u8 sText_CantEscape[] = _("Can't escape!\p"); static const u8 sText_EmptyString5[] = _(""); //sText_DontLeaveBirch in pokeem @@ -375,7 +375,7 @@ static const u8 sText_ThrewSomeBait[] = _("{B_PLAYER_NAME} threw some BAIT\nat t static const u8 sText_PkmnWatchingCarefully[] = _("{B_OPPONENT_MON1_NAME} is watching\ncarefully!"); static const u8 sText_PkmnIsAngry[] = _("{B_OPPONENT_MON1_NAME} is angry!"); static const u8 sText_PkmnIsEating[] = _("{B_OPPONENT_MON1_NAME} is eating!"); -static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE SE_PINPON}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p"); +static const u8 sText_OutOfSafariBalls[] = _("{PLAY_SE SE_DING_DONG}ANNOUNCER: You're out of\nSAFARI BALLS! Game over!\p"); static const u8 sText_WildPkmnAppeared[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p"); static const u8 sText_WildPkmnAppeared2[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!\p"); static const u8 sText_WildPkmnAppearedPause[] = _("Wild {B_OPPONENT_MON1_NAME} appeared!{PAUSE 127}"); @@ -471,8 +471,8 @@ static const u8 sText_ItAppearedCaught[] = _("Aww!\nIt appeared to be caught!"); static const u8 sText_AarghAlmostHadIt[] = _("Aargh!\nAlmost had it!"); static const u8 sText_ShootSoClose[] = _("Shoot!\nIt was so close, too!"); const u8 gUnknown_83FD78A[] = _("よけられた!\nこいつは つかまりそうにないぞ!"); -static const u8 sText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_GET_YASEI}\p"); -static const u8 sText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_GET_YASEI}{PAUSE 127}"); +static const u8 sText_GotchaPkmnCaught[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}\p"); +static const u8 sText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_OPPONENT_MON1_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}{PAUSE 127}"); static const u8 sText_GiveNicknameCaptured[] = _("Give a nickname to the\ncaptured {B_OPPONENT_MON1_NAME}?"); static const u8 sText_PkmnSentToPC[] = _("{B_OPPONENT_MON1_NAME} was sent to\n{B_PC_CREATOR_NAME} PC."); static const u8 sText_Someones[] = _("someone's"); @@ -1310,7 +1310,7 @@ const u8 *const gTrainerTowerChallengeTypeTexts[NUM_TOWER_CHALLENGE_TYPES] = { gOtherText_Mixed }; -const u8 gUnknown_83FE9D4[] = _("{PLAY_SE SE_NIGERU}{B_TRAINER1_CLASS} {B_TRAINER1_NAME} fled!"); // +const u8 gUnknown_83FE9D4[] = _("{PLAY_SE SE_FLEE}{B_TRAINER1_CLASS} {B_TRAINER1_NAME} fled!"); // static const u8 sText_PlayerLostAgainstTrainer1[] = _("Player lost against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!"); static const u8 sText_PlayerBattledToDrawTrainer1[] = _("Player battled to a draw against\n{B_TRAINER1_CLASS} {B_TRAINER1_NAME}!"); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index c88516272..dd82a4aab 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -1883,11 +1883,11 @@ static void atk0E_effectivenesssound(void) switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED))) { case MOVE_RESULT_SUPER_EFFECTIVE: - BtlController_EmitPlaySE(0, SE_KOUKA_H); + BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); break; case MOVE_RESULT_NOT_VERY_EFFECTIVE: - BtlController_EmitPlaySE(0, SE_KOUKA_L); + BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); break; case MOVE_RESULT_DOESNT_AFFECT_FOE: @@ -1900,17 +1900,17 @@ static void atk0E_effectivenesssound(void) default: if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) { - BtlController_EmitPlaySE(0, SE_KOUKA_H); + BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); } else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE) { - BtlController_EmitPlaySE(0, SE_KOUKA_L); + BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); } else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED))) { - BtlController_EmitPlaySE(0, SE_KOUKA_M); + BtlController_EmitPlaySE(0, SE_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); } break; @@ -3156,7 +3156,7 @@ static void atk23_getexp(void) && !gBattleStruct->wildVictorySong) { BattleStopLowHpSound(); - PlayBGM(MUS_WIN_YASEI); + PlayBGM(MUS_VICTORY_WILD); ++gBattleStruct->wildVictorySong; } if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP)) diff --git a/src/battle_setup.c b/src/battle_setup.c index b54696247..8ee061361 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -250,7 +250,7 @@ void StartRoamerBattle(void) StopPlayerAvatar(); gMain.savedCallback = CB2_EndWildBattle; gBattleTypeFlags = BATTLE_TYPE_ROAMER; - CreateBattleStartTask(GetWildBattleTransition(), MUS_VS_DEN); + CreateBattleStartTask(GetWildBattleTransition(), MUS_VS_LEGEND); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -344,20 +344,20 @@ void StartLegendaryBattle(void) switch (species) { case SPECIES_MEWTWO: - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_MYU2); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_MEWTWO); break; case SPECIES_DEOXYS: - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_DEO); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_DEOXYS); break; case SPECIES_MOLTRES: case SPECIES_ARTICUNO: case SPECIES_ZAPDOS: case SPECIES_HO_OH: case SPECIES_LUGIA: - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_DEN); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_VS_LEGEND); break; default: - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_BATTLE20); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RS_VS_TRAINER); break; } IncrementGameStat(GAME_STAT_TOTAL_BATTLES); @@ -370,9 +370,9 @@ void StartGroudonKyogreBattle(void) gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON; if (gGameVersion == VERSION_FIRE_RED) - CreateBattleStartTask(B_TRANSITION_BLACK_DOODLES, MUS_BATTLE20); + CreateBattleStartTask(B_TRANSITION_BLACK_DOODLES, MUS_RS_VS_TRAINER); else // pointless, exactly the same - CreateBattleStartTask(B_TRANSITION_BLACK_DOODLES, MUS_BATTLE20); + CreateBattleStartTask(B_TRANSITION_BLACK_DOODLES, MUS_RS_VS_TRAINER); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -382,7 +382,7 @@ void StartRegiBattle(void) ScriptContext2_Enable(); gMain.savedCallback = CB2_EndScriptedWildBattle; gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI; - CreateBattleStartTask(B_TRANSITION_BLUR, MUS_BATTLE20); + CreateBattleStartTask(B_TRANSITION_BLUR, MUS_RS_VS_TRAINER); IncrementGameStat(GAME_STAT_TOTAL_BATTLES); IncrementGameStat(GAME_STAT_WILD_BATTLES); } @@ -1003,7 +1003,7 @@ void PlayTrainerEncounterMusic(void) case TRAINER_ENCOUNTER_MUSIC_FEMALE: case TRAINER_ENCOUNTER_MUSIC_GIRL: case TRAINER_ENCOUNTER_MUSIC_TWINS: - music = MUS_SHOUJO; + music = MUS_ENCOUNTER_GIRL; break; case TRAINER_ENCOUNTER_MUSIC_MALE: case TRAINER_ENCOUNTER_MUSIC_INTENSE: @@ -1013,10 +1013,10 @@ void PlayTrainerEncounterMusic(void) case TRAINER_ENCOUNTER_MUSIC_HIKER: case TRAINER_ENCOUNTER_MUSIC_INTERVIEWER: case TRAINER_ENCOUNTER_MUSIC_RICH: - music = MUS_SHOUNEN; + music = MUS_ENCOUNTER_BOY; break; default: - music = MUS_ROCKET; + music = MUS_ENCOUNTER_ROCKET; break; } PlayNewMapMusic(music); diff --git a/src/battle_transition.c b/src/battle_transition.c index 63e5f11e6..7fc2d4255 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1899,7 +1899,7 @@ static bool8 BT_Phase2Mugshot_StartSpriteSlide(struct Task *task) BT_SetSpriteAsOpponentOrPlayer(task->tOpponentSpriteId, FALSE); BT_SetSpriteAsOpponentOrPlayer(task->tPlayerSpriteId, TRUE); BT_StartSpriteSlide(task->tOpponentSpriteId); - PlaySE(SE_BT_START); + PlaySE(SE_MUGSHOT); ++sTransitionStructPtr->vblankDma; return FALSE; } diff --git a/src/berry_crush.c b/src/berry_crush.c index 12e1a823e..24fdf52a8 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -39,7 +39,7 @@ u32 ExitBerryCrushWithCallback(MainCallback callback) SetMainCallback2(callback); if (callback == CB2_ReturnToField) { - PlayNewMapMusic(MUS_POKECEN); + PlayNewMapMusic(MUS_POKE_CENTER); SetMainCallback1(CB1_Overworld); } diff --git a/src/berry_crush_2.c b/src/berry_crush_2.c index f195be954..0382ef3fd 100644 --- a/src/berry_crush_2.c +++ b/src/berry_crush_2.c @@ -279,7 +279,7 @@ static u32 BerryCrushCommand_SignalReadyToBegin(struct BerryCrushGame * game, UN case 1: if (IsLinkTaskFinished()) { - PlayNewMapMusic(MUS_SLOT); + PlayNewMapMusic(MUS_GAME_CORNER); BerryCrush_RunOrScheduleCommand(BCCMD_AskPickBerry, 1, NULL); game->gameState = 3; game->cmdState = 0; @@ -390,7 +390,7 @@ static u32 BerryCrushCommand_DropBerriesIntoCrusher(struct BerryCrushGame * game case 2: game->spritesManager.berrySprites[game->spritesManager.animBerryIdx]->callback = SpriteCB_DropBerryIntoCrusher; game->spritesManager.berrySprites[game->spritesManager.animBerryIdx]->affineAnimPaused = FALSE; - PlaySE(SE_NAGERU); + PlaySE(SE_BALL_THROW); break; case 3: if (game->spritesManager.berrySprites[game->spritesManager.animBerryIdx]->callback == SpriteCB_DropBerryIntoCrusher) @@ -416,7 +416,7 @@ static u32 BerryCrushCommand_DropBerriesIntoCrusher(struct BerryCrushGame * game case 6: if (!IsLinkTaskFinished()) return 0; - PlaySE(SE_RU_HYUU); + PlaySE(SE_FALL); BerryCrush_RunOrScheduleCommand(BCCMD_DropLid, 1, NULL); game->gameState = 5; game->cmdState = 0; @@ -438,7 +438,7 @@ static u32 BerryCrushCommand_DropLid(struct BerryCrushGame * game, UNUSED u8 *p game->spritesManager.unk1 = 4; game->spritesManager.animBerryIdx = 0; game->spritesManager.unk2 = gUnknown_846E2F0[game->spritesManager.unk1][0]; - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); break; case 1: game->vibration = gUnknown_846E2F0[game->spritesManager.unk1][game->spritesManager.animBerryIdx]; @@ -832,7 +832,7 @@ static u32 BerryCrushCommand_FinishGame(struct BerryCrushGame * game, UNUSED u8 { case 0: game->gameState = 8; - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); BlendPalettes(0xFFFFFFFF, 8, RGB(31, 31, 0)); game->spritesManager.animBerryIdx = 2; break; @@ -889,7 +889,7 @@ static u32 BerryCrushCommand_HandleTimeUp(struct BerryCrushGame * game, u8 *para { case 0: game->gameState = 9; - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); BlendPalettes(0xFFFFFFFF, 8, RGB(31, 0, 0)); game->spritesManager.animBerryIdx = 4; break; diff --git a/src/berry_crush_3.c b/src/berry_crush_3.c index 7713cf6aa..8272a2297 100644 --- a/src/berry_crush_3.c +++ b/src/berry_crush_3.c @@ -777,9 +777,9 @@ void sub_814DC5C(struct BerryCrushGame * game, struct BerryCrushGame_138 * manag else { if (sp4 == 1) - PlaySE(SE_TOY_DANGO); + PlaySE(SE_MUD_BALL); else - PlaySE(SE_TOY_KABE); + PlaySE(SE_BREAKABLE_DOOR); game->unk25_2 = 1; } diff --git a/src/berry_pouch.c b/src/berry_pouch.c index 487667ad2..c59c03b08 100644 --- a/src/berry_pouch.c +++ b/src/berry_pouch.c @@ -704,7 +704,7 @@ static void BerryPouchMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMen { if (onInit != TRUE) { - PlaySE(SE_BAG1); + PlaySE(SE_BAG_CURSOR); StartBerryPouchSpriteWobbleAnim(); } DestroyItemMenuIcon(sResources->itemMenuIconId ^ 1); diff --git a/src/cable_club.c b/src/cable_club.c index 349740c9e..7054eb417 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -608,9 +608,9 @@ static void Task_StartWiredCableClubBattle(u8 taskId) break; case 5: if (gLinkPlayers[0].trainerId & 1) - PlayMapChosenOrBattleBGM(MUS_BATTLE32); + PlayMapChosenOrBattleBGM(MUS_RS_VS_GYM_LEADER); else - PlayMapChosenOrBattleBGM(MUS_BATTLE20); + PlayMapChosenOrBattleBGM(MUS_RS_VS_TRAINER); switch (gSpecialVar_0x8004) { case USING_SINGLE_BATTLE: @@ -680,9 +680,9 @@ static void Task_StartWirelessCableClubBattle(u8 taskId) break; case 7: if (gLinkPlayers[0].trainerId & 1) - PlayMapChosenOrBattleBGM(MUS_BATTLE32); + PlayMapChosenOrBattleBGM(MUS_RS_VS_GYM_LEADER); else - PlayMapChosenOrBattleBGM(MUS_BATTLE20); + PlayMapChosenOrBattleBGM(MUS_RS_VS_TRAINER); gLinkPlayers[0].linkType = LINKTYPE_BATTLE; switch (gSpecialVar_0x8004) { diff --git a/src/daycare.c b/src/daycare.c index d4d907e3d..05d83c571 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1874,10 +1874,10 @@ static void Task_EggHatchPlayBGM(u8 taskID) StopMapMusic(); } if (gTasks[taskID].data[0] == 1) - PlayBGM(MUS_ME_SHINKA); + PlayBGM(MUS_EVOLUTION_INTRO); if (gTasks[taskID].data[0] > 60) { - PlayBGM(MUS_SHINKA); + PlayBGM(MUS_EVOLUTION); DestroyTask(taskID); // UB: task is destroyed, yet the value is incremented } @@ -1932,7 +1932,7 @@ static void CB2_EggHatch_1(void) DayCare_GetMonNickname(&gPlayerParty[sEggHatchData->eggPartyID], gStringVar1); StringExpandPlaceholders(gStringVar4, gText_HatchedFromEgg); EggHatchPrintMessage(sEggHatchData->windowId, gStringVar4, 0, 3, 0xFF); - PlayFanfare(MUS_FANFA5); + PlayFanfare(MUS_EVOLVED); sEggHatchData->CB2_state++; PutWindowTilemap(sEggHatchData->windowId); CopyWindowToVram(sEggHatchData->windowId, COPYWIN_BOTH); @@ -2011,7 +2011,7 @@ static void SpriteCB_Egg_0(struct Sprite* sprite) sprite->pos2.x = Sin(sprite->data[1], 1); if (sprite->data[0] == 15) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); StartSpriteAnim(sprite, 1); CreateRandomEggShardSprite(); } @@ -2034,7 +2034,7 @@ static void SpriteCB_Egg_1(struct Sprite* sprite) sprite->pos2.x = Sin(sprite->data[1], 2); if (sprite->data[0] == 15) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); StartSpriteAnim(sprite, 2); } } @@ -2071,13 +2071,13 @@ static void SpriteCB_Egg_2(struct Sprite* sprite) sprite->pos2.x = Sin(sprite->data[1], 2); if (sprite->data[0] == 15) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); StartSpriteAnim(sprite, 2); CreateRandomEggShardSprite(); CreateRandomEggShardSprite(); } if (sprite->data[0] == 30) - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } } @@ -2104,7 +2104,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite) sprite->data[0]++; if (!gPaletteFade.active) { - PlaySE(SE_TAMAGO); + PlaySE(SE_EGG_HATCH); sprite->invisible = TRUE; sprite->callback = SpriteCB_Egg_5; sprite->data[0] = 0; diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 936d458da..5a95c8549 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -209,7 +209,7 @@ void StartDodrioBerryPicking(u16 a0, MainCallback callback) sub_8153150(); sub_81529A4(gUnknown_203F3E0->unk24, &gUnknown_203F3E0->unk44, &gUnknown_203F3E0->unk48); StopMapMusic(); - PlayNewMapMusic(MUS_KINOMIKUI); + PlayNewMapMusic(MUS_BERRY_PICK); } else { @@ -601,7 +601,7 @@ static void sub_8150FDC(void) if (WaitFanfare(TRUE)) { sub_8152090(6); - FadeOutAndPlayNewMapMusic(MUS_WIN_YASEI, 4); + FadeOutAndPlayNewMapMusic(MUS_VICTORY_WILD, 4); } break; } @@ -643,7 +643,7 @@ static void sub_815109C(void) if (WaitFanfare(TRUE)) { gUnknown_203F3E0->unk114 = gUnknown_203F3E0->unk4A[gUnknown_203F3E0->multiplayerId][5]; sub_8152090(6); - FadeOutAndPlayNewMapMusic(MUS_WIN_YASEI, 4); + FadeOutAndPlayNewMapMusic(MUS_VICTORY_WILD, 4); } break; } @@ -898,7 +898,7 @@ static void sub_815159C(void) gUnknown_203F3E0->unk10++; break; case 4: - PlayNewMapMusic(MUS_KINOMIKUI); + PlayNewMapMusic(MUS_BERRY_PICK); sub_8154540(); gUnknown_203F3E0->unk10++; break; @@ -1183,8 +1183,8 @@ static void sub_8151D98(void) { if (gUnknown_203F3E0->unk144 == 0) { - m4aSongNumStop(SE_SEIKAI); - PlaySE(SE_SEIKAI); + m4aSongNumStop(SE_SUCCESS); + PlaySE(SE_SUCCESS); gUnknown_203F3E0->unk144 = 1; } } @@ -1205,7 +1205,7 @@ static void sub_8151D98(void) } else if (gUnknown_203F3E0->unk154 == 1) { - PlayFanfareByFanfareNum(FANFARE_10); // MUS_ME_ZANNEN + PlayFanfareByFanfareNum(FANFARE_10); // MUS_TOO_BAD gUnknown_203F3E0->unk154 = 2; } } @@ -1226,8 +1226,8 @@ static void sub_8151E94(void) { if (gUnknown_203F3E0->unk144 == 0) { - m4aSongNumStop(SE_SEIKAI); - PlaySE(SE_SEIKAI); + m4aSongNumStop(SE_SUCCESS); + PlaySE(SE_SUCCESS); gUnknown_203F3E0->unk144 = 1; } } @@ -1247,7 +1247,7 @@ static void sub_8151E94(void) { if (gUnknown_203F3E0->unk148[r4] == 0) { - PlaySE(SE_FUUSEN1 + ptr->unk0[r4]); + PlaySE(SE_BALLOON_RED + ptr->unk0[r4]); gUnknown_203F3E0->unk148[r4] = 1; } } @@ -1263,7 +1263,7 @@ static void sub_8151E94(void) } else if (gUnknown_203F3E0->unk154 == 1) { - PlayFanfareByFanfareNum(FANFARE_10); // MUS_ME_ZANNEN + PlayFanfareByFanfareNum(FANFARE_10); // MUS_TOO_BAD gUnknown_203F3E0->unk154 = 2; } } @@ -1517,7 +1517,7 @@ static void sub_815256C(void) if (gUnknown_203F3E0->unk148[i] == 0) { gUnknown_203F3E0->unk148[i] = 1; - PlaySE(SE_FUUSEN1 + ptr->unk32CC.unk14.unk0[i]); + PlaySE(SE_BALLOON_RED + ptr->unk32CC.unk14.unk0[i]); } if (gUnknown_203F3E0->unk40 < 10 || r10 == 1) { @@ -2070,19 +2070,19 @@ static void sub_81532B8(void) { gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId].unk2C.unk0 = 2; gUnknown_203F3E0->unkB0[gUnknown_203F3E0->multiplayerId] = 6; - PlaySE(SE_W204); + PlaySE(SE_M_CHARM); } else if (JOY_NEW(DPAD_LEFT)) { gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId].unk2C.unk0 = 3; gUnknown_203F3E0->unkB0[gUnknown_203F3E0->multiplayerId] = 6; - PlaySE(SE_W204); + PlaySE(SE_M_CHARM); } else if (JOY_NEW(DPAD_RIGHT)) { gUnknown_203F3E0->unk31A0[gUnknown_203F3E0->multiplayerId].unk2C.unk0 = 1; gUnknown_203F3E0->unkB0[gUnknown_203F3E0->multiplayerId] = 6; - PlaySE(SE_W204); + PlaySE(SE_M_CHARM); } else { diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c index ea2ea060d..d2ddd30be 100644 --- a/src/dodrio_berry_picking_2.c +++ b/src/dodrio_berry_picking_2.c @@ -373,7 +373,7 @@ static u32 sub_8153CA0(struct Sprite * sprite) u8 mod = (++sprite->data[1] / 13) % 4; if (sprite->data[1] % 13 == 0 && mod != 0) - PlaySE(SE_W204); + PlaySE(SE_M_CHARM); if (sprite->data[1] >= 104) { sprite->data[0] = 0; @@ -490,7 +490,7 @@ bool32 sub_8153F1C(void) continue; gUnknown_203F43C->unkC[i] = 1; gUnknown_203F43C->unk16[i] = -16; - PlaySE(SE_TK_KASYA); + PlaySE(SE_CLICK); } sprite->pos1.y += gUnknown_203F43C->unk16[i]; } @@ -543,16 +543,16 @@ void sub_81540DC(bool8 invisible) // Unknown unused data, feel free to remove. static const u8 sUnused2[] = { - SE_W204, - SE_TOY_C, - SE_TOY_D, - SE_TOY_E, - SE_TOY_F, - SE_TOY_G, - SE_TOY_A, - SE_TOY_B, - SE_TOY_C1, - SE_CARD3 + SE_M_CHARM, + SE_NOTE_C, + SE_NOTE_D, + SE_NOTE_E, + SE_NOTE_F, + SE_NOTE_G, + SE_NOTE_A, + SE_NOTE_B, + SE_NOTE_C_HIGH, + SE_CARD_OPEN }; void sub_8154128(void) @@ -1268,7 +1268,7 @@ static void sub_8154F80(void) } break; case 9: - PlayNewMapMusic(MUS_FANFA1); + PlayNewMapMusic(MUS_LEVEL_UP); FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1)); FillWindowPixelBuffer(gUnknown_203F440->unk3008[1], PIXEL_FILL(1)); strWidth = GetStringWidth(0, gText_AnnouncingPrizes, -1); @@ -1302,7 +1302,7 @@ static void sub_8154F80(void) PutWindowTilemap(gUnknown_203F440->unk3008[1]); } CopyBgTilemapBufferToVram(0); - FadeOutAndFadeInNewMapMusic(MUS_WIN_YASEI, 20, 10); + FadeOutAndFadeInNewMapMusic(MUS_VICTORY_WILD, 20, 10); gUnknown_203F440->state++; break; case 11: diff --git a/src/electric.c b/src/electric.c index d3fe25924..b1bc32c50 100644 --- a/src/electric.c +++ b/src/electric.c @@ -1190,7 +1190,7 @@ static bool8 sub_80AEE74(struct Task *task, u8 taskId) if (task->data[4] == 0 && task->data[5] > 0) { task->data[14] += task->data[15]; - PlaySE12WithPanning(SE_W085, task->data[14]); + PlaySE12WithPanning(SE_M_THUNDERBOLT, task->data[14]); } if ((task->data[5] < 0 && task->data[7] <= task->data[8]) || (task->data[5] > 0 && task->data[7] >= task->data[8])) diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index d9c9317bd..f3cf21e7f 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -272,7 +272,7 @@ static void EvoTask_PreEvoSparkleSet1Init(u8 taskId) gTasks[taskId].data[15] = 0; BeginNormalPaletteFade(3 << gTasks[taskId].data[1], 10, 0, 16, RGB_WHITE); gTasks[taskId].func = EvoTask_CreatePreEvoSparkleSet1; - PlaySE(SE_W025); + PlaySE(SE_M_MEGA_KICK); } static void EvoTask_CreatePreEvoSparkleSet1(u8 taskId) @@ -313,7 +313,7 @@ static void EvoTask_PreEvoSparkleSet2Init(u8 taskId) SetEvoSparklesMatrices(); gTasks[taskId].data[15] = 0; gTasks[taskId].func = EvoTask_CreatePreEvoSparklesSet2; - PlaySE(SE_W062B); + PlaySE(SE_M_BUBBLE_BEAM2); } static void EvoTask_CreatePreEvoSparklesSet2(u8 taskId) @@ -350,7 +350,7 @@ static void EvoTask_PostEvoSparklesSet1Init(u8 taskId) SetEvoSparklesMatrices(); gTasks[taskId].data[15] = 0; gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet1; - PlaySE(SE_REAPOKE); + PlaySE(SE_SHINY); } static void EvoTask_CreatePostEvoSparklesSet1(u8 taskId) @@ -400,7 +400,7 @@ static void EvoTask_PostEvoSparklesSet2Init(u8 taskId) CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96); BeginNormalPaletteFade(0xFFF90F1C, 0, 0, 16, RGB_WHITE); gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2; - PlaySE(SE_W080); + PlaySE(SE_M_PETAL_DANCE); } static void EvoTask_CreatePostEvoSparklesSet2(u8 taskId) @@ -451,7 +451,7 @@ static void EvoTask_PostEvoSparklesSet2TradeInit(u8 taskId) CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96); BeginNormalPaletteFade(0xFFF90F00, 0, 0, 16, RGB_WHITE); gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2Trade; - PlaySE(SE_W080); + PlaySE(SE_M_PETAL_DANCE); } static void EvoTask_CreatePostEvoSparklesSet2Trade(u8 taskId) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index caa19a7a5..8a1f89685 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -641,14 +641,14 @@ static void Task_EvolutionScene(u8 taskId) case 3: if (IsCryFinished()) // wait for animation, play tu du SE { - PlaySE(MUS_ME_SHINKA); + PlaySE(MUS_EVOLUTION_INTRO); gTasks[taskId].tState++; } break; case 4: // play evolution music and fade screen black if (!IsSEPlaying()) { - PlayNewMapMusic(MUS_SHINKA); + PlayNewMapMusic(MUS_EVOLUTION); gTasks[taskId].tState++; BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK); } @@ -724,7 +724,7 @@ static void Task_EvolutionScene(u8 taskId) { StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); BattlePutTextOnWindow(gStringVar4, 0); - PlayBGM(MUS_FANFA5); + PlayBGM(MUS_EVOLVED); gTasks[taskId].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskId].tPostEvoSpecies)); CalculateMonStats(mon); @@ -816,7 +816,7 @@ static void Task_EvolutionScene(u8 taskId) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BufferMoveToLearnIntoBattleTextBuff2(); - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]); BattlePutTextOnWindow(gDisplayedStringBattle, 0); gTasks[taskId].tLearnsFirstMove = 0x40; // re-used as a counter @@ -1021,15 +1021,15 @@ static void Task_TradeEvolutionScene(u8 taskId) case 2: if (IsCryFinished()) { - m4aSongNumStop(MUS_SHINKA); - PlaySE(MUS_ME_SHINKA); + m4aSongNumStop(MUS_EVOLUTION); + PlaySE(MUS_EVOLUTION_INTRO); gTasks[taskId].tState++; } break; case 3: if (!IsSEPlaying()) { - PlayBGM(MUS_SHINKA); + PlayBGM(MUS_EVOLUTION); gTasks[taskId].tState++; BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK); } @@ -1103,7 +1103,7 @@ static void Task_TradeEvolutionScene(u8 taskId) { StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); DrawTextOnTradeWindow(0, gStringVar4, 1); - PlayFanfare(MUS_FANFA5); + PlayFanfare(MUS_EVOLVED); gTasks[taskId].tState++; SetMonData(mon, MON_DATA_SPECIES, (&gTasks[taskId].tPostEvoSpecies)); CalculateMonStats(mon); @@ -1136,7 +1136,7 @@ static void Task_TradeEvolutionScene(u8 taskId) } else { - PlayBGM(MUS_SHINKA); + PlayBGM(MUS_EVOLUTION); DrawTextOnTradeWindow(0, gText_CommunicationStandby5, 1); gTasks[taskId].tState++; } @@ -1180,7 +1180,7 @@ static void Task_TradeEvolutionScene(u8 taskId) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BufferMoveToLearnIntoBattleTextBuff2(); - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); gTasks[taskId].tLearnsFirstMove = 0x40; // re-used as a counter diff --git a/src/fame_checker.c b/src/fame_checker.c index 395babb23..15052c964 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -429,7 +429,7 @@ void UseFameChecker(MainCallback savedCallback) sFameCheckerData->listMenuTopIdx2 = 0; sFameCheckerData->listMenuDrawnSelIdx = 0; sFameCheckerData->viewingFlavorText = FALSE; - PlaySE(SE_W129); + PlaySE(SE_M_SWIFT); SetMainCallback2(MainCB2_LoadFameChecker); } @@ -540,11 +540,11 @@ static void Task_TopMenuHandleInput(u8 taskId) cursorPos = FameCheckerGetCursorY(); if (TryExitPickMode(taskId) == TRUE) { - PlaySE(SE_W199); + PlaySE(SE_M_LOCK_ON); } else if (cursorPos != sFameCheckerData->numUnlockedPersons - 1) // anything but CANCEL { - PlaySE(SE_W199); + PlaySE(SE_M_LOCK_ON); FillWindowPixelRect(FCWINDOWID_ICONDESC, 0x00, 0, 0, 88, 32); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC); UpdateInfoBoxTilemap(2, 4); @@ -729,7 +729,7 @@ static void FC_MoveSelectorCursor(u8 taskId, s8 dx, s8 dy) { u8 i; s16 *data = gTasks[taskId].data; - PlaySE(SE_W207B); + PlaySE(SE_M_SWAGGER2); gSprites[data[0]].pos1.x += dx; gSprites[data[0]].pos1.y += dy; for (i = 0; i < 6; i++) @@ -807,7 +807,7 @@ static bool8 SetMessageSelectorIconObjMode(u8 spriteId, u8 objMode) static void Task_StartToCloseFameChecker(u8 taskId) { - PlaySE(SE_W129); + PlaySE(SE_M_SWIFT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); gTasks[taskId].func = Task_DestroyAssetsAndCloseFameChecker; } diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 694ef0392..572c6af6b 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -1067,7 +1067,7 @@ void HandleBoulderFallThroughHole(struct ObjectEvent * object) { if (MapGridGetMetatileBehaviorAt(object->currentCoords.x, object->currentCoords.y) == MB_FALL_WARP) { - PlaySE(SE_RU_HYUU); + PlaySE(SE_FALL); RemoveObjectEventByLocalIdAndMap(object->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); FlagClear(GetObjectEventFlagByLocalIdAndMap(object->localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup)); } @@ -1123,7 +1123,7 @@ bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior) { StoreInitialPlayerAvatarState(); DoDiveWarp(); - PlaySE(SE_W291); + PlaySE(SE_M_DIVE); return TRUE; } } @@ -1133,7 +1133,7 @@ bool8 dive_warp(struct MapPosition *position, u16 metatileBehavior) { StoreInitialPlayerAvatarState(); DoDiveWarp(); - PlaySE(SE_W291); + PlaySE(SE_M_DIVE); return TRUE; } } diff --git a/src/field_door.c b/src/field_door.c index 59b72f3ab..e9f403d7c 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -473,9 +473,9 @@ bool8 FieldIsDoorAnimationRunning(void) u16 GetDoorSoundEffect(int x, int y) { if (GetDoorSoundType(sDoorGraphics, x, y) == DOOR_SOUND_NORMAL) - return MUS_W_DOOR; + return SE_DOOR; else // DOOR_SOUND_SLIDING - return SE_JIDO_DOA; + return SE_SLIDING_DOOR; } static s8 GetDoorSoundType(const struct DoorGraphics * gfx, int x, int y) diff --git a/src/field_effect.c b/src/field_effect.c index b89e9c116..9167843b6 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -861,7 +861,7 @@ static void PokeballGlowEffect_0(struct Sprite * sprite) gSprites[endSpriteId].data[0] = sprite->data[7]; sprite->data[2]++; sprite->data[6]--; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } if (sprite->data[6] == 0) { @@ -880,7 +880,7 @@ static void PokeballGlowEffect_1(struct Sprite * sprite) sprite->data[3] = 0; if (sprite->data[5]) { - PlayFanfare(MUS_ME_ASA); + PlayFanfare(MUS_HEAL); } } } @@ -1156,7 +1156,7 @@ static bool8 FallWarpEffect_3(struct Task * task) task->data[1] = 1; task->data[2] = 0; gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE; - PlaySE(SE_RU_HYUU); + PlaySE(SE_FALL); task->data[0]++; return FALSE; } @@ -1186,7 +1186,7 @@ static bool8 FallWarpEffect_4(struct Task * task) } if (sprite->pos2.y >= 0) { - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); objectEvent->triggerGroundEffectsOnStop = TRUE; objectEvent->landingJump = TRUE; sprite->pos2.y = 0; @@ -1309,7 +1309,7 @@ static bool8 EscalatorWarpEffect_2(struct Task * task) { task->data[0] = 4; } - PlaySE(SE_ESUKA); + PlaySE(SE_ESCALATOR); } return FALSE; } @@ -1740,7 +1740,7 @@ static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent gFieldEffectArguments[2] = sprite->subpriority - 1; gFieldEffectArguments[3] = sprite->oam.priority; FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP); - PlaySE(SE_W153); + PlaySE(SE_M_EXPLOSION); task->data[0]++; return TRUE; } @@ -1862,7 +1862,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEv task->data[0]++; objectEvent->invisible = FALSE; CameraObjectReset1(); - PlaySE(SE_W091); + PlaySE(SE_M_DIG); ObjectEventSetHeldMovement(objectEvent, GetJumpMovementAction(DIR_EAST)); } return FALSE; @@ -1950,7 +1950,7 @@ static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent * { task->data[1]++; ObjectEventSetHeldMovement(objectEvent, GetWalkInPlaceFastMovementAction(objectEvent->facingDirection)); - PlaySE(SE_FU_ZUZUZU); + PlaySE(SE_LAVARIDGE_FALL_WARP); } } return FALSE; @@ -2052,7 +2052,7 @@ static void EscapeRopeFieldEffect_Step1(struct Task * task) data[3]++; if (data[3] == 20) { - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } } else if (data[4] == 0 && !sub_80857F0(playerObj, &task->data[5], &task->data[6])) @@ -2170,7 +2170,7 @@ static bool32 sub_80858A4(struct ObjectEvent * playerObj, s16 *state_p, s16 *y_p (*y_p) += 4; if (*y_p >= 0) { - PlaySE(SE_TK_KASYA); + PlaySE(SE_CLICK); CameraObjectReset1(); (*state_p)++; return FALSE; @@ -2203,7 +2203,7 @@ static void EscapeRopeExitFieldEffect_Step0(struct Task * task) { if (IsWeatherNotFadingIn()) { - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); task->data[15] = GetPlayerFacingDirection(); task->data[0]++; } @@ -2293,7 +2293,7 @@ static void TeleportFieldEffectTask2(struct Task * task) task->data[1] = 4; task->data[2] = 8; task->data[3] = 1; - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } } @@ -2379,7 +2379,7 @@ static void TeleportInFieldEffectTask1(struct Task * task) task->data[2] = 1; task->data[14] = sprite->subspriteMode; task->data[15] = GetPlayerFacingDirection(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } } @@ -2889,8 +2889,8 @@ u8 FldEff_UseSurf(void) u8 taskId = CreateTask(Task_FldEffUseSurf, 0xff); gTasks[taskId].data[15] = gFieldEffectArguments[0]; Overworld_ClearSavedMusic(); - if (Overworld_MusicCanOverrideMapMusic(MUS_NAMINORI)) - Overworld_ChangeMusicTo(MUS_NAMINORI); + if (Overworld_MusicCanOverrideMapMusic(MUS_SURF)) + Overworld_ChangeMusicTo(MUS_SURF); return FALSE; } @@ -3052,7 +3052,7 @@ u8 FldEff_NpcFlyOut(void) sprite->oam.priority = 1; sprite->callback = sub_8086D94; sprite->data[1] = gFieldEffectArguments[0]; - PlaySE(SE_W019); + PlaySE(SE_M_FLY); return spriteId; } @@ -3178,7 +3178,7 @@ static void UseFlyEffect_5(struct Task * task) if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent)) { task->data[0]++; - PlaySE(SE_W019); + PlaySE(SE_M_FLY); sub_80871C8(task->data[1]); } } @@ -3816,7 +3816,7 @@ static void Task_FldEffUnk44(u8 taskId) static void Unk44Effect_0(s16 *data, u8 taskId) { u8 newTaskId = CreateTask(sub_8087B14, 90); - PlaySE(SE_T_KAMI2); + PlaySE(SE_THUNDER2); data[5] = newTaskId; data[1]++; } @@ -3830,7 +3830,7 @@ static void Unk44Effect_1(s16 *data, u8 taskId) BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE); BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE); sub_8087CFC(sprite); - PlaySE(SE_T_KAMI); + PlaySE(SE_THUNDER); sub_8087BA8(data[5]); data[3] = 0; data[1]++; diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index d259775ef..55095086c 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -622,7 +622,7 @@ u32 FldEff_Splash(void) sprite->data[1] = gFieldEffectArguments[1]; sprite->data[2] = gFieldEffectArguments[2]; sprite->pos2.y = (graphicsInfo->height >> 1) - 4; - PlaySE(SE_MIZU); + PlaySE(SE_PUDDLE); } return 0; } @@ -732,7 +732,7 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite * sprite) sprite->data[4] = objectEvent->currentCoords.y; if (!sprite->invisible) { - PlaySE(SE_MIZU); + PlaySE(SE_PUDDLE); } } } diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 7f89bc8b5..93bc8133d 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -305,7 +305,7 @@ static void FieldCB_TeleportWarpIn(void) Overworld_PlaySpecialMapMusic(); WarpFadeInScreen(); QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode(); - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); CreateTask(Task_TeleportWarpIn, 10); ScriptContext2_Enable(); } @@ -534,7 +534,7 @@ void DoWarp(void) TryFadeOutOldMapMusic(); WarpFadeOutScreen(); PlayRainStoppingSoundEffect(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); gFieldCallback = FieldCB_DefaultWarpExit; CreateTask(Task_Teleport2Warp, 10); } @@ -644,7 +644,7 @@ void DoCableClubWarp(void) ScriptContext2_Enable(); TryFadeOutOldMapMusic(); WarpFadeOutScreen(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); CreateTask(Task_CableClubWarp, 10); } @@ -657,7 +657,7 @@ static void Task_ReturnFromLinkRoomWarp(u8 taskId) ClearLinkCallback_2(); FadeScreen(FADE_TO_BLACK, 0); TryFadeOutOldMapMusic(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); data[0]++; break; case 1: @@ -713,7 +713,7 @@ static void Task_TeleportWarp(u8 taskId) case 0: FreezeObjectEvents(); ScriptContext2_Enable(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); StartTeleportWarpOutPlayerAnim(); task->data[0]++; break; @@ -813,7 +813,7 @@ static void Task_StairWarp(u8 taskId) PlayRainStoppingSoundEffect(); playerSpr->oam.priority = 1; sub_807EB64(data[1], &data[2], &data[3]); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); data[0]++; } } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 6f8ff69a7..8e87cdf0e 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -378,7 +378,7 @@ static bool8 ForcedMovement_SpinDown(void) static void PlaySpinSound(void) { - PlaySE(SE_W013B); + PlaySE(SE_M_RAZOR_WIND2); } static bool8 ForcedMovement_PushedSouthByCurrent(void) @@ -901,7 +901,7 @@ void PlayerTurnInPlace(u8 direction) void PlayerJumpLedge(u8 direction) { - PlaySE(SE_DANSA); + PlaySE(SE_LEDGE); PlayerSetAnimId(GetJump2MovementAction(direction), 8); } @@ -952,25 +952,25 @@ static void PlayerEndWheelie(u8 direction) static void PlayerStandingHoppingWheelie(u8 direction) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetAcroWheelieHopFaceDirectionMovementAction(direction), 1); } static void PlayerMovingHoppingWheelie(u8 direction) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetAcroWheelieHopDirectionMovementAction(direction), 2); } static void PlayerLedgeHoppingWheelie(u8 direction) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetAcroWheelieJumpDirectionMovementAction(direction), 8); } static void PlayerAcroTurnJump(u8 direction) { - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1); } @@ -1432,7 +1432,7 @@ static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject gFieldEffectArguments[2] = strengthObject->previousElevation; gFieldEffectArguments[3] = gSprites[strengthObject->spriteId].oam.priority; FieldEffectStart(FLDEFF_DUST); - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); task->data[0]++; } return FALSE; @@ -1475,7 +1475,7 @@ static bool8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEv gPlayerAvatar.preventStep = TRUE; if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - PlaySE(SE_DANSA); + PlaySE(SE_LEDGE); sub_805C06C(objectEvent, GetJumpInPlaceMovementAction(objectEvent->facingDirection)); task->data[1]++; if (task->data[1] > 1) @@ -1514,7 +1514,7 @@ static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct Objec task->data[1] = objectEvent->movementDirection; gPlayerAvatar.preventStep = TRUE; ScriptContext2_Enable(); - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); return TRUE; } diff --git a/src/field_specials.c b/src/field_specials.c index a127eb774..98f9852cd 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -473,7 +473,7 @@ void ShakeScreen(void) gTasks[taskId].tDuration = gSpecialVar_0x8007; gTasks[taskId].tYtrans = gSpecialVar_0x8004; SetCameraPanningCallback(NULL); - PlaySE(SE_W070); + PlaySE(SE_M_STRENGTH); } static void Task_ShakeScreen(u8 taskId) @@ -1067,7 +1067,7 @@ void AnimateElevator(void) data[5] = sElevatorAnimationDuration[nfloors]; SetCameraPanningCallback(NULL); AnimateElevatorWindowView(nfloors, data[6]); - PlaySE(SE_ELEBETA); + PlaySE(SE_ELEVATOR); } static void Task_ElevatorShake(u8 taskId) @@ -1082,7 +1082,7 @@ static void Task_ElevatorShake(u8 taskId) SetCameraPanning(0, data[4]); if (data[2] == data[5]) { - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); DestroyTask(taskId); EnableBothScriptContexts(); InstallCameraPanAheadCallback(); @@ -2306,7 +2306,7 @@ void CutMoveOpenDottedHoleDoor(void) { MapGridSetMetatileIdAt(31, 31, METATILE_SeviiIslands67_DottedHoleDoor_Open); DrawWholeMapView(); - PlaySE(SE_BAN); + PlaySE(SE_BANG); FlagSet(FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE); ScriptContext2_Disable(); } @@ -2404,9 +2404,9 @@ static void MoveDeoxysObject(u8 num) sub_8083598(10); TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjId); if (num == 0) - PlaySE(SE_W109); + PlaySE(SE_M_CONFUSE_RAY); else - PlaySE(SE_DEOMOV); + PlaySE(SE_DEOXYS_MOVE); CreateTask(Task_WaitDeoxysFieldEffect, 8); gFieldEffectArguments[0] = 1; gFieldEffectArguments[1] = 56; @@ -2532,7 +2532,7 @@ void LoopWingFlapSound(void) // 8004 = Num flaps // 8005 = Frame delay between flaps CreateTask(Task_WingFlapSound, 8); - PlaySE(SE_W017); + PlaySE(SE_M_WING_ATTACK); } static void Task_WingFlapSound(u8 taskId) @@ -2543,7 +2543,7 @@ static void Task_WingFlapSound(u8 taskId) { data[0]++; data[1] = 0; - PlaySE(SE_W017); + PlaySE(SE_M_WING_ATTACK); } if (data[0] == gSpecialVar_0x8004 - 1) DestroyTask(taskId); diff --git a/src/field_tasks.c b/src/field_tasks.c index 0eb3045e0..3f22fd3b9 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -199,7 +199,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId) { x = data[4]; y = data[5]; - PlaySE(SE_RU_BARI); + PlaySE(SE_ICE_CRACK); MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_CrackedIce); CurrentMapDrawMetatileAt(x, y); data[1] = 1; @@ -214,7 +214,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId) { x = data[4]; y = data[5]; - PlaySE(SE_RU_GASYAN); + PlaySE(SE_ICE_BREAK); MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_IceHole); CurrentMapDrawMetatileAt(x, y); VarSet(VAR_TEMP_1, 1); diff --git a/src/field_weather.c b/src/field_weather.c index 1185f5763..b097524bc 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -1090,13 +1090,13 @@ void SetRainStrengthFromSoundEffect(u16 soundEffect) { switch (soundEffect) { - case SE_T_KOAME: + case SE_RAIN: gWeatherPtr->rainStrength = 0; break; - case SE_T_OOAME: + case SE_DOWNPOUR: gWeatherPtr->rainStrength = 1; break; - case SE_T_AME: + case SE_THUNDERSTORM: gWeatherPtr->rainStrength = 2; break; default: @@ -1114,14 +1114,14 @@ void PlayRainStoppingSoundEffect(void) switch (gWeatherPtr->rainStrength) { case 0: - PlaySE(SE_T_KOAME_E); + PlaySE(SE_RAIN_STOP); break; case 1: - PlaySE(SE_T_OOAME_E); + PlaySE(SE_DOWNPOUR_STOP); break; case 2: default: - PlaySE(SE_T_AME_E); + PlaySE(SE_THUNDERSTORM_STOP); break; } } diff --git a/src/field_weather_effects.c b/src/field_weather_effects.c index 2acf19a5f..f935b3afb 100644 --- a/src/field_weather_effects.c +++ b/src/field_weather_effects.c @@ -444,7 +444,7 @@ void Rain_InitVars(void) gWeatherPtr->targetRainSpriteCount = 10; gWeatherPtr->gammaTargetIndex = 3; gWeatherPtr->gammaStepDelay = 20; - SetRainStrengthFromSoundEffect(SE_T_KOAME); + SetRainStrengthFromSoundEffect(SE_RAIN); } void Rain_InitAll(void) @@ -983,7 +983,7 @@ void Thunderstorm_InitVars(void) gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment gWeatherPtr->thunderTriggered = FALSE; - SetRainStrengthFromSoundEffect(SE_T_AME); + SetRainStrengthFromSoundEffect(SE_THUNDERSTORM); } void Thunderstorm_InitAll(void) @@ -1011,7 +1011,7 @@ void Downpour_InitVars(void) gWeatherPtr->gammaTargetIndex = 3; gWeatherPtr->gammaStepDelay = 20; gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment - SetRainStrengthFromSoundEffect(SE_T_OOAME); + SetRainStrengthFromSoundEffect(SE_DOWNPOUR); } void Downpour_InitAll(void) @@ -1180,9 +1180,9 @@ static void UpdateThunderSound(void) return; if (Random() & 1) - PlaySE(SE_T_KAMI); + PlaySE(SE_THUNDER); else - PlaySE(SE_T_KAMI2); + PlaySE(SE_THUNDER2); gWeatherPtr->thunderTriggered = FALSE; } diff --git a/src/fire.c b/src/fire.c index f0b3d4451..7833620d4 100644 --- a/src/fire.c +++ b/src/fire.c @@ -1034,7 +1034,7 @@ static void sub_80AD690(struct Sprite *sprite) sprite->data[5] = (sprite->data[5] + 4) & 0xFF; newData5 = sprite->data[5]; if ((initialData5 == 0 || initialData5 > 196) && newData5 > 0 && sprite->data[7] == 0) - PlaySE12WithPanning(SE_W172, gUnknown_2037F24); + PlaySE12WithPanning(SE_M_FLAME_WHEEL, gUnknown_2037F24); } else { diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 35ba3821f..eed361b49 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -216,7 +216,7 @@ bool8 FldEff_CutGrass(void) struct MapPosition *pos; i = 0; - PlaySE(SE_W015); + PlaySE(SE_M_CUT); PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); for (i = 0, pos = &gPlayerFacingPosition, neg1 = 0xFFFF; i < 3; i++) @@ -301,7 +301,7 @@ static void SpriteCallback_CutGrass_Cleanup(struct Sprite * sprite) static void FieldMoveCallback_CutTree(void) { - PlaySE(SE_W015); + PlaySE(SE_M_CUT); FieldEffectActiveListRemove(FLDEFF_USE_CUT_ON_TREE); EnableBothScriptContexts(); } diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 0c5f96cb3..067e17162 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -183,7 +183,7 @@ static void FieldCallback_Flash(void) static void FldEff_UseFlash(void) { - PlaySE(SE_W115); + PlaySE(SE_M_REFLECT); FlagSet(FLAG_SYS_FLASH_ACTIVE); ScriptContext1_SetupScript(EventScript_FldEffFlash); } diff --git a/src/fldeff_poison.c b/src/fldeff_poison.c index c88ec6502..1e609caf4 100644 --- a/src/fldeff_poison.c +++ b/src/fldeff_poison.c @@ -28,7 +28,7 @@ static void Task_FieldPoisonEffect(u8 taskId) void FldEffPoison_Start(void) { - PlaySE(SE_DOKU); + PlaySE(SE_FIELD_POISON); CreateTask(Task_FieldPoisonEffect, 80); } diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 12377f345..ef11affd7 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -131,7 +131,7 @@ bool8 FldEff_UseRockSmash(void) static void sub_80C9A60(void) { - PlaySE(SE_W088); + PlaySE(SE_M_ROCK_THROW); FieldEffectActiveListRemove(FLDEFF_USE_ROCK_SMASH); EnableBothScriptContexts(); } diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index 2854653e5..22887242a 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -55,7 +55,7 @@ void Task_TryUseSoftboiledOnPartyMon(u8 taskId) } else { - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); PartyMenuModifyHP(taskId, r8, -1, GetMonData(&gPlayerParty[r8], MON_DATA_MAX_HP) / 5, sub_80E57E8); } } @@ -63,7 +63,7 @@ void Task_TryUseSoftboiledOnPartyMon(u8 taskId) static void sub_80E57E8(u8 taskId) { - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); PartyMenuModifyHP(taskId, gPartyMenu.slotId2, 1, GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MAX_HP) / 5, sub_80E583C); } diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index 3d1dce193..082a7b184 100644 --- a/src/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c @@ -50,7 +50,7 @@ static void StartSweetScentFieldEffect(void) { u8 taskId; - PlaySE(SE_W230); + PlaySE(SE_M_SWEET_SCENT); gUnknown_203AAB0 = (u8 *)Alloc(0x400); CpuFastSet(gPlttBufferUnfaded, gUnknown_203AAB0, 0x100); CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100); diff --git a/src/ghost.c b/src/ghost.c index 30f6b9bdb..4aab8409f 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -252,7 +252,7 @@ static void sub_80B52D0(struct Sprite *sprite) return; if (r0 <= 0) return; - PlaySE12WithPanning(SE_W109, gUnknown_2037F24); + PlaySE12WithPanning(SE_M_CONFUSE_RAY, gUnknown_2037F24); } static void sub_80B5344(struct Sprite *sprite) @@ -267,7 +267,7 @@ static void sub_80B5344(struct Sprite *sprite) sprite->data[5] = (sprite->data[5] + 5) & 0xFF; r0 = sprite->data[5]; if ((r2 == 0 || r2 > 196) && r0 > 0) - PlaySE(SE_W109); + PlaySE(SE_M_CONFUSE_RAY); if (sprite->data[6] == 0) { sprite->invisible = TRUE; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 2838675f7..305da6206 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -351,7 +351,7 @@ static bool8 InitHallOfFameScreen(void) if (!gPaletteFade.active) { SetMainCallback2(CB2_HofIdle); - PlayBGM(MUS_DENDOU); + PlayBGM(MUS_HALL_OF_FAME); return FALSE; } break; @@ -571,7 +571,7 @@ static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId) } HallOfFame_PrintWelcomeText(0, 15); - PlaySE(SE_DENDOU); + PlaySE(SE_APPLAUSE); gTasks[taskId].data[3] = 400; gTasks[taskId].func = Task_Hof_ApplauseAndConfetti; } diff --git a/src/help_system.c b/src/help_system.c index d43a0eb32..946da55be 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -54,12 +54,12 @@ u8 RunHelpSystemCallback(void) { if (!sub_812B45C() || !gHelpSystemEnabled) { - PlaySE(SE_HELP_NG); + PlaySE(SE_HELP_ERROR); return 0; } m4aMPlayStop(&gMPlayInfo_SE1); m4aMPlayStop(&gMPlayInfo_SE2); - PlaySE(SE_HELP_OP); + PlaySE(SE_HELP_OPEN); if (!gUnknown_203F174) m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x80); SaveCallbacks(); @@ -107,7 +107,7 @@ u8 RunHelpSystemCallback(void) case 5: if (!RunHelpMenuSubroutine(&gHelpSystemListMenu, gHelpSystemListMenuItems)) { - PlaySE(SE_HELP_CL); + PlaySE(SE_HELP_CLOSE); sVideoState.state = 6; } break; diff --git a/src/intro.c b/src/intro.c index 802c00851..b32db2e07 100644 --- a/src/intro.c +++ b/src/intro.c @@ -1036,7 +1036,7 @@ static void IntroCB_GameFreakStar(struct IntroSequenceData * this) switch (this->state) { case 0: - PlaySE(MUS_TITLEROG); + PlaySE(MUS_GAME_FREAK); GameFreakScene_LoadGfxCreateStar(); this->data[5] = 0; this->state++; @@ -1206,7 +1206,7 @@ static void IntroCB_FightScene(struct IntroSequenceData * this) case 3: if (!gPaletteFade.active) { - m4aSongNumStart(MUS_DEMO); + m4aSongNumStart(MUS_INTRO_FIGHT); this->data[5] = 0; this->state++; } diff --git a/src/item_menu.c b/src/item_menu.c index 3002c3970..676ce6759 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -683,7 +683,7 @@ static void BagListMenuMoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMe { if (onInit != TRUE) { - PlaySE(SE_BAG1); + PlaySE(SE_BAG_CURSOR); sub_8098580(); } if (sBagMenuDisplay->itemOriginalLocation == 0xFF) @@ -1136,14 +1136,14 @@ static u8 ProcessPocketSwitchInput(u8 taskId, u8 pocketId) { if (pocketId == POCKET_ITEMS - 1) return 0; - PlaySE(SE_BAG2); + PlaySE(SE_BAG_POCKET); return 1; } if (JOY_NEW(DPAD_RIGHT) || lrState == 2) { if (pocketId >= POCKET_POKE_BALLS - 1) return 0; - PlaySE(SE_BAG2); + PlaySE(SE_BAG_POCKET); return 2; } return 0; @@ -2115,7 +2115,7 @@ static void Task_Bag_OldManTutorial(u8 taskId) { case 102: case 204: - PlaySE(SE_BAG2); + PlaySE(SE_BAG_POCKET); SwitchPockets(taskId, 1, FALSE); break; case 306: @@ -2216,7 +2216,7 @@ static void Task_Bag_TeachyTvRegister(u8 taskId) switch (data[8]) { case 102: - PlaySE(SE_BAG2); + PlaySE(SE_BAG_POCKET); SwitchPockets(taskId, 1, FALSE); break; case 204: @@ -2277,7 +2277,7 @@ static void Task_Bag_TeachyTvCatching(u8 taskId) { case 102: case 204: - PlaySE(SE_BAG2); + PlaySE(SE_BAG_POCKET); SwitchPockets(taskId, 1, FALSE); break; case 306: @@ -2367,7 +2367,7 @@ static void Task_Bag_TeachyTvTMs(u8 taskId) switch (data[8]) { case 102: - PlaySE(SE_BAG2); + PlaySE(SE_BAG_POCKET); SwitchPockets(taskId, 1, 0); break; case 204: diff --git a/src/item_use.c b/src/item_use.c index 086f9d0c4..bd1a46d7e 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -276,7 +276,7 @@ void FieldUseFunc_MachBike(u8 taskId) static void ItemUseOnFieldCB_Bicycle(u8 taskId) { if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) - PlaySE(SE_JITENSYA); + PlaySE(SE_BIKE_BELL); StartTransitionToFlipBikeState(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE); ClearPlayerHeldMovementAndUnfreezeObjectEvents(); ScriptContext2_Disable(); @@ -552,7 +552,7 @@ void FieldUseFunc_SuperRepel(u8 taskId) { if (VarGet(VAR_REPEL_STEP_COUNT) == 0) { - PlaySE(SE_TU_SAA); + PlaySE(SE_REPEL); gTasks[taskId].func = sub_80A19E8; } else @@ -607,7 +607,7 @@ static void sub_80A1B48(u8 taskId) { if (++gTasks[taskId].data[8] > 7) { - PlaySE(SE_BIDORO); + PlaySE(SE_GLASS_FLUTE); DisplayItemMessageInBag(taskId, 2, gStringVar4, Task_ReturnToBagFromContextMenu); } } @@ -775,7 +775,7 @@ static void Task_BattleUse_StatBooster_DelayAndPrint(u8 taskId) if (++data[8] > 7) { u16 itemId = gSpecialVar_ItemId; - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); RemoveBagItem(itemId, 1); DisplayItemMessageInBag(taskId, 2, Battle_PrintStatBoosterEffectMessage(itemId), Task_BattleUse_StatBooster_WaitButton_ReturnToBattle); } diff --git a/src/itemfinder.c b/src/itemfinder.c index ab455d240..434bd87a2 100644 --- a/src/itemfinder.c +++ b/src/itemfinder.c @@ -169,7 +169,7 @@ static void Task_ItemfinderResponseSoundsAndAnims(u8 taskId) } else { - PlaySE(SE_DAUGI); + PlaySE(SE_ITEMFINDER); CreateArrowSprite(tDingNum, direction); tDingNum++; tNumDingsRemaining--; @@ -190,7 +190,7 @@ static void Task_ItemfinderUnderfootSoundsAndAnims(u8 taskId) } else { - PlaySE(SE_DAUGI); + PlaySE(SE_ITEMFINDER); tStartSpriteId = CreateStarSprite(); tDingNum++; tNumDingsRemaining--; diff --git a/src/learn_move.c b/src/learn_move.c index 260be916d..28fcc2c7e 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -656,10 +656,10 @@ static void MoveRelearnerStateMachine(void) case MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE: StringExpandPlaceholdersAndPrintTextOnWindow7Color2(gText_MonForgotOldMoveAndMonLearnedNewMove); sMoveRelearner->state = 31; - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); break; case MENU_STATE_PRINT_TEXT_THEN_FANFARE: - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); sMoveRelearner->state = 32; break; case MENU_STATE_WAIT_FOR_FANFARE: diff --git a/src/mevent.c b/src/mevent.c index 469019fa6..3069c4d0a 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -177,7 +177,7 @@ static u32 EReaderReceive(u8 * state_p, u16 * receiveDelay) case 2: if (GetLinkPlayerCount_2() == 2) { - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); CheckShouldAdvanceLinkState(); *receiveDelay = 0; *state_p = 3; @@ -443,7 +443,7 @@ static void Task_EReaderComm(u8 taskId) if (AdvanceDelayTimerCheckTimeout(&data->stateAdvanceDelay, 120)) { AddTextPrinterToWindow1(gJPText_NewTrainerHasComeToSevii); - PlayFanfare(MUS_FANFA4); + PlayFanfare(MUS_OBTAIN_ITEM); data->state = 19; } break; diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c index 874fb2377..bc8023599 100644 --- a/src/minigame_countdown.c +++ b/src/minigame_countdown.c @@ -86,7 +86,7 @@ static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId) // fallthrough case 1: if (sprite->data[2] == 0) - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); if (++sprite->data[2] >= 20) { sprite->data[2] = 0; @@ -178,7 +178,7 @@ static void SpriteCB_Start(struct Sprite * sprite) sprite->pos2.y = data[5] >> 4; if (sprite->pos2.y >= 0) { - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); sprite->pos2.y = 0; data[0]++; } @@ -187,7 +187,7 @@ static void SpriteCB_Start(struct Sprite * sprite) data[1] += 12; if (data[1] >= 128) { - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); data[1] = 0; data[0]++; } @@ -198,7 +198,7 @@ static void SpriteCB_Start(struct Sprite * sprite) data[1] += 16; if (data[1] >= 128) { - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); data[1] = 0; data[0]++; } diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index e5965ac00..39de542d7 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -421,7 +421,7 @@ bool32 HandleMysteryGiftOrEReaderSetup(s32 mg_or_ereader) case 3: ShowBg(0); ShowBg(3); - PlayBGM(MUS_OKURIMONO); + PlayBGM(MUS_MYSTERY_GIFT); SetVBlankCallback(vblankcb_mystery_gift_e_reader_run); EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_VCOUNT | INTR_FLAG_TIMER3 | INTR_FLAG_SERIAL); return TRUE; @@ -1009,7 +1009,7 @@ bool32 PrintMGSuccessMessage(u8 * state, const u8 * arg1, u16 * arg2) { AddTextPrinterToWindow1(arg1); } - PlayFanfare(MUS_FANFA4); + PlayFanfare(MUS_OBTAIN_ITEM); *arg2 = 0; (*state)++; break; diff --git a/src/naming_screen.c b/src/naming_screen.c index 5d00cefbc..2fdf457f9 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1714,7 +1714,7 @@ static void DeleteTextCharacter(void) var2 = GetKeyRoleAtCursorPos(); if (var2 == KEY_ROLE_CHAR || var2 == KEY_ROLE_BACKSPACE) sub_809E518(1, 0, 1); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } static bool8 AppendCharToBuffer_CheckBufferFull(void) diff --git a/src/oak_speech.c b/src/oak_speech.c index e279091c2..2b034d017 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -568,7 +568,7 @@ static void Task_OaksSpeech1(u8 taskId) ShowBg(0); ShowBg(1); SetVBlankCallback(VBlankCB_NewGameOaksSpeech); - PlayBGM(MUS_SOUSA); + PlayBGM(MUS_NEW_GAME_INSTRUCT); gTasks[taskId].func = Task_OaksSpeech2; gMain.state = 0; return; @@ -722,7 +722,7 @@ static void Task_OakSpeech6(u8 taskId) data[3]--; else { - PlayBGM(MUS_SEKAIKAN); + PlayBGM(MUS_NEW_GAME_INTRO); ClearTopBarWindow(); TopBarWindowPrintString(gText_ABUTTONNext, 0, 1); sOakSpeechResources->unk_0008 = MallocAndDecompress(sNewGameAdventureIntroTilemap, &sp14); @@ -824,7 +824,7 @@ static void Task_OakSpeech7(u8 taskId) break; case 4: sub_8006398(gTasks[taskId].data[5]); - PlayBGM(MUS_SEIBETU); + PlayBGM(MUS_NEW_GAME_EXIT); data[15] = 24; gMain.state++; break; @@ -883,7 +883,7 @@ static void Task_OakSpeech9(u8 taskId) CreateNidoranFSprite(taskId); LoadOaksSpeechTrainerPic(3, 0); CreatePikaOrGrassPlatformSpriteAndLinkToCurrentTask(taskId, 1); - PlayBGM(MUS_OPENING); + PlayBGM(MUS_ROUTE24); BeginNormalPaletteFade(0xFFFFFFFF, 5, 16, 0, RGB_BLACK); data[3] = 80; ShowBg(2); @@ -1416,7 +1416,7 @@ static void Task_OakSpeech39(u8 taskId) if (sOakSpeechResources->unk_0012 % 20 == 0) { if (sOakSpeechResources->unk_0012 == 40) - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); r0 = data[2]; data[2] -= 32; x = MathUtil_Inv16(r0 - 8); diff --git a/src/overworld.c b/src/overworld.c index ce14ae88b..0e50a984d 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1023,7 +1023,7 @@ void Overworld_PlaySpecialMapMusic(void) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(POKEMON_LEAGUE_CHAMPIONS_ROOM)) { PlayerGetDestCoords(&x, &y); - if (y - 7 < 11 && gMPlayInfo_BGM.songHeader == &mus_win_gym) + if (y - 7 < 11 && gMPlayInfo_BGM.songHeader == &mus_victory_gym_leader) { FadeInBGM(4); return; @@ -1034,8 +1034,8 @@ void Overworld_PlaySpecialMapMusic(void) if (gSaveBlock1Ptr->savedMusic) music = gSaveBlock1Ptr->savedMusic; - else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_NAMINORI)) - music = MUS_NAMINORI; + else if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_SURF)) + music = MUS_SURF; if (music != GetCurrentMapMusic()) PlayNewMapMusic(music); @@ -1070,10 +1070,10 @@ static void Overworld_TryMapConnectionMusicTransition(void) { newMusic = GetWarpDestinationMusic(); currentMusic = GetCurrentMapMusic(); - if (currentMusic == MUS_NAMINORI) + if (currentMusic == MUS_SURF) return; - if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_NAMINORI)) - newMusic = MUS_NAMINORI; + if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) && Overworld_MusicCanOverrideMapMusic(MUS_SURF)) + newMusic = MUS_SURF; if (newMusic != currentMusic) { if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE)) @@ -1192,7 +1192,7 @@ static void ChooseAmbientCrySpecies(void) bool32 Overworld_MusicCanOverrideMapMusic(u16 music) { - if (music == MUS_CYCLING || music == MUS_NAMINORI) + if (music == MUS_CYCLING || music == MUS_SURF) { if (gMapHeader.regionMapSectionId == MAPSEC_KANTO_VICTORY_ROAD || gMapHeader.regionMapSectionId == MAPSEC_ROUTE_23 || gMapHeader.regionMapSectionId == MAPSEC_INDIGO_PLATEAU) return FALSE; diff --git a/src/party_menu.c b/src/party_menu.c index b8ad7d830..43ee671b0 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1214,7 +1214,7 @@ static bool8 IsSelectedMonNotEgg(u8 *slotPtr) { if (GetMonData(&gPlayerParty[*slotPtr], MON_DATA_IS_EGG) == TRUE) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); return FALSE; } return TRUE; @@ -1225,7 +1225,7 @@ static void HandleChooseMonCancel(u8 taskId, s8 *slotPtr) switch (gPartyMenu.action) { case PARTY_ACTION_SEND_OUT: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); break; case PARTY_ACTION_SWITCH: case PARTY_ACTION_SOFTBOILED: @@ -1844,7 +1844,7 @@ static void TryEnterMonForMinigame(u8 taskId, u8 slot) } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); DisplayPartyMenuMessage(gText_PkmnCantParticipate, FALSE); ScheduleBgCopyTilemapToVram(2); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; @@ -3809,7 +3809,7 @@ static void CursorCB_Enter(u8 taskId) return; } } - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); DisplayPartyMenuMessage(str, TRUE); gTasks[taskId].func = Task_ReturnToChooseMonAfterText; } @@ -3884,7 +3884,7 @@ static void CursorCB_Register(u8 taskId) Task_ClosePartyMenu(taskId); return; } - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); StringAppend(gStringVar4, gText_PauseUntilPress); @@ -3902,7 +3902,7 @@ static void CursorCB_Trade1(u8 taskId) if (stringId != UR_TRADE_MSG_NONE) { StringExpandPlaceholders(gStringVar4, sUnionRoomTradeMessages[stringId - 1]); - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[0]); PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); StringAppend(gStringVar4, gText_PauseUntilPress); @@ -4528,13 +4528,13 @@ void ItemUseCB_MedicineStep(u8 taskId, TaskFunc func) gPartyMenuUseExitCallback = TRUE; if (!IsItemFlute(item)) { - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); if (gPartyMenu.action != PARTY_ACTION_REUSABLE_ITEM) RemoveBagItem(item, 1); } else { - PlaySE(SE_BIDORO); + PlaySE(SE_GLASS_FLUTE); } SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[gPartyMenu.slotId]); if (gSprites[sPartyMenuBoxes[gPartyMenu.slotId].statusSpriteId].invisible) @@ -4694,7 +4694,7 @@ static void sub_8125898(u8 taskId, UNUSED TaskFunc func) ExecuteTableBasedItemEffect_(gPartyMenu.slotId, gSpecialVar_ItemId, (u8)gPartyMenu.data1); gPartyMenuUseExitCallback = TRUE; ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, mon, gSpecialVar_ItemId, 0xFFFF); - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); RemoveBagItem(gSpecialVar_ItemId, 1); move = GetMonData(mon, gPartyMenu.data1 + MON_DATA_MOVE1); StringCopy(gStringVar1, gMoveNames[move]); @@ -4725,7 +4725,7 @@ static void TryUsePPItem(u8 taskId) gPartyMenuUseExitCallback = TRUE; mon = &gPlayerParty[ptr->slotId]; ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, mon, item, 0xFFFF); - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); RemoveBagItem(item, 1); move = GetMonData(mon, MON_DATA_MOVE1 + *moveSlot); StringCopy(gStringVar1, gMoveNames[move]); @@ -4851,7 +4851,7 @@ static void Task_DoLearnedMoveFanfareAfterText(u8 taskId) { if (IsPartyMenuTextPrinterActive() != TRUE) { - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); gTasks[taskId].func = Task_LearnNextMoveOrClosePartyMenu; } } @@ -5260,7 +5260,7 @@ static void UseSacredAsh(u8 taskId) gTasks[taskId].func = Task_SacredAshLoop; return; } - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); if (sPartyMenuInternal->tHadEffect == 0) sSacredAshQuestLogMonBackup = mon; SetPartyMonAilmentGfx(mon, &sPartyMenuBoxes[gPartyMenu.slotId]); @@ -5778,7 +5778,7 @@ static void Task_ValidateChosenHalfParty(u8 taskId) if (msgId != 0xFF) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); DisplayPartyMenuStdMessage(msgId); gTasks[taskId].func = Task_ContinueChoosingHalfParty; } @@ -5791,7 +5791,7 @@ static void Task_ValidateChosenHalfParty(u8 taskId) } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); DisplayPartyMenuStdMessage(PARTY_MSG_NO_MON_FOR_BATTLE); gTasks[taskId].func = Task_ContinueChoosingHalfParty; } @@ -6300,7 +6300,7 @@ static void Task_MultiPartnerPartySlideIn(u8 taskId) if (gMultiPartnerParty[i - MULTI_PARTY_SIZE].species != SPECIES_NONE) AnimateSelectedPartyIcon(sPartyMenuBoxes[i].monSpriteId, 0); } - PlaySE(SE_W231); // The Harden SE plays once the partners party mons have slid on screen + PlaySE(SE_M_HARDEN); // The Harden SE plays once the partners party mons have slid on screen gTasks[taskId].func = Task_WaitAfterMultiPartnerPartySlideIn; } } diff --git a/src/pokeball.c b/src/pokeball.c index 4b908ddea..69bab3e90 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -421,7 +421,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId) gSprites[ballSpriteId].oam.affineParam = taskId; gTasks[taskId].tOpponentBattler = gBattlerTarget; gTasks[taskId].func = TaskDummy; - PlaySE(SE_NAGERU); + PlaySE(SE_BALL_THROW); } static void SpriteCB_TestBallThrow(struct Sprite *sprite) @@ -477,7 +477,7 @@ static void sub_804AD00(struct Sprite *sprite) { sprite->data[5]++; if (sprite->data[5] == 11) - PlaySE(SE_SUIKOMU); + PlaySE(SE_BALL_TRADE); if (gSprites[gBattlerSpriteIds[sprite->sBattler]].affineAnimEnded) { @@ -528,16 +528,16 @@ static void sub_804ADEC(struct Sprite *sprite) switch (sprite->data[3] >> 8) { case 1: - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); break; case 2: - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); break; case 3: - PlaySE(SE_KON3); + PlaySE(SE_BALL_BOUNCE_3); break; default: - PlaySE(SE_KON4); + PlaySE(SE_BALL_BOUNCE_4); break; } } @@ -579,7 +579,7 @@ static void sub_804AEE4(struct Sprite *sprite) sprite->affineAnimPaused = TRUE; StartSpriteAffineAnim(sprite, 1); sprite->callback = sub_804AF24; - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } } @@ -649,7 +649,7 @@ static void sub_804AF24(struct Sprite *sprite) else StartSpriteAffineAnim(sprite, 1); - PlaySE(SE_BOWA); + PlaySE(SE_BALL); } break; } @@ -880,7 +880,7 @@ static void sub_804B5C8(struct Sprite *sprite) { gDoingBattleAnim = FALSE; m4aMPlayAllStop(); - PlaySE(MUS_FAN6); + PlaySE(MUS_CAUGHT_INTRO); } else if (sprite->data[4] == 315) { @@ -1139,7 +1139,7 @@ static void sub_804BCF8(struct Sprite *sprite) sprite->data[5]++; if (sprite->data[5] == 11) - PlaySE(SE_SUIKOMU); + PlaySE(SE_BALL_TRADE); r1 = sprite->data[0]; if (gSprites[r1].affineAnimEnded) diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index 2216a94df..8b13e5dc8 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -2067,7 +2067,7 @@ bool8 sub_81052D0(u8 a0) FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 32, 20); gUnknown_203ACF0->field_03 = 0; gUnknown_203ACF0->field_02++; - PlaySE(SE_TB_START); + PlaySE(SE_BALL_TRAY_ENTER); break; case 5: if (gUnknown_203ACF0->field_03 < 10) @@ -2086,7 +2086,7 @@ bool8 sub_81052D0(u8 a0) CpuFastCopy(GetBgTilemapBuffer(1), &gUnknown_203ACF0->field_5C[2 * BG_SCREEN_SIZE / 2], BG_SCREEN_SIZE); gUnknown_203ACF0->field_03 = 9; gUnknown_203ACF0->field_02++; - PlaySE(SE_TB_START); + PlaySE(SE_BALL_TRAY_ENTER); break; case 7: if (gUnknown_203ACF0->field_03 != 0) diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 2b2d77d91..853ec4f26 100644 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -201,7 +201,7 @@ static void sub_81478BC(struct Sprite *sprite) sprite->invisible = FALSE; case 1: case 2: - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); StartSpriteAnim(sprite, sprite->data[2]); break; case 3: @@ -223,7 +223,7 @@ static void sub_81478BC(struct Sprite *sprite) static void sub_81479D4(u8 taskId) { s16 *data = gTasks[taskId].data; - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); gSprites[data[13]].callback = sub_81478BC; gSprites[data[13]].invisible = FALSE; gTasks[taskId].data[0] = 3; diff --git a/src/pokemon_jump_2.c b/src/pokemon_jump_2.c index f1f6e2906..862416c65 100644 --- a/src/pokemon_jump_2.c +++ b/src/pokemon_jump_2.c @@ -431,7 +431,7 @@ static void sub_8147DA0(u8 taskId) case 2: if (!sub_8149D68() && IsNotWaitingForBGMStop() == TRUE) { - FadeOutAndPlayNewMapMusic(MUS_JUMP, 8); + FadeOutAndPlayNewMapMusic(MUS_POKE_JUMP, 8); gUnknown_203F3D4->unk8++; } break; @@ -1577,7 +1577,7 @@ static void sub_81492B8(void) gUnknown_203F3D4->unk83AC->unk10 = 0; } -static const u16 gUnknown_846B6AC[] = {SE_REGI, SE_REAPOKE, SE_W234, SE_EXCELLENT}; +static const u16 gUnknown_846B6AC[] = {SE_RS_SHOP, SE_SHINY, SE_M_MORNING_SUN, SE_POKE_JUMP_SUCCESS}; static void sub_81492D8(void) { @@ -1654,9 +1654,9 @@ static void sub_814937C(void) } if (whichSound & 0x2) - PlaySE(SE_NAWAMISS); + PlaySE(SE_POKE_JUMP_FAILURE); else if (whichSound & 0x1) - PlaySE(SE_DANSA); + PlaySE(SE_LEDGE); } static const s8 gUnknown_846B6B4[][48] = diff --git a/src/pokemon_jump_4.c b/src/pokemon_jump_4.c index f72710c42..64316f46e 100644 --- a/src/pokemon_jump_4.c +++ b/src/pokemon_jump_4.c @@ -527,7 +527,7 @@ void sub_814A468(u16 itemId, u16 quantity) gUnknown_203F3D8->unk12 = sub_814A754(4, 8, 22, 4); AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL); CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk14 = MUS_FANFA1; + gUnknown_203F3D8->unk14 = MUS_LEVEL_UP; gUnknown_203F3D8->unkD = 0; } diff --git a/src/pokemon_jump_5.c b/src/pokemon_jump_5.c index f8abb2a1f..2b9f31a22 100644 --- a/src/pokemon_jump_5.c +++ b/src/pokemon_jump_5.c @@ -534,7 +534,7 @@ static void sub_814B1CC(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - PlaySE(SE_JITE_PYOKO); + PlaySE(SE_BIKE_HOP); sprite->data[1] = 0; sprite->data[0]++; // fall through diff --git a/src/pokemon_special_anim.c b/src/pokemon_special_anim.c index f05b93c54..f16e111e2 100644 --- a/src/pokemon_special_anim.c +++ b/src/pokemon_special_anim.c @@ -339,7 +339,7 @@ static void Task_ForgetMove(u8 taskId) ptr->delayTimer++; if (ptr->delayTimer > 30) { - PlaySE(SE_W255); + PlaySE(SE_M_SPIT_UP); PSA_PrintMessage(PSA_TEXT_FORGET_POOF); PSA_DarkenMonSprite(); ptr->state++; @@ -560,7 +560,7 @@ static void Task_MachineSet(u8 taskId) case 8: if (!PSA_IsMessagePrintTaskActive()) { - PlayFanfare(MUS_FANFA1); + PlayFanfare(MUS_LEVEL_UP); ptr->cancelDisabled = TRUE; ptr->state++; } diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c index 6c9f21099..b3f005c87 100644 --- a/src/pokemon_special_anim_scene.c +++ b/src/pokemon_special_anim_scene.c @@ -528,7 +528,7 @@ bool8 PSA_UseTM_RunZoomOutAnim(void) if (scene->field_0004 > 0) { scene->field_0004 = 0; - PlaySE(SE_W025); + PlaySE(SE_M_MEGA_KICK); BeginNormalPaletteFade(0x00000001, 2, 0, 12, RGB(8, 13, 31)); PSAScene_SeedRandomInTask(scene); scene->state++; @@ -560,7 +560,7 @@ bool8 PSA_UseTM_RunZoomOutAnim(void) } break; case 8: - PlaySE(SE_EXPMAX); + PlaySE(SE_EXP_MAX); DestroySprite(scene->itemIconSprite); scene->state++; break; @@ -584,7 +584,7 @@ bool8 PSA_UseTM_RunMachineSetWobble(void) { case 0: MachineSetWobbleInit(); - PlaySE(SE_MU_PACHI); + PlaySE(SE_SWITCH); scene->state++; break; case 1: @@ -730,7 +730,7 @@ static void Task_ZoomAnim(u8 taskId) case 1: if (!IsZoomSpriteCBActive(sprite)) { - PlaySE(SE_TB_KARA); + PlaySE(SE_BALL_TRAY_EXIT); MonSpriteZoom_UpdateYPos(sprite, tCurrCloseness); if (tHasItemSprite) ItemSpriteZoom_UpdateYPos((void *)GetWordTaskArg(taskId, tOff_ItemSprite), tCurrCloseness); @@ -933,7 +933,7 @@ static void Task_ItemUseOnMonAnim(u8 taskId) if (tTimer > 20) { tTimer = 0; - PlaySE(SE_W207B); + PlaySE(SE_M_SWAGGER2); sprite->invisible = FALSE; if (!tSuppressDots) LoadOutwardSpiralDotsGfx(); @@ -949,7 +949,7 @@ static void Task_ItemUseOnMonAnim(u8 taskId) StartSpriteAffineAnim(sprite, tCloseness); BeginNormalPaletteFade(0x10000 << IndexOfSpritePaletteTag(1), -2, 0, 12, tBlendColor); tState = 2; - PlaySE(SE_W208); + PlaySE(SE_M_MILK_DRINK); } break; case 2: @@ -968,7 +968,7 @@ static void Task_ItemUseOnMonAnim(u8 taskId) if (!tSuppressDots) CreateSprites_UseItem_OutwardSpiralDots(taskId, data, sprite); if (tData7 == 0) - PlaySE(SE_W179); + PlaySE(SE_M_REVERSAL); tData7++; if (tData7 > 2) tState = 4; diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index 6cb7b5640..dcf56186e 100644 --- a/src/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c @@ -769,7 +769,7 @@ static void Cb_MainPSS(u8 taskId) gPSSData->state = 7; break; case 24: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); break; } break; @@ -815,12 +815,12 @@ static void Cb_MainPSS(u8 taskId) } break; case 4: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_LAST_POKE); gPSSData->state = 6; break; case 5: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); gPSSData->state = 6; break; @@ -1034,17 +1034,17 @@ static void Cb_OnSelectedMon(u8 taskId) } break; case 3: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_LAST_POKE); gPSSData->state = 6; break; case 5: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_CANT_RELEASE_EGG); gPSSData->state = 6; break; case 4: - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_PLEASE_REMOVE_MAIL); gPSSData->state = 6; break; @@ -1472,7 +1472,7 @@ static void Cb_ItemToBag(u8 taskId) case 0: if (!AddBagItem(gPSSData->cursorMonItem, 1)) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_BAG_FULL); gPSSData->state = 3; } @@ -1922,7 +1922,7 @@ static void Cb_OnCloseBoxPressed(u8 taskId) case 0: if (IsMonBeingMoved()) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_HOLDING_POKE); gPSSData->state = 1; } @@ -1983,7 +1983,7 @@ static void Cb_OnBPressed(u8 taskId) case 0: if (IsMonBeingMoved()) { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_HOLDING_POKE); gPSSData->state = 1; } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 78366e210..3d53f9ecc 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -3838,7 +3838,7 @@ static void sub_81393D4(u8 taskId) } else { - PlaySE(SE_HAZURE); + PlaySE(SE_FAILURE); sMonSummaryScreen->unk3288 = 5; } } diff --git a/src/psychic.c b/src/psychic.c index 5a6b4f942..32e4dce46 100644 --- a/src/psychic.c +++ b/src/psychic.c @@ -1051,7 +1051,7 @@ static void AnimPsychoBoost(struct Sprite *sprite) case 1: if (sprite->affineAnimEnded) { - PlaySE12WithPanning(SE_W100, BattleAnimAdjustPanning(-64)); + PlaySE12WithPanning(SE_M_TELEPORT, BattleAnimAdjustPanning(-64)); ChangeSpriteAffineAnim(sprite, 1); ++sprite->data[0]; } diff --git a/src/region_map.c b/src/region_map.c index bbc8a40f9..ad152562b 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1614,11 +1614,11 @@ static void PlaySEForSelectedMapsec(void) { if ((GetSelectedMapsecType(LAYER_MAP) != MAPSECTYPE_ROUTE && GetSelectedMapsecType(LAYER_MAP) != MAPSECTYPE_NONE) || (GetSelectedMapsecType(LAYER_DUNGEON) != MAPSECTYPE_ROUTE && GetSelectedMapsecType(LAYER_DUNGEON) != MAPSECTYPE_NONE)) - PlaySE(SE_Z_SCROLL); + PlaySE(SE_DEX_SCROLL); if (GetMapCursorX() == SWITCH_BUTTON_X && GetMapCursorY() == SWITCH_BUTTON_Y && GetRegionMapPermission(MAPPERM_HAS_SWITCH_BUTTON) == TRUE) - PlaySE(SE_W255); + PlaySE(SE_M_SPIT_UP); else if (GetMapCursorX() == CANCEL_BUTTON_X && GetMapCursorY() == CANCEL_BUTTON_Y) - PlaySE(SE_W255); + PlaySE(SE_M_SPIT_UP); } } @@ -2234,19 +2234,19 @@ static bool8 HandleSwitchMapInput(void) data.bottom = sSwitchMapMenu->highlight.bottom = sSwitchMapMenu->highlight.top + 32; if (JOY_NEW(DPAD_UP) && sSwitchMapMenu->currentSelection != 0) { - PlaySE(SE_BAG1); + PlaySE(SE_BAG_CURSOR); sSwitchMapMenu->currentSelection--; changedSelection = TRUE; } if (JOY_NEW(DPAD_DOWN) && sSwitchMapMenu->currentSelection < sSwitchMapMenu->maxSelection) { - PlaySE(SE_BAG1); + PlaySE(SE_BAG_CURSOR); sSwitchMapMenu->currentSelection++; changedSelection = TRUE; } if (JOY_NEW(A_BUTTON) && sSwitchMapMenu->blendY == (BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2)) { - PlaySE(SE_W129); + PlaySE(SE_M_SWIFT); sSwitchMapMenu->chosenRegion = sSwitchMapMenu->currentSelection; return TRUE; } @@ -2828,7 +2828,7 @@ static void Task_MapOpenAnim(u8 taskId) if (!gPaletteFade.active) { sMapOpenCloseAnim->openState++; - PlaySE(SE_CARD3); + PlaySE(SE_CARD_OPEN); } break; case 6: @@ -2872,8 +2872,8 @@ static void Task_MapOpenAnim(u8 taskId) FillBgTilemapBufferRect(1, 0x03F, 29, 1, 1, 1, 0x2); FillBgTilemapBufferRect(1, 0x03D, 2, 1, 26, 1, 0x2); CopyBgTilemapBufferToVram(1); - m4aSongNumStop(SE_CARD3); - PlaySE(SE_HI_TURUN); + m4aSongNumStop(SE_CARD_OPEN); + PlaySE(SE_ROTATING_GATE); sMapOpenCloseAnim->openState++; break; case 12: @@ -3043,7 +3043,7 @@ static void Task_MapCloseAnim(u8 taskId) case 6: sub_80C2B9C(); sub_80C2B48(); - PlaySE(SE_CARD2); + PlaySE(SE_CARD_FLIPPING); sMapOpenCloseAnim->closeState++; break; case 7: @@ -3237,14 +3237,14 @@ static u8 HandleRegionMapInput(void) if (sMapCursor->x == CANCEL_BUTTON_X && sMapCursor->y == CANCEL_BUTTON_Y) { - PlaySE(SE_W063B); + PlaySE(SE_M_HYPER_BEAM2); input = MAP_INPUT_CANCEL; } if (sMapCursor->x == SWITCH_BUTTON_X && sMapCursor->y == SWITCH_BUTTON_Y && GetRegionMapPermission(MAPPERM_HAS_SWITCH_BUTTON) == TRUE) { - PlaySE(SE_W063B); + PlaySE(SE_M_HYPER_BEAM2); input = MAP_INPUT_SWITCH; } } @@ -4373,7 +4373,7 @@ static void Task_FlyMap(u8 taskId) break; case MAP_INPUT_MOVE_END: if (GetSelectedMapsecType(LAYER_MAP) == MAPSECTYPE_VISITED) - PlaySE(SE_Z_PAGE); + PlaySE(SE_DEX_PAGE); else PlaySEForSelectedMapsec(); ResetCursorSnap(); @@ -4382,7 +4382,7 @@ static void Task_FlyMap(u8 taskId) DrawDungeonNameBox(); if (GetMapCursorX() == CANCEL_BUTTON_X && GetMapCursorY() == CANCEL_BUTTON_Y) { - PlaySE(SE_W255); + PlaySE(SE_M_SPIT_UP); PrintTopBarTextRight(gText_RegionMap_AButtonCancel); } else if (GetSelectedMapsecType(LAYER_MAP) == MAPSECTYPE_VISITED || GetSelectedMapsecType(LAYER_MAP) == MAPSECTYPE_UNKNOWN) @@ -4405,7 +4405,7 @@ static void Task_FlyMap(u8 taskId) sFlyMap->state++; break; default: - PlaySE(SE_KAIFUKU); + PlaySE(SE_USE_ITEM); sFlyMap->selectedDestination = TRUE; sFlyMap->state++; break; diff --git a/src/rock.c b/src/rock.c index 25db442ca..922b2ad6a 100644 --- a/src/rock.c +++ b/src/rock.c @@ -607,7 +607,7 @@ static void sub_80B4D00(u8 taskId) task->data[11] = 20; ++task->data[0]; } - PlaySE12WithPanning(SE_W029, task->data[13]); + PlaySE12WithPanning(SE_M_HEADBUTT, task->data[13]); break; case 1: if (--task->data[11] == 0) @@ -636,7 +636,7 @@ static void sub_80B4D00(u8 taskId) task->data[9] = 0; sub_80B4E70(task); task->data[13] += task->data[14]; - PlaySE12WithPanning(SE_W091, task->data[13]); + PlaySE12WithPanning(SE_M_DIG, task->data[13]); } if (--task->data[8] == 0) { diff --git a/src/seagallop.c b/src/seagallop.c index da020f882..8d10b4078 100644 --- a/src/seagallop.c +++ b/src/seagallop.c @@ -236,7 +236,7 @@ static void CB2_SetUpSeagallopScene(void) case 7: SetDispcnt(); SetVBlankCallback(VBlankCB_SeaGallop); - PlaySE(SE_NAMINORI); + PlaySE(SE_SHIP); CreateFerrySprite(); SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); SetGpuReg(REG_OFFSET_WININ, 0x3F); @@ -316,7 +316,7 @@ static void Task_Seagallop_3(void) warpInfo = sSeag[gSpecialVar_0x8006]; SetWarpDestination(warpInfo[0], warpInfo[1], -1, warpInfo[2], warpInfo[3]); PlayRainStoppingSoundEffect(); - PlaySE(SE_KAIDAN); + PlaySE(SE_EXIT); gFieldCallback = FieldCB_DefaultWarpExit; WarpIntoMap(); SetMainCallback2(CB2_LoadMap); diff --git a/src/slot_machine.c b/src/slot_machine.c index 074e8a36f..2c2891c5c 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -883,7 +883,7 @@ static void MainTask_SlotsGameLoop(u8 taskId) { sSlotMachineState->bet++; RemoveCoins(1); - PlaySE(SE_REGI); + PlaySE(SE_RS_SHOP); SetSlotMachineSetupTask(SLOTTASK_SHOW_AMOUNTS, 0); SetSlotMachineSetupTask(SLOTTASK_UPDATE_LINE_LIGHTS, 1); data[0] = 1; @@ -901,7 +901,7 @@ static void MainTask_SlotsGameLoop(u8 taskId) sSlotMachineState->bet += GetCoins(); SetCoins(0); } - PlaySE(SE_REGI); + PlaySE(SE_RS_SHOP); SetSlotMachineSetupTask(SLOTTASK_SHOW_AMOUNTS, 0); SetSlotMachineSetupTask(SLOTTASK_UPDATE_LINE_LIGHTS, 1); data[0] = 1; @@ -941,7 +941,7 @@ static void MainTask_SlotsGameLoop(u8 taskId) { if (JOY_NEW(A_BUTTON)) { - PlaySE(SE_JYUNI); + PlaySE(SE_CONTEST_PLACE); StopCurrentReel(sSlotMachineState->currentReel, sSlotMachineState->currentReel); PressReelButton(sSlotMachineState->currentReel, 0); data[0] = 4; @@ -1099,9 +1099,9 @@ static void MainTask_WinHandlePayout(u8 taskId) { case 0: if (sSlotMachineState->slotRewardClass == SLOT_PAYOUT_ROCKET || sSlotMachineState->slotRewardClass == SLOT_PAYOUT_7) - PlayFanfare(MUS_ME_B_BIG); + PlayFanfare(MUS_SLOTS_JACKPOT); else - PlayFanfare(MUS_ME_B_SMALL); + PlayFanfare(MUS_SLOTS_WIN); SetSlotMachineSetupTask(SLOTTASK_SHOW_AMOUNTS, 0); SetSlotMachineSetupTask(SLOTTASK_ANIM_WIN, 1); data[1] = 8; diff --git a/src/sound.c b/src/sound.c index 7f93f7a59..e956896e8 100644 --- a/src/sound.c +++ b/src/sound.c @@ -41,20 +41,20 @@ extern struct ToneData gCryTable[]; extern struct ToneData gCryTable2[]; static const struct Fanfare sFanfares[] = { - [FANFARE_00] = { MUS_FANFA1, 80 }, - [FANFARE_01] = { MUS_FANFA4, 160 }, - [FANFARE_02] = { MUS_FANFA5, 220 }, - [FANFARE_03] = { MUS_ME_WAZA, 220 }, - [FANFARE_04] = { MUS_ME_ASA, 160 }, - [FANFARE_05] = { MUS_ME_BACHI, 340 }, - [FANFARE_06] = { MUS_ME_WASURE, 180 }, - [FANFARE_07] = { MUS_ME_KINOMI, 120 }, - [FANFARE_08] = { MUS_ME_B_BIG, 250 }, - [FANFARE_09] = { MUS_ME_B_SMALL, 150 }, - [FANFARE_10] = { MUS_ME_ZANNEN, 160 }, - [FANFARE_POKEFLUTE] = { MUS_POKEFUE, 450 }, - [FANFARE_KEY_ITEM] = { MUS_FAN5, 170 }, - [FANFARE_DEX_EVAL] = { MUS_FAN2, 196 } + [FANFARE_00] = { MUS_LEVEL_UP, 80 }, + [FANFARE_01] = { MUS_OBTAIN_ITEM, 160 }, + [FANFARE_02] = { MUS_EVOLVED, 220 }, + [FANFARE_03] = { MUS_OBTAIN_TMHM, 220 }, + [FANFARE_04] = { MUS_HEAL, 160 }, + [FANFARE_05] = { MUS_OBTAIN_BADGE, 340 }, + [FANFARE_06] = { MUS_MOVE_DELETED, 180 }, + [FANFARE_07] = { MUS_OBTAIN_BERRY, 120 }, + [FANFARE_08] = { MUS_SLOTS_JACKPOT, 250 }, + [FANFARE_09] = { MUS_SLOTS_WIN, 150 }, + [FANFARE_10] = { MUS_TOO_BAD, 160 }, + [FANFARE_POKEFLUTE] = { MUS_POKE_FLUTE, 450 }, + [FANFARE_KEY_ITEM] = { MUS_OBTAIN_KEY_ITEM, 170 }, + [FANFARE_DEX_EVAL] = { MUS_DEX_RATING, 196 } }; extern u16 SpeciesToCryId(u16); diff --git a/src/ss_anne.c b/src/ss_anne.c index fd0195830..ad74a1f6e 100644 --- a/src/ss_anne.c +++ b/src/ss_anne.c @@ -83,7 +83,7 @@ void DoSSAnneDepartureCutscene(void) { u8 taskId; - PlaySE(SE_KITEKI); + PlaySE(SE_SS_ANNE_HORN); taskId = CreateTask(Task_SSAnneInit, 8); gTasks[taskId].data[0] = 50; } @@ -118,7 +118,7 @@ static void Task_SSAnneRun(u8 taskId) boatObject = &gObjectEvents[objectEventId]; if (gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x < -120) { - PlaySE(SE_KITEKI); + PlaySE(SE_SS_ANNE_HORN); gTasks[taskId].func = Task_SSAnneFinish; } else diff --git a/src/strings.c b/src/strings.c index eefd52b90..c2c066268 100644 --- a/src/strings.c +++ b/src/strings.c @@ -282,7 +282,7 @@ const u8 gText_PkmnNeedsToReplaceMove[] = _("{STR_VAR_1} wants to learn the\nmov const u8 gText_StopLearningMove2[] = _("Stop trying to teach\n{STR_VAR_2}?"); const u8 gText_MoveNotLearned[] = _("{STR_VAR_1} did not learn the\nmove {STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); const u8 gText_WhichMoveToForget[] = _("Which move should be forgotten?{PAUSE_UNTIL_PRESS}"); -const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 0x0F}2, and{PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}"); +const u8 gText_12PoofForgotMove[] = _("1, {PAUSE 0x0F}2, and{PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p{STR_VAR_1} forgot how to\nuse {STR_VAR_2}.\pAnd...{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnAlreadyKnows[] = _("{STR_VAR_1} already knows\n{STR_VAR_2}.{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnHPRestoredByVar2[] = _("{STR_VAR_1}'s HP was restored\nby {STR_VAR_2} point(s).{PAUSE_UNTIL_PRESS}"); const u8 gText_PkmnCuredOfPoison[] = _("{STR_VAR_1} was cured of its\npoisoning.{PAUSE_UNTIL_PRESS}"); @@ -1025,7 +1025,7 @@ const u8 gText_SpacePoints[] = _(" points"); const u8 gText_CommunicationStandby3[] = _("Communication standby…"); ALIGNED(4) const u8 gText_BerryCrush_AreYouReady[] = _("Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p"); ALIGNED(4) const u8 gText_BerryCrush_WaitForOthersToChooseBerry[] = _("Please wait while each member\nchooses a BERRY."); -ALIGNED(4) const u8 gText_BerryCrush_GainedXUnitsOfPowder[] = _("{PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p"); +ALIGNED(4) const u8 gText_BerryCrush_GainedXUnitsOfPowder[] = _("{PAUSE_MUSIC}{PLAY_BGM MUS_LEVEL_UP}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p"); ALIGNED(4) const u8 gText_BerryCrush_RecordingGameResults[] = _("Recording your game results in the\nsave file.\nPlease wait."); ALIGNED(4) const u8 gText_BerryCrush_WantToPlayAgain[] = _("Want to play BERRY CRUSH again?"); ALIGNED(4) const u8 gText_BerryCrush_NoBerries[] = _("You have no BERRIES.\nThe game will be canceled."); @@ -1258,7 +1258,7 @@ const u8 gText_TeachMoveQues[] = _("Teach {STR_VAR_2}?"); const u8 gText_MonLearnedMove[] = _("{STR_VAR_1} learned\n{STR_VAR_2}."); const u8 gText_MonIsTryingToLearnMove[] = _("{STR_VAR_1} is trying to learn\n{STR_VAR_2}.\pBut {STR_VAR_1} can't learn more\nthan four moves.\pDelete an older move to make\nroom for {STR_VAR_2}?"); const u8 gText_StopLearningMove[] = _("Stop learning {STR_VAR_2}?"); -const u8 gText_1_2_and_Poof[] = _("{PAUSE 0x20}1, {PAUSE 0x0F}2, and {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p"); +const u8 gText_1_2_and_Poof[] = _("{PAUSE 0x20}1, {PAUSE 0x0F}2, and {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_BALL_BOUNCE_1}Poof!\p"); const u8 gText_MonForgotOldMoveAndMonLearnedNewMove[] = _("{STR_VAR_1} forgot {STR_VAR_3}.\pAnd‥\p{STR_VAR_1}\nlearned {STR_VAR_2}."); const u8 gText_GiveUpTryingToTeachNewMove[] = _("Give up trying to teach a new\nmove to {STR_VAR_1}?"); const u8 gText_WhichMoveShouldBeForgotten[] = _("Which move should be forgotten?\p"); diff --git a/src/teachy_tv.c b/src/teachy_tv.c index f919220c9..d6ce57c3d 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -485,7 +485,7 @@ static void TeachyTvMainCallback(void) gTasks[taskId].data[0] = TeachyTvSetupWindow(); gTasks[taskId].data[1] = TeachyTvSetupObjEventAndOam(); TeachyTvSetupScrollIndicatorArrowPair(); - PlayNewMapMusic(MUS_TVNOIZE); + PlayNewMapMusic(MUS_TEACHY_TV_MENU); TeachyTvSetWindowRegs(); } ScheduleBgCopyTilemapToVram(0); @@ -761,7 +761,7 @@ static void TTVcmd_TransitionRenderBg2TeachyTvGraphicInitNpcPos(u8 taskId) ScheduleBgCopyTilemapToVram(2); data[2] = 0; ++data[3]; - PlayNewMapMusic(MUS_ANNAI); + PlayNewMapMusic(MUS_FOLLOW_ME); } } @@ -1042,7 +1042,7 @@ static void TTVcmd_End(u8 taskId) { s16 *data = gTasks[taskId].data; if (data[2] == 0) - PlayNewMapMusic(MUS_TVNOIZE); + PlayNewMapMusic(MUS_TEACHY_TV_MENU); TeachyTvBg2AnimController(); if (++data[2] > 63) { @@ -1209,7 +1209,7 @@ static void TeachyTvRestorePlayerPartyCallback(void) if (gBattleOutcome == B_OUTCOME_DREW) SetTeachyTvControllerModeToResume(); else - PlayNewMapMusic(MUS_ANNAI); + PlayNewMapMusic(MUS_FOLLOW_ME); CB2_ReturnToTeachyTV(); } diff --git a/src/trade.c b/src/trade.c index 7da209d60..474c3ae8f 100644 --- a/src/trade.c +++ b/src/trade.c @@ -943,7 +943,7 @@ static void CB2_ReturnFromLinkTrade2(void) sTradeMenuResourcesPtr->bg3hofs = 0; SetTradeMenuOptionActiveFlags(); gMain.state++; - PlayBGM(MUS_SLOT); + PlayBGM(MUS_GAME_CORNER); break; case 15: ComputePartyTradeableFlags(1); diff --git a/src/trade_scene.c b/src/trade_scene.c index cc78d9a1e..9860fcc39 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -597,7 +597,7 @@ static void SpriteCB_TradeGlowCable(struct Sprite * sprite) sprite->data[0]++; if (sprite->data[0] == 10) { - PlaySE(SE_BOWA); + PlaySE(SE_BALL); sprite->data[0] = 0; } } @@ -610,7 +610,7 @@ static void SpriteCB_TradeGlowWireless(struct Sprite * sprite) sprite->data[0]++; if (sprite->data[0] == 10) { - PlaySE(SE_W207B); + PlaySE(SE_M_SWAGGER2); sprite->data[0] = 0; } } @@ -652,7 +652,7 @@ static void SpriteCB_TradeGBAScreen(struct Sprite * sprite) sprite->data[0]++; if (sprite->data[0] == 15) { - PlaySE(SE_W107); + PlaySE(SE_M_MINIMIZE); sprite->data[0] = 0; } } @@ -1274,7 +1274,7 @@ static bool8 DoTradeAnim_Cable(void) gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[sTradeData->tradeSpecies[0]].y_offset; sTradeData->state++; sTradeData->cachedMapMusic = GetCurrentMapMusic(); - PlayNewMapMusic(MUS_SHINKA); + PlayNewMapMusic(MUS_EVOLUTION); break; case 1: if (sTradeData->bg2hofs > 0) @@ -1434,7 +1434,7 @@ static bool8 DoTradeAnim_Cable(void) case 32: if (!gPaletteFade.active) { - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); sTradeData->state++; } gSprites[sTradeData->tradeGlow1SpriteId].pos2.y -= 3; @@ -1488,7 +1488,7 @@ static bool8 DoTradeAnim_Cable(void) gSprites[sTradeData->pokePicSpriteIdxs[1]].pos2.y += 3; if (gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y < -160 && gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y >= -163) { - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } if (gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y < -222) { @@ -1585,7 +1585,7 @@ static bool8 DoTradeAnim_Cable(void) DestroySprite(&gSprites[sTradeData->gbaScreenSpriteId]); SetTradeSequenceBgGpuRegs(6); sTradeData->state++; - PlaySE(SE_W028); + PlaySE(SE_M_SAND_ATTACK); } break; case 51: @@ -1693,7 +1693,7 @@ static bool8 DoTradeAnim_Cable(void) case 68: if (++sTradeData->timer == 10) { - PlayFanfare(MUS_FANFA5); + PlayFanfare(MUS_EVOLVED); } if (sTradeData->timer == 250) { @@ -1771,7 +1771,7 @@ static bool8 DoTradeAnim_Wireless(void) gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y = gMonFrontPicCoords[sTradeData->tradeSpecies[0]].y_offset; sTradeData->state++; sTradeData->cachedMapMusic = GetCurrentMapMusic(); - PlayNewMapMusic(MUS_SHINKA); + PlayNewMapMusic(MUS_EVOLUTION); break; case 1: if (sTradeData->bg2hofs > 0) @@ -1936,7 +1936,7 @@ static bool8 DoTradeAnim_Wireless(void) case 32: if (!gPaletteFade.active) { - PlaySE(SE_TK_WARPOUT); + PlaySE(SE_WARP_OUT); sTradeData->state++; } gSprites[sTradeData->tradeGlow1SpriteId].pos2.y -= 3; @@ -1991,7 +1991,7 @@ static bool8 DoTradeAnim_Wireless(void) gSprites[sTradeData->pokePicSpriteIdxs[1]].pos2.y += 3; if (gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y < -160 && gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y >= -163) { - PlaySE(SE_TK_WARPIN); + PlaySE(SE_WARP_IN); } if (gSprites[sTradeData->pokePicSpriteIdxs[0]].pos2.y < -222) { @@ -2106,7 +2106,7 @@ static bool8 DoTradeAnim_Wireless(void) DestroySprite(&gSprites[sTradeData->gbaScreenSpriteId]); SetTradeSequenceBgGpuRegs(6); sTradeData->state++; - PlaySE(SE_W028); + PlaySE(SE_M_SAND_ATTACK); } break; case 51: @@ -2214,7 +2214,7 @@ static bool8 DoTradeAnim_Wireless(void) case 68: if (++sTradeData->timer == 10) { - PlayFanfare(MUS_FANFA5); + PlayFanfare(MUS_EVOLVED); } if (sTradeData->timer == 250) { @@ -2352,11 +2352,11 @@ static void SpriteCB_TradePokeball_Outbound(struct Sprite * sprite) { sprite->pos2.y += sTradeBallVerticalVelocityTable[sprite->data[0]]; if (sprite->data[0] == 22) - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); sprite->data[0]++; if (sprite->data[0] == 44) { - PlaySE(SE_W025); + PlaySE(SE_M_MEGA_KICK); sprite->callback = SpriteCB_TradePokeball_Outbound2; sprite->data[0] = 0; BeginNormalPaletteFade(1 << (sprite->oam.paletteNum + 16), -1, 0, 16, RGB_WHITEALPHA); @@ -2389,17 +2389,17 @@ static void SpriteCB_TradePokeball_Inbound(struct Sprite * sprite) { sprite->data[2]++; sprite->data[0] = 22; - PlaySE(SE_KON); + PlaySE(SE_BALL_BOUNCE_1); } } else { if (sprite->data[0] == 66) - PlaySE(SE_KON2); + PlaySE(SE_BALL_BOUNCE_2); if (sprite->data[0] == 92) - PlaySE(SE_KON3); + PlaySE(SE_BALL_BOUNCE_3); if (sprite->data[0] == 107) - PlaySE(SE_KON4); + PlaySE(SE_BALL_BOUNCE_4); sprite->pos2.y += sTradeBallVerticalVelocityTable[sprite->data[0]]; sprite->data[0]++; if (sprite->data[0] == 108) @@ -2791,7 +2791,7 @@ static void Task_AnimateWirelessSignal(u8 taskId) LoadPalette(&sWirelessSignalAnimPals_Inbound[r2], 0x30, 0x20); } if (sWirelessSignalAnimParams[data[0]][0] == 0 && data[1] == 0) - PlaySE(SE_W215); + PlaySE(SE_M_HEAL_BELL); if (data[1] == sWirelessSignalAnimParams[data[0]][1]) { data[0]++; diff --git a/src/trainer_card.c b/src/trainer_card.c index 98799b502..830625655 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -543,7 +543,7 @@ static void Task_TrainerCard(u8 taskId) case 8: if (!UpdatePaletteFade() && !IsDma3ManagerBusyWithBgCopy()) { - PlaySE(SE_CARD3); + PlaySE(SE_CARD_OPEN); sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_FRONT; } break; @@ -564,7 +564,7 @@ static void Task_TrainerCard(u8 taskId) { SetHelpContext(HELPCONTEXT_TRAINER_CARD_BACK); FlipTrainerCard(); - PlaySE(SE_CARD1); + PlaySE(SE_CARD_FLIP); sTrainerCardDataPtr->mainState = STATE_WAIT_FLIP_TO_BACK; } else if (JOY_NEW(B_BUTTON)) @@ -583,7 +583,7 @@ static void Task_TrainerCard(u8 taskId) case STATE_WAIT_FLIP_TO_BACK: if (IsCardFlipTaskActive() && Overworld_LinkRecvQueueLengthMoreThan2() != TRUE) { - PlaySE(SE_CARD3); + PlaySE(SE_CARD_OPEN); sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_BACK; } break; @@ -604,7 +604,7 @@ static void Task_TrainerCard(u8 taskId) SetHelpContext(HELPCONTEXT_TRAINER_CARD_FRONT); FlipTrainerCard(); sTrainerCardDataPtr->mainState = STATE_WAIT_FLIP_TO_FRONT; - PlaySE(SE_CARD1); + PlaySE(SE_CARD_FLIP); } } else if (JOY_NEW(A_BUTTON)) @@ -642,7 +642,7 @@ static void Task_TrainerCard(u8 taskId) if (IsCardFlipTaskActive() && Overworld_LinkRecvQueueLengthMoreThan2() != TRUE) { sTrainerCardDataPtr->mainState = STATE_HANDLE_INPUT_FRONT; - PlaySE(SE_CARD3); + PlaySE(SE_CARD_OPEN); } break; } @@ -1787,7 +1787,7 @@ static bool8 Task_SetCardFlipped(struct Task* task) sTrainerCardDataPtr->onBack ^= 1; task->tFlipState++; sTrainerCardDataPtr->allowDMACopy = TRUE; - PlaySE(SE_CARD2); + PlaySE(SE_CARD_FLIPPING); return FALSE; } diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 60f096cda..0d6f0f93e 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -376,20 +376,20 @@ static const u16 sPrizeList[] = { }; static const u16 sTrainerTowerEncounterMusic[] = { - [TRAINER_ENCOUNTER_MUSIC_MALE] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_FEMALE] = MUS_SHOUJO, - [TRAINER_ENCOUNTER_MUSIC_GIRL] = MUS_SHOUJO, - [TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS] = MUS_ROCKET, - [TRAINER_ENCOUNTER_MUSIC_INTENSE] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_COOL] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_AQUA] = MUS_ROCKET, - [TRAINER_ENCOUNTER_MUSIC_MAGMA] = MUS_ROCKET, - [TRAINER_ENCOUNTER_MUSIC_SWIMMER] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_TWINS] = MUS_SHOUJO, - [TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_HIKER] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_INTERVIEWER] = MUS_SHOUNEN, - [TRAINER_ENCOUNTER_MUSIC_RICH] = MUS_SHOUNEN + [TRAINER_ENCOUNTER_MUSIC_MALE] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_FEMALE] = MUS_ENCOUNTER_GIRL, + [TRAINER_ENCOUNTER_MUSIC_GIRL] = MUS_ENCOUNTER_GIRL, + [TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS] = MUS_ENCOUNTER_ROCKET, + [TRAINER_ENCOUNTER_MUSIC_INTENSE] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_COOL] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_AQUA] = MUS_ENCOUNTER_ROCKET, + [TRAINER_ENCOUNTER_MUSIC_MAGMA] = MUS_ENCOUNTER_ROCKET, + [TRAINER_ENCOUNTER_MUSIC_SWIMMER] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_TWINS] = MUS_ENCOUNTER_GIRL, + [TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_HIKER] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_INTERVIEWER] = MUS_ENCOUNTER_BOY, + [TRAINER_ENCOUNTER_MUSIC_RICH] = MUS_ENCOUNTER_BOY }; static const u8 sSingleBattleChallengeMonIdxs[][2] = { diff --git a/src/union_room.c b/src/union_room.c index 1eb5f3ed1..f123def90 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -1351,14 +1351,14 @@ static void Task_TryJoinLinkGroup(u8 taskId) { AskToJoinRfuGroup(data, id); data->state = 5; - PlaySE(SE_PN_ON); + PlaySE(SE_POKENAV_ON); } else { // Postgame flags not both set StringCopy(gStringVar4, gUnknown_8457608[var - 1]); data->state = 18; - PlaySE(SE_PN_ON); + PlaySE(SE_POKENAV_ON); } } else @@ -2344,7 +2344,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId) RedrawListMenu(data->listTaskId); IntlConvPartnerUname(gStringVar1, data->field_0->arr[data->leaderId]); CreateTask_RfuReconnectWithParent(data->field_0->arr[data->leaderId].gname_uname.uname, ReadAsU16(data->field_0->arr[data->leaderId].gname_uname.gname.unk_00.playerTrainerId)); - PlaySE(SE_PN_ON); + PlaySE(SE_POKENAV_ON); data->state = 4; } else @@ -2505,7 +2505,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId) LoadWirelessStatusIndicatorSpriteGfx(); CreateWirelessStatusIndicatorSprite(0, 0); CreateTask_RfuReconnectWithParent(data->field_0->arr[0].gname_uname.uname, ReadAsU16(data->field_0->arr[0].gname_uname.gname.unk_00.playerTrainerId)); - PlaySE(SE_PN_ON); + PlaySE(SE_POKENAV_ON); data->state = 4; } else @@ -2796,7 +2796,7 @@ static void Task_RunUnionRoom(u8 taskId) switch (HandlePlayerListUpdate()) { case 1: - PlaySE(SE_TOY_C); + PlaySE(SE_NOTE_C); case 2: ScheduleUnionRoomPlayerRefresh(data); break; @@ -3068,7 +3068,7 @@ static void Task_RunUnionRoom(u8 taskId) data->state = 16; break; case 11: - PlaySE(SE_PINPON); + PlaySE(SE_DING_DONG); sub_80F8FA0(); data->state = 12; data->recvActivityRequest[0] = 0; diff --git a/src/vs_seeker.c b/src/vs_seeker.c index eb49a5e45..b31b691dc 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -779,7 +779,7 @@ static void Task_VsSeeker_2(u8 taskId) if (data[2] != 2 && --data[1] == 0) { - PlaySE(SE_C_PIKON); + PlaySE(SE_CONTEST_MONS_TURN); data[1] = 11; data[2]++; } |